From 7a00574163029c0c2b649878c95d5acbd083564a Mon Sep 17 00:00:00 2001 From: "Roberto C. Sanchez" Date: Mon, 12 May 2014 08:21:30 -0400 Subject: Imported Upstream version 1.7.2+dfsg --- CMakeLists.txt | 115 +- ChangeLog | 289 +- INSTALL | 38 +- Makefile.am | 3 +- Makefile.in | 487 +- README | 6 +- aclocal.m4 | 828 +- bindings/CMakeLists.txt | 5 + bindings/Makefile | 9 - bindings/Makefile.am | 7 - bindings/README | 35 + bindings/autogen.sh | 23 - bindings/bcppmake/MainCLXTest.cpp | 7 +- bindings/bcppmake/MainCLXTest.h | 22 + bindings/bcppmake/MainTest.cpp | 7 +- bindings/bcppmake/MainTest.h | 22 + bindings/bcppmake/clxtest.cpp | 7 +- bindings/bcppmake/sword.c | 7 +- bindings/bcppmake/test.cpp | 7 +- bindings/configure.ac | 127 - bindings/corba/Makefile.am | 3 - bindings/corba/java/Makefile | 7 +- bindings/corba/java/Makefile.in | 43 - .../java/src/org/crosswire/sword/orb/SwordOrb.java | 23 +- bindings/corba/omniorbcpp/Makefile | 6 +- bindings/corba/omniorbcpp/server.cpp | 9 +- bindings/corba/omniorbcpp/swordorb-impl.cpp | 125 +- bindings/corba/omniorbcpp/swordorb-impl.hpp | 14 +- bindings/corba/omniorbcpp/testclient.cpp | 13 +- bindings/corba/orbitcpp/server.cpp | 11 +- bindings/corba/orbitcpp/swordorb-impl.cpp | 62 +- bindings/corba/orbitcpp/swordorb-impl.hpp | 15 +- bindings/corba/orbitcpp/testclient.cpp | 13 +- bindings/corba/orbitcpp/webmgr.hpp | 23 +- bindings/corba/swordorb.idl | 7 +- bindings/flatapi.cpp | 55 +- bindings/gsoap/gsoapsword.cpp | 15 +- bindings/gsoap/gsoapsword.h | 9 +- bindings/gsoap/testclient.cpp | 9 +- bindings/java-jni/README | 20 +- bindings/java-jni/jni/Android.mk | 52 +- bindings/java-jni/jni/Application.mk | 1 + bindings/java-jni/jni/swordstub.cpp | 123 +- bindings/java-jni/jni/webmgr.hpp | 23 +- .../org/crosswire/android/sword/InstallMgr.java | 22 + .../src/org/crosswire/android/sword/SWMgr.java | 22 + .../src/org/crosswire/android/sword/SWModule.java | 22 + bindings/objc/ObjCSword.h | 2 +- bindings/objc/ObjCSword.xcodeproj/project.pbxproj | 6451 +++++++---- bindings/objc/ObjCSword_Prefix.pch | 2 +- .../ObjCSword_preLion.xcodeproj/project.pbxproj | 1060 ++ bindings/objc/README | 9 +- bindings/objc/build_sword/Makefile | 25 - bindings/objc/build_sword/build_mac_sword.sh | 159 +- .../objc/build_sword/build_ub_mac_swordutils.sh | 7 +- bindings/objc/build_sword/readme.txt | 9 +- bindings/objc/dependencies/retrieve.sh | 8 + bindings/objc/dependencies/retrieve_iOS.sh | 6 + bindings/objc/src/DefaultFilterProvider.h | 37 + bindings/objc/src/DefaultFilterProvider.mm | 44 + bindings/objc/src/FilterProviderFactory.h | 24 + bindings/objc/src/FilterProviderFactory.mm | 42 + bindings/objc/src/SwordBible.h | 17 +- bindings/objc/src/SwordBible.mm | 104 +- bindings/objc/src/SwordBibleBook.h | 22 +- bindings/objc/src/SwordBibleBook.mm | 10 +- bindings/objc/src/SwordBibleChapter.h | 2 +- bindings/objc/src/SwordBibleTextEntry.h | 6 +- bindings/objc/src/SwordBibleTextEntry.m | 4 +- bindings/objc/src/SwordBook.h | 8 +- bindings/objc/src/SwordBook.mm | 37 +- bindings/objc/src/SwordCommentary.h | 6 +- bindings/objc/src/SwordCommentary.mm | 13 +- bindings/objc/src/SwordDictionary.h | 6 +- bindings/objc/src/SwordDictionary.mm | 12 +- bindings/objc/src/SwordFilter.h | 61 + bindings/objc/src/SwordFilter.mm | 142 + bindings/objc/src/SwordInstallSource.h | 23 +- bindings/objc/src/SwordInstallSource.mm | 57 +- bindings/objc/src/SwordInstallSourceController.h | 101 - bindings/objc/src/SwordInstallSourceController.mm | 333 - bindings/objc/src/SwordInstallSourceManager.h | 99 + bindings/objc/src/SwordInstallSourceManager.mm | 337 + bindings/objc/src/SwordKey.h | 18 +- bindings/objc/src/SwordKey.mm | 16 +- bindings/objc/src/SwordListKey.h | 25 +- bindings/objc/src/SwordListKey.mm | 37 +- bindings/objc/src/SwordLocaleManager.h | 10 +- bindings/objc/src/SwordLocaleManager.mm | 16 +- bindings/objc/src/SwordManager.h | 33 +- bindings/objc/src/SwordManager.mm | 181 +- bindings/objc/src/SwordModule+Index.h | 2 +- bindings/objc/src/SwordModule.h | 91 +- bindings/objc/src/SwordModule.mm | 147 +- bindings/objc/src/SwordModuleTextEntry.h | 2 +- bindings/objc/src/SwordModuleTreeEntry.h | 2 +- bindings/objc/src/SwordUtil.h | 20 + bindings/objc/src/SwordUtil.m | 64 + bindings/objc/src/SwordVerseKey.h | 28 +- bindings/objc/src/SwordVerseKey.mm | 36 +- bindings/objc/src/SwordVerseManager.h | 10 +- bindings/objc/src/SwordVerseManager.mm | 14 +- bindings/objc/src/VerseEnumerator.h | 2 +- bindings/objc/src/VerseEnumerator.mm | 3 +- bindings/objc/src/services/Configuration.h | 7 +- bindings/objc/src/services/Configuration.m | 26 +- bindings/objc/src/services/OSXConfiguration.h | 2 +- bindings/objc/src/services/iOSConfiguration.h | 24 + bindings/objc/src/services/iOSConfiguration.m | 38 + bindings/objc/test/SwordListKeyTest.m | 4 +- bindings/objc/test/SwordManagerTest.m | 12 +- bindings/objc/test/SwordModuleLongRunTest.mm | 18 +- bindings/objc/test/SwordModuleTest.h | 3 +- bindings/objc/test/SwordModuleTest.m | 92 +- bindings/objc/test/Tests-Info.plist | 22 + bindings/swig/CMakeLists.txt | 41 + bindings/swig/README | 26 +- bindings/swig/deprecations.i | 62 + bindings/swig/examples/av11n.py | 112 + bindings/swig/examples/mod2zmod.pl | 13 +- bindings/swig/ftptrans.i | 6 - bindings/swig/listkey.i | 7 +- bindings/swig/multimapwdef.i | 11 + bindings/swig/osishtmlhref.i | 2 - bindings/swig/package/Makefile.am | 40 +- bindings/swig/package/Makefile.in | 413 +- bindings/swig/package/README | 28 + bindings/swig/package/README.cvs | 10 - bindings/swig/package/aclocal.m4 | 8724 +------------- bindings/swig/package/config.guess | 405 +- bindings/swig/package/config.sub | 279 +- bindings/swig/package/configure | 10440 ++++++++--------- bindings/swig/package/configure.ac | 10 +- bindings/swig/package/depcomp | 531 +- bindings/swig/package/deprecations.i | 62 + bindings/swig/package/ftptrans.i | 6 - bindings/swig/package/install-sh | 35 +- bindings/swig/package/listkey.i | 7 +- bindings/swig/package/ltmain.sh | 4017 ++++--- bindings/swig/package/m4/libtool.m4 | 7992 +++++++++++++ bindings/swig/package/m4/ltoptions.m4 | 384 + bindings/swig/package/m4/ltsugar.m4 | 123 + bindings/swig/package/m4/ltversion.m4 | 23 + bindings/swig/package/m4/lt~obsolete.m4 | 98 + bindings/swig/package/missing | 461 +- bindings/swig/package/multimapwdef.i | 11 + bindings/swig/package/osishtmlhref.i | 2 - bindings/swig/package/perl.m4 | 2 +- bindings/swig/package/php4.m4 | 2 +- bindings/swig/package/python.m4 | 2 +- bindings/swig/package/remotetrans.i | 6 + bindings/swig/package/rendercallback.h | 4 +- bindings/swig/package/swbuf.i | 2 +- bindings/swig/package/swig.m4 | 2 +- bindings/swig/package/swkey.i | 6 + bindings/swig/package/swmodule.i | 4 +- bindings/swig/package/sword.i | 13 +- bindings/swig/package/sword.m4 | 4 +- bindings/swig/package/tcl.m4 | 2 +- bindings/swig/package/versekey.i | 23 +- bindings/swig/package/zlib.m4 | 6 +- bindings/swig/perl/CMakeLists.txt | 68 + bindings/swig/perl/install.cmake | 3 + bindings/swig/python/CMakeLists.txt | 58 + bindings/swig/python/install.cmake.in | 4 + bindings/swig/remotetrans.i | 6 + bindings/swig/rendercallback.h | 4 +- bindings/swig/swbuf.i | 2 +- bindings/swig/swkey.i | 6 + bindings/swig/swmodule.i | 4 +- bindings/swig/sword.i | 13 +- bindings/swig/sword.pl | 42 +- bindings/swig/versekey.i | 23 +- bindings/swig/vstudio/libsword_csharpsword.vcproj | 12 - buildtest.cpp | 18 +- cmake/FindCLucene.cmake | 34 +- cmake/FindICU.cmake | 73 +- cmake/FindRegex.cmake | 6 + cmake/bindings.cmake | 135 - cmake/build-debug.sh | 24 + cmake/build-release.sh | 24 + cmake/install.cmake | 69 +- cmake/muxsources.cmake | 29 +- cmake/options.cmake | 52 + cmake/sources.cmake | 81 +- cmake/toolchains/Toolchain-mingw32.cmake | 36 + cmake/toolchains/Toolchain-mingw64-x64.cmake | 37 + cmake/toolchains/Toolchain-mingw64-x86.cmake | 36 + config.guess | 405 +- config.sub | 279 +- configure | 11481 +++++++++---------- configure.ac | 131 +- depcomp | 531 +- doc/Doxyfile | 2 +- doc/Makefile.am | 1 - doc/README | 5 +- doc/greektrans.txt | 81 - examples/Makefile.in | 314 +- examples/classes/Makefile | 4 +- examples/classes/README | 4 + examples/classes/ciphercng.cpp | 19 +- examples/classes/lastVerseInChapter.cpp | 56 + examples/classes/showchapter.cpp | 57 + examples/classes/swmgrex.cpp | 44 +- examples/classes/verseposition.cpp | 51 + examples/classes/verseranges.cpp | 127 + examples/cmdline/CMakeLists.txt | 1 + examples/cmdline/Makefile.am | 4 +- examples/cmdline/Makefile.in | 295 +- examples/cmdline/listoptions.cpp | 22 +- examples/cmdline/lookup.cpp | 32 +- examples/cmdline/outplain.cpp | 48 +- examples/cmdline/outrender.cpp | 42 +- examples/cmdline/search.cpp | 40 +- examples/cmdline/threaded_search.cpp | 22 +- examples/cmdline/verserangeparse.cpp | 48 +- examples/simple.cpp | 11 +- icu/Makefile.am | 55 - icu/Makefile.in | 477 - icu/translit_Any_Latex.txt | 78 - icu/translit_Any_Latin1.txt | 89 - icu/translit_BETA_Greek.txt | 119 - icu/translit_BGreek_Greek.txt | 155 - icu/translit_CCAT_Hebrew.txt | 200 - icu/translit_CCAT_Syriac.txt | 87 - icu/translit_Latin_Coptic.txt | 129 - icu/translit_Latin_Gothic.txt | 57 - icu/translit_Latin_Ugaritic.txt | 63 - icu/translit_swordindex.txt | 83 - include/Greek2Greek.h | 117 - include/GreekChars.h | 154 - include/Makefile.am | 27 +- include/SwordAPI.pas | 8 +- include/bz2comprs.h | 45 + include/canon.h | 201 +- include/canon_abbrevs.h | 18 +- include/canon_catholic.h | 186 +- include/canon_catholic2.h | 189 +- include/canon_german.h | 164 +- include/canon_kjva.h | 192 +- include/canon_leningrad.h | 129 +- include/canon_luther.h | 186 +- include/canon_lxx.h | 403 + include/canon_mt.h | 129 +- include/canon_nrsv.h | 164 +- include/canon_nrsva.h | 196 +- include/canon_null.h | 7 +- include/canon_orthodox.h | 370 + include/canon_synodal.h | 198 +- include/canon_synodalp.h | 173 - include/canon_synodalprot.h | 316 + include/canon_vulg.h | 192 +- include/cipherfil.h | 6 +- include/config.h | 84 - include/config.h.in | 3 + include/curlftpt.h | 51 +- include/curlhttpt.h | 51 +- include/defs.h | 53 +- include/echomod.h | 11 +- include/encfiltmgr.h | 12 +- include/entriesblk.h | 22 + include/femain.h | 8 +- include/filemgr.h | 39 +- include/flatapi.h | 8 +- include/ftplib.h | 43 +- include/ftplibftpt.h | 53 +- include/ftptrans.h | 84 - include/gbffootnotes.h | 6 +- include/gbfheadings.h | 6 +- include/gbfhtml.h | 6 +- include/gbfhtmlhref.h | 8 +- include/gbfmorph.h | 6 +- include/gbfosis.h | 6 +- include/gbfplain.h | 6 +- include/gbfredletterwords.h | 6 +- include/gbfrtf.h | 6 +- include/gbfstrongs.h | 6 +- include/gbfthml.h | 6 +- include/gbfwebif.h | 12 +- include/gbfwordjs.h | 6 +- include/gbfxhtml.h | 52 + include/greeklexattribs.h | 6 +- include/hebrewmcim.h | 22 + include/hrefcom.h | 13 +- include/installmgr.h | 40 +- include/latin1utf16.h | 6 +- include/latin1utf8.h | 6 +- include/listkey.h | 50 +- include/localemgr.h | 9 +- include/lzsscomprs.h | 61 +- include/markupfiltmgr.h | 9 +- include/multimapwdef.h | 36 +- include/nullim.h | 22 + include/osisenum.h | 40 + include/osisfootnotes.h | 6 +- include/osisglosses.h | 40 + include/osisheadings.h | 13 +- include/osishtmlhref.h | 8 +- include/osislemma.h | 6 +- include/osismorph.h | 6 +- include/osismorphsegmentation.h | 6 +- include/osisosis.h | 6 +- include/osisplain.h | 6 +- include/osisredletterwords.h | 6 +- include/osisreferencelinks.h | 55 + include/osisrtf.h | 6 +- include/osisruby.h | 38 - include/osisscripref.h | 6 +- include/osisstrongs.h | 6 +- include/osisvariants.h | 20 +- include/osiswebif.h | 11 +- include/osiswordjs.h | 6 +- include/osisxhtml.h | 74 + include/osisxlit.h | 40 + include/papyriplain.h | 10 +- include/plainfootnotes.h | 41 - include/plainhtml.h | 38 - include/rawcom.h | 13 +- include/rawcom4.h | 13 +- include/rawfiles.h | 15 +- include/rawgenbook.h | 16 +- include/rawld.h | 17 +- include/rawld4.h | 17 +- include/rawstr.h | 18 +- include/rawstr4.h | 18 +- include/rawtext.h | 13 +- include/rawtext4.h | 14 +- include/rawverse.h | 22 +- include/rawverse4.h | 29 +- include/remotetrans.h | 84 + include/roman.h | 7 +- include/rtfhtml.h | 6 +- include/sapphire.h | 53 +- include/scsuutf8.h | 42 + include/stringmgr.h | 11 +- include/strkey.h | 7 +- include/swbasicfilter.h | 15 +- include/swbuf.h | 79 +- include/swcacher.h | 10 +- include/swcipher.h | 8 +- include/swcom.h | 39 +- include/swcomprs.h | 8 +- include/swconfig.h | 9 +- include/swdisp.h | 12 +- include/swfilter.h | 18 +- include/swfiltermgr.h | 9 +- include/swgenbook.h | 43 +- include/swinputmeth.h | 27 +- include/swkey.h | 40 +- include/swld.h | 18 +- include/swlocale.h | 9 +- include/swlog.h | 7 +- include/swmacs.h | 7 +- include/swmgr.h | 37 +- include/swmodule.h | 222 +- include/swobject.h | 43 +- include/swoptfilter.h | 13 +- include/swsearchable.h | 9 +- include/swtext.h | 15 +- include/swunicod.h | 43 - include/swversion.h | 15 +- include/swversion.h.in | 74 + include/sysdata.h | 34 +- include/teihtmlhref.h | 8 +- include/teiplain.h | 6 +- include/teirtf.h | 6 +- include/teixhtml.h | 55 + include/thmlfootnotes.h | 6 +- include/thmlgbf.h | 6 +- include/thmlheadings.h | 6 +- include/thmlhtml.h | 6 +- include/thmlhtmlhref.h | 8 +- include/thmllemma.h | 6 +- include/thmlmorph.h | 6 +- include/thmlosis.h | 6 +- include/thmlplain.h | 6 +- include/thmlrtf.h | 6 +- include/thmlscripref.h | 6 +- include/thmlstrongs.h | 6 +- include/thmlvariants.h | 21 +- include/thmlwebif.h | 14 +- include/thmlwordjs.h | 6 +- include/thmlxhtml.h | 60 + include/treekey.h | 11 +- include/treekeyidx.h | 7 +- include/unicodertf.h | 6 +- include/url.h | 39 +- include/utf16utf8.h | 6 +- include/utf8arabicpoints.h | 7 +- include/utf8arshaping.h | 6 +- include/utf8bidireorder.h | 6 +- include/utf8cantillation.h | 6 +- include/utf8greekaccents.h | 6 +- include/utf8hebrewpoints.h | 6 +- include/utf8html.h | 6 +- include/utf8latin1.h | 6 +- include/utf8nfc.h | 6 +- include/utf8nfkd.h | 6 +- include/utf8transliterator.h | 19 +- include/utf8utf16.h | 6 +- include/utilstr.h | 35 +- include/utilxml.h | 10 +- include/versekey.h | 203 +- include/versemgr.h | 163 - include/versetreekey.h | 12 +- include/versificationmgr.h | 164 + include/xzcomprs.h | 45 + include/zcom.h | 15 +- include/zipcomprs.h | 8 +- include/zld.h | 20 +- include/zstr.h | 31 +- include/ztext.h | 15 +- include/zverse.h | 37 +- install-sh | 35 +- lib/Makefile.in | 2011 ++-- lib/bcppmake/libsword.bdsproj | 1 - lib/bcppmake/libsword.bpf | 30 +- lib/bcppmake/libsword.bpr | 79 +- lib/vcppmake/libsword.sln | 20 + lib/vcppmake/libsword.vcxproj | 479 + lib/vcppmake/vc8/libsword.vcproj | 7024 ------------ locales.d/ar-utf8.conf | 141 + locales.d/bg-utf8.conf | 220 + locales.d/bg_BG-utf8.conf | 220 - locales.d/de-utf8.conf | 3 + locales.d/fo-utf8.conf | 199 + locales.d/fr-utf8.conf | 9 +- locales.d/fr.conf | 9 +- locales.d/iu-utf8.conf | 292 + locales.d/locales.conf | 1301 +-- locales.d/pon_utf8.conf | 151 + locales.d/ru-utf8.conf | 681 ++ locales.d/ru_RU-utf8.conf | 122 + locales.d/uk-utf8.conf | 555 + locales.d/uk_UA-utf8.conf | 555 - ltmain.sh | 4017 ++++--- m4/acx_clucene.m4 | 2 +- m4/colored-echo.m4 | 75 - m4/libtool.m4 | 2256 ++-- m4/ltoptions.m4 | 32 +- m4/ltversion.m4 | 12 +- m4/lt~obsolete.m4 | 12 +- missing | 461 +- olb/Convert.bpr | 116 - olb/Convert.cpp | 44 - olb/Doinit.c | 149 - olb/Getstrng.c | 43 - olb/Getvrsn.c | 67 - olb/Mainfrm.cpp | 327 - olb/Mainfrm.dfm | Bin 897 -> 0 bytes olb/Mainfrm.h | 69 - olb/Online.c | 114 - olb/addstrongs.cpp | 118 - olb/dumpav.cpp | 46 - olb/olb.bpg | 26 - olb/olb2sword.bpr | 112 - olb/olb2sword.cpp | 312 - olb/online.ide | Bin 40902 -> 0 bytes olb/online.prj | 1 - olb/prn2sword.bpr | 123 - olb/prn2sword.cpp | 49 - olb/prn2swordfrm.cpp | 501 - olb/prn2swordfrm.dfm | Bin 2540 -> 0 bytes olb/prn2swordfrm.h | 54 - samples/mods.conf.large | 466 - samples/mods.conf.small | 144 - samples/mods.d/rwp.conf | 23 - samples/mods.d/strongsnt.conf | 6 - samples/mods.d/strongsot.conf | 6 - samples/mods.d/vines.conf | 18 - samples/mods.d/web.conf | 17 - samples/mods.d/websters.conf | 61 - scripts/burncd | 1 - scripts/demotar | 1 - scripts/disttar | 7 - scripts/dlltar | 1 - scripts/eastonstar | 1 - scripts/mhctar | 1 - scripts/mkcd | 6 - scripts/mkswordbase | 2 + scripts/mkswordbase2 | 2 + scripts/mkswordtar | 4 +- scripts/svetar | 1 - scripts/swordenv | 1 - scripts/swtxtdsp.bat | 2 - scripts/vinestar | 1 - scripts/webtar | 1 - src/frontend/X11/Makefile | 5 - src/frontend/framework/femain.cpp | 11 +- src/frontend/im/hebrewmcim.cpp | 24 +- src/frontend/im/nullim.cpp | 9 +- src/frontend/im/swinputmeth.cpp | 21 +- src/frontend/swdisp.cpp | 20 +- src/frontend/swlog.cpp | 13 +- src/frontend/windoze/Makefile | 5 - src/keys/genarray.c | 50 - src/keys/listkey.cpp | 75 +- src/keys/nt.bks | Bin 112 -> 0 bytes src/keys/nt.cps | Bin 1152 -> 0 bytes src/keys/ot.bks | Bin 160 -> 0 bytes src/keys/ot.cps | Bin 3876 -> 0 bytes src/keys/strkey.cpp | 10 +- src/keys/swkey.cpp | 24 +- src/keys/treekey.cpp | 8 +- src/keys/treekeyidx.cpp | 12 +- src/keys/versekey.cpp | 772 +- src/keys/versetreekey.cpp | 50 +- src/mgr/Makefile.am | 4 +- src/mgr/curlftpt.cpp | 150 +- src/mgr/curlhttpt.cpp | 142 +- src/mgr/encfiltmgr.cpp | 150 +- src/mgr/filemgr.cpp | 19 +- src/mgr/ftplibftpt.cpp | 126 +- src/mgr/ftptrans.cpp | 193 - src/mgr/installmgr.cpp | 118 +- src/mgr/localemgr.cpp | 17 +- src/mgr/markupfiltmgr.cpp | 442 +- src/mgr/remotetrans.cpp | 204 + src/mgr/stringmgr.cpp | 125 +- src/mgr/swcacher.cpp | 13 +- src/mgr/swconfig.cpp | 14 +- src/mgr/swfiltermgr.cpp | 12 +- src/mgr/swlocale.cpp | 24 +- src/mgr/swmgr.cpp | 179 +- src/mgr/swsearchable.cpp | 17 +- src/mgr/versemgr.cpp | 383 - src/mgr/versificationmgr.cpp | 396 + src/modules/comments/hrefcom/hrefcom.cpp | 14 +- src/modules/comments/rawcom/rawcom.cpp | 39 +- src/modules/comments/rawcom4/Makefile | 5 + src/modules/comments/rawcom4/rawcom4.cpp | 39 +- src/modules/comments/rawfiles/rawfiles.cpp | 58 +- src/modules/comments/swcom.cpp | 30 +- src/modules/comments/zcom/zcom.cpp | 47 +- src/modules/common/Makefile.am | 4 +- src/modules/common/bz2comprs.cpp | 181 + src/modules/common/compress.cpp.txt | 767 -- src/modules/common/entriesblk.cpp | 9 +- src/modules/common/lzsscomprs.cpp | 120 +- src/modules/common/lzsscomprs.txt | 802 ++ src/modules/common/rawstr.cpp | 22 +- src/modules/common/rawstr4.cpp | 24 +- src/modules/common/rawverse.cpp | 13 +- src/modules/common/rawverse4.cpp | 17 +- src/modules/common/sapphire.cpp | 48 +- src/modules/common/swcipher.cpp | 8 +- src/modules/common/swcomprs.cpp | 7 +- src/modules/common/swcomprs.doc | 802 -- src/modules/common/xzcomprs.cpp | 181 + src/modules/common/zipcomprs.cpp | 8 +- src/modules/common/zstr.cpp | 27 +- src/modules/common/zverse.cpp | 38 +- src/modules/filters/Makefile.am | 14 +- src/modules/filters/cipherfil.cpp | 11 +- src/modules/filters/gbffootnotes.cpp | 28 +- src/modules/filters/gbfheadings.cpp | 29 +- src/modules/filters/gbfhtml.cpp | 12 +- src/modules/filters/gbfhtmlhref.cpp | 22 +- src/modules/filters/gbfmorph.cpp | 26 +- src/modules/filters/gbfosis.cpp | 22 +- src/modules/filters/gbfplain.cpp | 11 +- src/modules/filters/gbfredletterwords.cpp | 26 +- src/modules/filters/gbfrtf.cpp | 7 +- src/modules/filters/gbfstrongs.cpp | 26 +- src/modules/filters/gbfthml.cpp | 13 +- src/modules/filters/gbfwebif.cpp | 17 +- src/modules/filters/gbfwordjs.cpp | 43 +- src/modules/filters/gbfxhtml.cpp | 236 + src/modules/filters/greeklexattribs.cpp | 7 +- src/modules/filters/latin1utf16.cpp | 7 +- src/modules/filters/latin1utf8.cpp | 12 +- src/modules/filters/osisenum.cpp | 99 + src/modules/filters/osisfootnotes.cpp | 29 +- src/modules/filters/osisglosses.cpp | 99 + src/modules/filters/osisheadings.cpp | 228 +- src/modules/filters/osishtmlhref.cpp | 157 +- src/modules/filters/osislemma.cpp | 28 +- src/modules/filters/osismorph.cpp | 27 +- src/modules/filters/osismorphsegmentation.cpp | 27 +- src/modules/filters/osisosis.cpp | 24 +- src/modules/filters/osisplain.cpp | 64 +- src/modules/filters/osisredletterwords.cpp | 25 +- src/modules/filters/osisreferencelinks.cpp | 114 + src/modules/filters/osisrtf.cpp | 25 +- src/modules/filters/osisruby.cpp | 93 - src/modules/filters/osisscripref.cpp | 26 +- src/modules/filters/osisstrongs.cpp | 29 +- src/modules/filters/osisvariants.cpp | 82 +- src/modules/filters/osiswebif.cpp | 60 +- src/modules/filters/osiswordjs.cpp | 34 +- src/modules/filters/osisxhtml.cpp | 772 ++ src/modules/filters/osisxlit.cpp | 99 + src/modules/filters/papyriplain.cpp | 6 +- src/modules/filters/plainfootnotes.cpp | 85 - src/modules/filters/plainhtml.cpp | 89 - src/modules/filters/rtfhtml.cpp | 38 +- src/modules/filters/scsuutf8.cpp | 246 + src/modules/filters/swbasicfilter.cpp | 28 +- src/modules/filters/swoptfilter.cpp | 9 +- src/modules/filters/teihtmlhref.cpp | 22 +- src/modules/filters/teiplain.cpp | 10 +- src/modules/filters/teirtf.cpp | 416 +- src/modules/filters/teixhtml.cpp | 290 + src/modules/filters/thmlfootnotes.cpp | 30 +- src/modules/filters/thmlgbf.cpp | 9 +- src/modules/filters/thmlheadings.cpp | 26 +- src/modules/filters/thmlhtml.cpp | 11 +- src/modules/filters/thmlhtmlhref.cpp | 34 +- src/modules/filters/thmllemma.cpp | 26 +- src/modules/filters/thmlmorph.cpp | 25 +- src/modules/filters/thmlosis.cpp | 22 +- src/modules/filters/thmlplain.cpp | 7 +- src/modules/filters/thmlrtf.cpp | 17 +- src/modules/filters/thmlscripref.cpp | 32 +- src/modules/filters/thmlstrongs.cpp | 26 +- src/modules/filters/thmlvariants.cpp | 59 +- src/modules/filters/thmlwebif.cpp | 14 +- src/modules/filters/thmlwordjs.cpp | 43 +- src/modules/filters/thmlxhtml.cpp | 378 + src/modules/filters/unicodertf.cpp | 6 +- src/modules/filters/utf16utf8.cpp | 10 +- src/modules/filters/utf8arabicpoints.cpp | 174 +- src/modules/filters/utf8arshaping.cpp | 9 +- src/modules/filters/utf8bidireorder.cpp | 15 +- src/modules/filters/utf8cantillation.cpp | 26 +- src/modules/filters/utf8greekaccents.cpp | 29 +- src/modules/filters/utf8hebrewpoints.cpp | 30 +- src/modules/filters/utf8html.cpp | 14 +- src/modules/filters/utf8latin1.cpp | 11 +- src/modules/filters/utf8nfc.cpp | 7 +- src/modules/filters/utf8nfkd.cpp | 12 +- src/modules/filters/utf8transliterator.cpp | 126 +- src/modules/filters/utf8utf16.cpp | 8 +- src/modules/genbook/rawgenbook/rawgenbook.cpp | 22 +- src/modules/genbook/swgenbook.cpp | 17 +- src/modules/lexdict/rawld/rawld.cpp | 28 +- src/modules/lexdict/rawld4/rawld4.cpp | 27 +- src/modules/lexdict/swld.cpp | 30 +- src/modules/lexdict/zld/zld.cpp | 28 +- src/modules/readme | 9 - src/modules/swmodule.cpp | 454 +- src/modules/tests/echomod.cpp | 10 +- src/modules/texts/rawtext/rawtext.cpp | 49 +- src/modules/texts/rawtext4/Makefile | 5 + src/modules/texts/rawtext4/rawtext4.cpp | 54 +- src/modules/texts/swtext.cpp | 31 +- src/modules/texts/ztext/ztext.cpp | 59 +- src/utilfuns/Makefile.am | 1 - src/utilfuns/ftplib.c | 63 +- src/utilfuns/roman.cpp | 13 +- src/utilfuns/swbuf.cpp | 50 +- src/utilfuns/swobject.cpp | 45 +- src/utilfuns/swunicod.cpp | 138 - src/utilfuns/swversion.cpp | 18 +- src/utilfuns/url.cpp | 90 +- src/utilfuns/utilstr.cpp | 217 +- src/utilfuns/utilxml.cpp | 18 +- src/utilfuns/zlib/untgz.c | 27 +- sword.kdevprj | 16 +- sword.pc.in | 2 +- test-driver | 127 + tests/CMakeLists.txt | 3 + tests/Makefile.am | 17 +- tests/Makefile.in | 576 +- tests/bibliotest.cpp | 43 + tests/casttest.cpp | 9 +- tests/ciphertest.cpp | 11 +- tests/complzss.cpp | 9 +- tests/compnone.cpp | 9 +- tests/compzip.cpp | 9 +- tests/configtest.cpp | 9 +- tests/cppunit/Makefile.in | 782 +- tests/cppunit/main.cpp | 6 +- tests/cppunit/stringmgr_test.cpp | 9 +- tests/cppunit/swbuf_test.cpp | 9 +- tests/cppunit/url_test.cpp | 9 +- tests/cppunit/versekey_test.cpp | 9 +- tests/filtertest.cpp | 22 +- tests/icutest.cpp | 9 +- tests/indextest.cpp | 15 +- tests/installmgrtest.cpp | 10 +- tests/introtest.cpp | 111 +- tests/keycast.cpp | 9 +- tests/keytest.cpp | 71 +- tests/lextest.cpp | 9 +- tests/listtest.cpp | 37 +- tests/localetest.cpp | 13 +- tests/mgrtest.cpp | 21 +- tests/modtest.cpp | 17 +- tests/osistest.cpp | 111 + tests/outputcps.cpp | 9 +- tests/parsekey.cpp | 31 +- tests/rawldidxtest.cpp | 9 +- tests/refsystest.cpp | 9 +- tests/romantest.cpp | 9 +- tests/striptest.cpp | 30 +- tests/swaptest.cpp | 9 +- tests/swbuftest.cpp | 34 +- tests/testblocks.cpp | 9 +- tests/testsuite/osis.good | 106 + tests/testsuite/osis.sh | 26 + tests/testsuite/osisReference.xml | 183 + tests/testsuite/sword.conf | 2 + tests/testsuite/versekeytest.good | 15 + tests/testsuite/verseparsing.good | 15 +- tests/testsuite/verseparsing.sh | 19 +- tests/tlitmgrtest.cpp | 9 +- tests/translittest.cpp | 9 +- tests/utf8norm.cpp | 22 + tests/versekeytest.cpp | 108 +- tests/versemgrtest.cpp | 17 +- tests/vtreekeytest.cpp | 29 +- tests/webiftest.cpp | 13 +- tests/xmltest.cpp | 9 +- usrinst.sh | 19 +- utilities/CMakeLists.txt | 4 +- utilities/Makefile.am | 12 +- utilities/Makefile.in | 577 +- utilities/addcomment.cpp | 9 +- utilities/addgb.cpp | 12 +- utilities/addld.cpp | 33 +- utilities/addvs.cpp | 60 +- utilities/bcppmake/addgb.bpr | 2 +- utilities/bcppmake/addld.bpr | 2 +- utilities/bcppmake/addvs.bpr | 2 +- utilities/bcppmake/diatheke.bpr | 11 +- utilities/bcppmake/tei2mod.bpr | 2 +- utilities/bcppmake/treeidxutil.bpr | 2 +- utilities/bcppmake/utilities.bpg | 7 +- utilities/bcppmake/vs2osisreftxt.bpr | 2 +- utilities/cipherraw.cpp | 35 +- utilities/diatheke/Makefile.in | 283 +- utilities/diatheke/README | 29 +- utilities/diatheke/cgi/dia-def.pl | 36 +- utilities/diatheke/cgi/diatheke.pl | 35 +- utilities/diatheke/corediatheke.cpp | 216 +- utilities/diatheke/corediatheke.h | 56 +- utilities/diatheke/diafiltmgr.cpp | 46 +- utilities/diatheke/diafiltmgr.h | 7 +- utilities/diatheke/diatheke.cpp | 66 +- utilities/diatheke/diatheke.sln | 20 + utilities/diatheke/diatheke.vcproj | 709 -- utilities/diatheke/diatheke.vcxproj | 198 + utilities/diatheke/diathekemgr.cpp | 15 +- utilities/diatheke/diathekemgr.h | 9 +- utilities/diatheke/gbfcgi.cpp | 34 +- utilities/diatheke/gbfcgi.h | 17 +- utilities/diatheke/osiscgi.cpp | 9 +- utilities/diatheke/osiscgi.h | 9 +- utilities/diatheke/soap/sapouni.cgi | 8 +- utilities/diatheke/soap/soapatheke.pl | 38 +- utilities/diatheke/tcl/makebooklist.pl | 223 +- utilities/diatheke/thmlcgi.cpp | 55 +- utilities/diatheke/thmlcgi.h | 17 +- utilities/emptyvss.cpp | 21 +- utilities/gbfidx.cpp | 36 +- utilities/genarray.c | 55 + utilities/genbookutil.cpp | 13 +- utilities/imp2gbs.cpp | 11 +- utilities/imp2ld.cpp | 193 +- utilities/imp2vs.cpp | 40 +- utilities/installmgr.cpp | 41 +- utilities/kylixmake/libsword.bpr | 3 +- utilities/lexdump.c | 11 +- utilities/mkfastmod.cpp | 13 +- utilities/mod2imp.cpp | 17 +- utilities/mod2osis.cpp | 73 +- utilities/mod2vpl.cpp | 17 +- utilities/mod2zmod.cpp | 34 +- utilities/modwrite.cpp | 9 +- utilities/no13.c | 7 +- utilities/osis2mod.cpp | 287 +- utilities/perl/cipherkeygen.pl | 12 +- utilities/perl/linkvers.pl | 7 +- utilities/perl/localecap.pl | 6 +- utilities/perl/mkvsmod.pl | 38 +- utilities/step2vpl.cpp | 9 +- utilities/stepdump.cpp | 9 +- utilities/sub.c | 12 +- utilities/tei2mod.cpp | 56 +- utilities/treeidxutil.cpp | 11 +- utilities/vcppmake/addgb.vcproj | 194 - utilities/vcppmake/addgb.vcxproj | 117 + utilities/vcppmake/addld.vcproj | 194 - utilities/vcppmake/addld.vcxproj | 117 + utilities/vcppmake/addvs.vcproj | 194 - utilities/vcppmake/addvs.vcxproj | 117 + utilities/vcppmake/cipherraw.vcproj | 194 - utilities/vcppmake/cipherraw.vcxproj | 117 + utilities/vcppmake/emptyvss.vcproj | 194 - utilities/vcppmake/emptyvss.vcxproj | 117 + utilities/vcppmake/genbookutil.vcproj | 194 - utilities/vcppmake/genbookutil.vcxproj | 117 + utilities/vcppmake/imp2gbs.vcproj | 194 - utilities/vcppmake/imp2gbs.vcxproj | 117 + utilities/vcppmake/imp2ld.vcproj | 194 - utilities/vcppmake/imp2ld.vcxproj | 117 + utilities/vcppmake/imp2vs.vcproj | 194 - utilities/vcppmake/imp2vs.vcxproj | 117 + utilities/vcppmake/installmgr.vcproj | 194 - utilities/vcppmake/installmgr.vcxproj | 117 + utilities/vcppmake/lexdump.vcxproj | 117 + utilities/vcppmake/mkfastmod.vcproj | 194 - utilities/vcppmake/mkfastmod.vcxproj | 117 + utilities/vcppmake/mod2imp.vcproj | 194 - utilities/vcppmake/mod2imp.vcxproj | 117 + utilities/vcppmake/mod2osis.vcproj | 194 - utilities/vcppmake/mod2osis.vcxproj | 117 + utilities/vcppmake/mod2vpl.vcproj | 194 - utilities/vcppmake/mod2vpl.vcxproj | 117 + utilities/vcppmake/mod2zmod.vcproj | 194 - utilities/vcppmake/mod2zmod.vcxproj | 116 + utilities/vcppmake/modwrite.vcproj | 194 - utilities/vcppmake/modwrite.vcxproj | 117 + utilities/vcppmake/osis2mod.vcproj | 199 - utilities/vcppmake/osis2mod.vcxproj | 123 + utilities/vcppmake/step2vpl.vcproj | 194 - utilities/vcppmake/step2vpl.vcxproj | 117 + utilities/vcppmake/stepdump.vcproj | 194 - utilities/vcppmake/stepdump.vcxproj | 117 + utilities/vcppmake/tei2mod.vcproj | 194 - utilities/vcppmake/tei2mod.vcxproj | 117 + utilities/vcppmake/treeidxutil.vcproj | 194 - utilities/vcppmake/treeidxutil.vcxproj | 117 + utilities/vcppmake/utilities.sln | 426 +- utilities/vcppmake/vpl2mod.vcproj | 194 - utilities/vcppmake/vpl2mod.vcxproj | 117 + utilities/vcppmake/vs2osisref.vcproj | 194 - utilities/vcppmake/vs2osisref.vcxproj | 117 + utilities/vcppmake/vs2osisreftxt.vcproj | 194 - utilities/vcppmake/vs2osisreftxt.vcxproj | 117 + utilities/vcppmake/xml2gbs.vcproj | 194 - utilities/vcppmake/xml2gbs.vcxproj | 117 + utilities/vpl2mod.cpp | 38 +- utilities/vs2osisref.cpp | 9 +- utilities/vs2osisreftxt.cpp | 14 +- utilities/xml2gbs.cpp | 16 +- 837 files changed, 64303 insertions(+), 60642 deletions(-) create mode 100644 bindings/CMakeLists.txt delete mode 100644 bindings/Makefile delete mode 100644 bindings/Makefile.am delete mode 100755 bindings/autogen.sh delete mode 100644 bindings/configure.ac delete mode 100644 bindings/corba/Makefile.am delete mode 100644 bindings/corba/java/Makefile.in create mode 100644 bindings/java-jni/jni/Application.mk create mode 100644 bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj delete mode 100644 bindings/objc/build_sword/Makefile create mode 100755 bindings/objc/dependencies/retrieve_iOS.sh create mode 100644 bindings/objc/src/DefaultFilterProvider.h create mode 100644 bindings/objc/src/DefaultFilterProvider.mm create mode 100644 bindings/objc/src/FilterProviderFactory.h create mode 100644 bindings/objc/src/FilterProviderFactory.mm create mode 100644 bindings/objc/src/SwordFilter.h create mode 100644 bindings/objc/src/SwordFilter.mm delete mode 100644 bindings/objc/src/SwordInstallSourceController.h delete mode 100644 bindings/objc/src/SwordInstallSourceController.mm create mode 100755 bindings/objc/src/SwordInstallSourceManager.h create mode 100755 bindings/objc/src/SwordInstallSourceManager.mm create mode 100644 bindings/objc/src/SwordUtil.h create mode 100644 bindings/objc/src/SwordUtil.m create mode 100644 bindings/objc/src/services/iOSConfiguration.h create mode 100644 bindings/objc/src/services/iOSConfiguration.m create mode 100644 bindings/objc/test/Tests-Info.plist create mode 100644 bindings/swig/CMakeLists.txt create mode 100644 bindings/swig/deprecations.i create mode 100755 bindings/swig/examples/av11n.py delete mode 100644 bindings/swig/ftptrans.i create mode 100644 bindings/swig/multimapwdef.i create mode 100644 bindings/swig/package/README delete mode 100644 bindings/swig/package/README.cvs create mode 100644 bindings/swig/package/deprecations.i delete mode 100644 bindings/swig/package/ftptrans.i mode change 100755 => 100644 bindings/swig/package/ltmain.sh create mode 100644 bindings/swig/package/m4/libtool.m4 create mode 100644 bindings/swig/package/m4/ltoptions.m4 create mode 100644 bindings/swig/package/m4/ltsugar.m4 create mode 100644 bindings/swig/package/m4/ltversion.m4 create mode 100644 bindings/swig/package/m4/lt~obsolete.m4 create mode 100644 bindings/swig/package/multimapwdef.i create mode 100644 bindings/swig/package/remotetrans.i create mode 100644 bindings/swig/perl/CMakeLists.txt create mode 100644 bindings/swig/perl/install.cmake create mode 100644 bindings/swig/python/CMakeLists.txt create mode 100644 bindings/swig/python/install.cmake.in create mode 100644 bindings/swig/remotetrans.i delete mode 100644 cmake/bindings.cmake create mode 100755 cmake/build-debug.sh create mode 100755 cmake/build-release.sh create mode 100644 cmake/options.cmake create mode 100644 cmake/toolchains/Toolchain-mingw32.cmake create mode 100644 cmake/toolchains/Toolchain-mingw64-x64.cmake create mode 100644 cmake/toolchains/Toolchain-mingw64-x86.cmake delete mode 100644 doc/greektrans.txt create mode 100644 examples/classes/README create mode 100644 examples/classes/lastVerseInChapter.cpp create mode 100644 examples/classes/showchapter.cpp create mode 100644 examples/classes/verseposition.cpp create mode 100644 examples/classes/verseranges.cpp delete mode 100644 icu/Makefile.am delete mode 100644 icu/Makefile.in delete mode 100644 icu/translit_Any_Latex.txt delete mode 100644 icu/translit_Any_Latin1.txt delete mode 100644 icu/translit_BETA_Greek.txt delete mode 100644 icu/translit_BGreek_Greek.txt delete mode 100644 icu/translit_CCAT_Hebrew.txt delete mode 100644 icu/translit_CCAT_Syriac.txt delete mode 100644 icu/translit_Latin_Coptic.txt delete mode 100644 icu/translit_Latin_Gothic.txt delete mode 100644 icu/translit_Latin_Ugaritic.txt delete mode 100644 icu/translit_swordindex.txt delete mode 100644 include/Greek2Greek.h delete mode 100644 include/GreekChars.h create mode 100644 include/bz2comprs.h create mode 100644 include/canon_lxx.h create mode 100644 include/canon_orthodox.h delete mode 100644 include/canon_synodalp.h create mode 100644 include/canon_synodalprot.h delete mode 100644 include/config.h delete mode 100644 include/ftptrans.h create mode 100644 include/gbfxhtml.h create mode 100644 include/osisenum.h create mode 100644 include/osisglosses.h create mode 100644 include/osisreferencelinks.h delete mode 100644 include/osisruby.h create mode 100644 include/osisxhtml.h create mode 100644 include/osisxlit.h delete mode 100644 include/plainfootnotes.h delete mode 100644 include/plainhtml.h create mode 100644 include/remotetrans.h create mode 100644 include/scsuutf8.h delete mode 100644 include/swunicod.h create mode 100644 include/swversion.h.in create mode 100644 include/teixhtml.h create mode 100644 include/thmlxhtml.h delete mode 100644 include/versemgr.h create mode 100644 include/versificationmgr.h create mode 100644 include/xzcomprs.h create mode 100644 lib/vcppmake/libsword.sln create mode 100644 lib/vcppmake/libsword.vcxproj delete mode 100644 lib/vcppmake/vc8/libsword.vcproj create mode 100644 locales.d/ar-utf8.conf create mode 100644 locales.d/bg-utf8.conf delete mode 100644 locales.d/bg_BG-utf8.conf create mode 100644 locales.d/fo-utf8.conf create mode 100644 locales.d/iu-utf8.conf create mode 100644 locales.d/pon_utf8.conf create mode 100644 locales.d/ru-utf8.conf create mode 100644 locales.d/uk-utf8.conf delete mode 100644 locales.d/uk_UA-utf8.conf mode change 100755 => 100644 ltmain.sh delete mode 100644 m4/colored-echo.m4 delete mode 100644 olb/Convert.bpr delete mode 100644 olb/Convert.cpp delete mode 100644 olb/Doinit.c delete mode 100644 olb/Getstrng.c delete mode 100644 olb/Getvrsn.c delete mode 100644 olb/Mainfrm.cpp delete mode 100644 olb/Mainfrm.dfm delete mode 100644 olb/Mainfrm.h delete mode 100644 olb/Online.c delete mode 100644 olb/addstrongs.cpp delete mode 100644 olb/dumpav.cpp delete mode 100644 olb/olb.bpg delete mode 100644 olb/olb2sword.bpr delete mode 100644 olb/olb2sword.cpp delete mode 100644 olb/online.ide delete mode 100644 olb/online.prj delete mode 100644 olb/prn2sword.bpr delete mode 100644 olb/prn2sword.cpp delete mode 100644 olb/prn2swordfrm.cpp delete mode 100644 olb/prn2swordfrm.dfm delete mode 100644 olb/prn2swordfrm.h delete mode 100644 samples/mods.conf.large delete mode 100644 samples/mods.conf.small delete mode 100644 samples/mods.d/rwp.conf delete mode 100644 samples/mods.d/strongsnt.conf delete mode 100644 samples/mods.d/strongsot.conf delete mode 100644 samples/mods.d/vines.conf delete mode 100644 samples/mods.d/web.conf delete mode 100644 samples/mods.d/websters.conf delete mode 100755 scripts/burncd delete mode 100755 scripts/demotar delete mode 100755 scripts/disttar delete mode 100755 scripts/dlltar delete mode 100755 scripts/eastonstar delete mode 100755 scripts/mhctar delete mode 100755 scripts/mkcd delete mode 100755 scripts/svetar delete mode 100755 scripts/swordenv delete mode 100755 scripts/swtxtdsp.bat delete mode 100755 scripts/vinestar delete mode 100755 scripts/webtar delete mode 100644 src/frontend/X11/Makefile delete mode 100644 src/frontend/windoze/Makefile delete mode 100644 src/keys/genarray.c delete mode 100644 src/keys/nt.bks delete mode 100644 src/keys/nt.cps delete mode 100644 src/keys/ot.bks delete mode 100644 src/keys/ot.cps delete mode 100644 src/mgr/ftptrans.cpp create mode 100644 src/mgr/remotetrans.cpp delete mode 100644 src/mgr/versemgr.cpp create mode 100644 src/mgr/versificationmgr.cpp create mode 100644 src/modules/comments/rawcom4/Makefile create mode 100644 src/modules/common/bz2comprs.cpp delete mode 100644 src/modules/common/compress.cpp.txt create mode 100644 src/modules/common/lzsscomprs.txt delete mode 100644 src/modules/common/swcomprs.doc create mode 100644 src/modules/common/xzcomprs.cpp create mode 100644 src/modules/filters/gbfxhtml.cpp create mode 100644 src/modules/filters/osisenum.cpp create mode 100644 src/modules/filters/osisglosses.cpp create mode 100644 src/modules/filters/osisreferencelinks.cpp delete mode 100644 src/modules/filters/osisruby.cpp create mode 100644 src/modules/filters/osisxhtml.cpp create mode 100644 src/modules/filters/osisxlit.cpp delete mode 100644 src/modules/filters/plainfootnotes.cpp delete mode 100644 src/modules/filters/plainhtml.cpp create mode 100644 src/modules/filters/scsuutf8.cpp create mode 100644 src/modules/filters/teixhtml.cpp create mode 100644 src/modules/filters/thmlxhtml.cpp delete mode 100644 src/modules/readme create mode 100644 src/modules/texts/rawtext4/Makefile delete mode 100644 src/utilfuns/swunicod.cpp create mode 100755 test-driver create mode 100644 tests/bibliotest.cpp create mode 100644 tests/osistest.cpp create mode 100644 tests/testsuite/osis.good create mode 100755 tests/testsuite/osis.sh create mode 100644 tests/testsuite/osisReference.xml create mode 100644 tests/testsuite/sword.conf create mode 100644 utilities/diatheke/diatheke.sln delete mode 100644 utilities/diatheke/diatheke.vcproj create mode 100644 utilities/diatheke/diatheke.vcxproj mode change 100644 => 100755 utilities/diatheke/tcl/makebooklist.pl create mode 100644 utilities/genarray.c delete mode 100644 utilities/vcppmake/addgb.vcproj create mode 100644 utilities/vcppmake/addgb.vcxproj delete mode 100644 utilities/vcppmake/addld.vcproj create mode 100644 utilities/vcppmake/addld.vcxproj delete mode 100644 utilities/vcppmake/addvs.vcproj create mode 100644 utilities/vcppmake/addvs.vcxproj delete mode 100644 utilities/vcppmake/cipherraw.vcproj create mode 100644 utilities/vcppmake/cipherraw.vcxproj delete mode 100644 utilities/vcppmake/emptyvss.vcproj create mode 100644 utilities/vcppmake/emptyvss.vcxproj delete mode 100644 utilities/vcppmake/genbookutil.vcproj create mode 100644 utilities/vcppmake/genbookutil.vcxproj delete mode 100644 utilities/vcppmake/imp2gbs.vcproj create mode 100644 utilities/vcppmake/imp2gbs.vcxproj delete mode 100644 utilities/vcppmake/imp2ld.vcproj create mode 100644 utilities/vcppmake/imp2ld.vcxproj delete mode 100644 utilities/vcppmake/imp2vs.vcproj create mode 100644 utilities/vcppmake/imp2vs.vcxproj delete mode 100644 utilities/vcppmake/installmgr.vcproj create mode 100644 utilities/vcppmake/installmgr.vcxproj create mode 100644 utilities/vcppmake/lexdump.vcxproj delete mode 100644 utilities/vcppmake/mkfastmod.vcproj create mode 100644 utilities/vcppmake/mkfastmod.vcxproj delete mode 100644 utilities/vcppmake/mod2imp.vcproj create mode 100644 utilities/vcppmake/mod2imp.vcxproj delete mode 100644 utilities/vcppmake/mod2osis.vcproj create mode 100644 utilities/vcppmake/mod2osis.vcxproj delete mode 100644 utilities/vcppmake/mod2vpl.vcproj create mode 100644 utilities/vcppmake/mod2vpl.vcxproj delete mode 100644 utilities/vcppmake/mod2zmod.vcproj create mode 100644 utilities/vcppmake/mod2zmod.vcxproj delete mode 100644 utilities/vcppmake/modwrite.vcproj create mode 100644 utilities/vcppmake/modwrite.vcxproj delete mode 100644 utilities/vcppmake/osis2mod.vcproj create mode 100644 utilities/vcppmake/osis2mod.vcxproj delete mode 100644 utilities/vcppmake/step2vpl.vcproj create mode 100644 utilities/vcppmake/step2vpl.vcxproj delete mode 100644 utilities/vcppmake/stepdump.vcproj create mode 100644 utilities/vcppmake/stepdump.vcxproj delete mode 100644 utilities/vcppmake/tei2mod.vcproj create mode 100644 utilities/vcppmake/tei2mod.vcxproj delete mode 100644 utilities/vcppmake/treeidxutil.vcproj create mode 100644 utilities/vcppmake/treeidxutil.vcxproj delete mode 100644 utilities/vcppmake/vpl2mod.vcproj create mode 100644 utilities/vcppmake/vpl2mod.vcxproj delete mode 100644 utilities/vcppmake/vs2osisref.vcproj create mode 100644 utilities/vcppmake/vs2osisref.vcxproj delete mode 100644 utilities/vcppmake/vs2osisreftxt.vcproj create mode 100644 utilities/vcppmake/vs2osisreftxt.vcxproj delete mode 100644 utilities/vcppmake/xml2gbs.vcproj create mode 100644 utilities/vcppmake/xml2gbs.vcxproj diff --git a/CMakeLists.txt b/CMakeLists.txt index 37dc16b..c82f15d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ # A CMake port of the SWORD build system... we hope PROJECT(libsword CXX C) CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) -SET(SWORD_VERSION 1.6.2) +SET(SWORD_VERSION 1.7.2) # Make sure it's an out-of-stream build IF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) @@ -29,15 +29,19 @@ MESSAGE(STATUS "Configuring your system to build libsword.") # # Our include directory, for our own internally created "FIND_PACKAGE" calls, like CLucene SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +# User options +INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/options.cmake") # Source variables INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/sources.cmake") # Our local includes -INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/include") +INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/include") # For swversion.h +INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/include") # For everything else ########################################################################################### # This will look for various libraries that libsword builds against. There is no REQUIRED # attribute added here, since all of the libraries here are not, in actuality, required. # +MESSAGE(STATUS "\n-- SEARCHING FOR SYTEM PACKAGES") # Find our packages FIND_PACKAGE(ZLIB QUIET) FIND_PACKAGE(ICU QUIET) @@ -65,11 +69,17 @@ IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*" OR NOT LIBSWORD_LIBRARY_TYPE) ADD_LIBRARY(sword SHARED ${sword_SOURCES}) MESSAGE(STATUS "Building Shared library.") SET(BUILDING_SHARED 1) + SET(SWORD_LINK_NAME sword) ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*" OR NOT LIBSWORD_LIBRARY_TYPE) IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE) ADD_LIBRARY(sword_static STATIC ${sword_SOURCES}) + SET_TARGET_PROPERTIES(sword_static PROPERTIES COMPILE_FLAGS "-fPIC") SET(BUILDING_STATIC 1) + # Defaults to linking against the shared if it is also being built + IF(NOT BUILDING_SHARED) + SET(SWORD_LINK_NAME sword_static) + ENDIF(NOT BUILDING_SHARED) # With MSVC, the .dll files also create .lib files of the same name # with the exported symbols. Thus, we don't want the two to have the # same exact name. In other systems, the .a and .so suffixes suffice @@ -77,30 +87,18 @@ IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE) IF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") SET_TARGET_PROPERTIES(sword_static PROPERTIES OUTPUT_NAME "sword") - MESSAGE(STATUS "Building Static library with name sword") + #MESSAGE(STATUS "Building Static library with name sword") ELSE(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") - MESSAGE(STATUS "Building Static library with name - sword_static") + #MESSAGE(STATUS "Building Static library with name + #sword_static") ENDIF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") + MESSAGE(STATUS "Building Static library.") ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE) ################################################################################################ # Some random user settings # -IF(SWORD_ENABLE_PROFILE STREQUAL "Yes") - SET_TARGET_PROPERTIES(sword - PROPERTIES COMPILE_FLAGS "-pg" - ) -ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes") - -IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") - SET_TARGET_PROPERTIES(sword - PROPERTIES COMPILE_FLAGS "-g -finstrument-functions" - ) - TARGET_LINK_LIBRARIES(libsword fnccheck) -ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") - IF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "") ADD_DEFINITIONS(-DGLOBCONFPATH="${SWORD_GLOBAL_CONF_DIR}/sword.conf") ENDIF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "") @@ -123,33 +121,41 @@ IF(BUILDING_SHARED) ENDIF(BUILDING_SHARED) ############################################################################################### -# Some options are only needed if we're going to be building a debug option into the library -# These are generally only for developer building and testing +# The buildflags depend on the CMAKE_BUILD_TYPE supplied at the command line. +# For a full lists of different flags see http://cmake.org/Wiki/CMake_Useful_Variables +# +# Cmake has sane defaults for None aka '', DEBUG, RELEASE, RELWITHDEBINFO for known compilers. +# +# You can override these variables on the command-line or here. +# We provide our own defaults below # -# Debug testing -IF(CMAKE_BUILD_TYPE STREQUAL "Debug") - SET(SWORD_CFLAGS "-g3 -Wall -Werror -O0") -ELSE(CMAKE_BUILD_TYPE STREQUAL "Debug") - SET(SWORD_CFLAGS "-O3") -ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug") +# Note the below two initialisations done for us by cmake: +# +#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" or "$ENV{CFLAGS}" or "" ) +#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" or "$ENV{CXXFLAGS}" or "" ) IF(SWORD_ENABLE_WARNINGS STREQUAL "Yes") - SET(SWORD_CFLAGS "${SWORD_CFLAGS} -Werror") + SET(CMAKE_C_FLAGS "-Werror ${CMAKE_C_FLAGS}") + SET(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}") ENDIF(SWORD_ENABLE_WARNINGS STREQUAL "Yes") -IF(BUILDING_SHARED) - SET_TARGET_PROPERTIES(sword - PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS} - ) -ENDIF(BUILDING_SHARED) +IF(SWORD_ENABLE_PROFILE STREQUAL "Yes") + SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}") + SET(CMAKE_CXX_FLAGS "-pg ${CMAKE_CXX_FLAGS}") +ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes") -IF(BUILDING_STATIC) - SET_TARGET_PROPERTIES(sword_static - PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS} - ) -ENDIF(BUILDING_STATIC) +IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") + SET(CMAKE_C_FLAGS "-g -finstrument-functions ${CMAKE_C_FLAGS}") + SET(CMAKE_CXX_FLAGS "-g -finstrument-functions ${CMAKE_CXX_FLAGS}") + TARGET_LINK_LIBRARIES(libsword fnccheck) +ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") -MESSAGE(STATUS "Setting CFlags for compile to ${SWORD_CFLAGS}") +SET(CMAKE_C_FLAGS_DEBUG "-g3 -Wall -O0 ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_C_FLAGS}") +SET(CMAKE_CXX_FLAGS_DEBUG "-g3 -Wall -O0 ${CMAKE_CXX_FLAGS}") +SET(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS}") +SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_CXX_FLAGS}") ############################################################################################## # Setting libraries and includes @@ -160,6 +166,25 @@ IF(WITH_ZLIB) SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ZLIB_LIBRARY}) ENDIF(WITH_ZLIB) IF(WITH_CURL) + FIND_PROGRAM(CURL_CONFIG curl-config + DOC "The curl-config executable path, used to determine SFTP support.") + # If we can find the config script, we will run it and attempt to parse out the + # availability of SFTP support. Otherwise, we will assume the library was built + # without it. + IF(CURL_CONFIG) + EXECUTE_PROCESS( + COMMAND ${CURL_CONFIG} --protocols + COMMAND grep SFTP + COMMAND wc -l + OUTPUT_VARIABLE CURL_CONFIG_OUTPUT + OUTPUT_STRIP_TRAILING_WHITESPACE) + IF(CURL_CONFIG_OUTPUT STREQUAL "1") + ADD_DEFINITIONS(-DCURLSFTPAVAILABLE) + MESSAGE(STATUS "cURL SFTP Support: Yes") + ELSE(CURL_CONFIG_OUTPUT STREQUAL "1") + MESSAGE(STATUS "cURL SFTP Support: No") + ENDIF(CURL_CONFIG_OUTPUT STREQUAL "1") + ENDIF(CURL_CONFIG) INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CURL_LIBRARY}) ENDIF(WITH_CURL) @@ -167,11 +192,19 @@ IF(WITH_CLUCENE) INCLUDE_DIRECTORIES(${CLUCENE_INCLUDE_DIR}) SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY}) LINK_DIRECTORIES(${CLUCENE_LIBRARY_DIR}) + ADD_DEFINITIONS(-DUSELUCENE) + IF(CLUCENE2) + ADD_DEFINITIONS(-DCLUCENE2) + ENDIF(CLUCENE2) ENDIF(WITH_CLUCENE) IF(WITH_ICU) INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS}) + ADD_DEFINITIONS(${ICU_DEFINITIONS}) SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}) ENDIF(WITH_ICU) +IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32) + SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY}) +ENDIF(REGEX_FOUND AND CROSS_COMPILE_MINGW32) IF(BUILDING_SHARED) TARGET_LINK_LIBRARIES(sword ${SWORD_LINK_LIBRARIES}) @@ -219,9 +252,9 @@ INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake") # Bindings are good, right? # -IF(NOT SWORD_BINDINGS STREQUAL "") - INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/bindings.cmake") -ENDIF(NOT SWORD_BINDINGS STREQUAL "") +IF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS) + ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/bindings") +ENDIF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS) ############################################################################################## # Utilities are hawt diff --git a/ChangeLog b/ChangeLog index d6fc591..a8eeb32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,230 @@ -API ChangeLog +API ChangeLog + + +* Release 1.7.0 * + +5-Oct-2013 Troy A. Griffitts + Add a new Option filter, OSISReferenceLinks, based on work submitted + by "John Austin", which allows removal of references based on + a type/subtype combination. .conf usage is: + GlobalOptionFilter=OSISReferenceLinks|Option Name|Option Tip + |OSIS Reference Type|OSIS Reference SubType|Default Value + e.g, + GlobalOptionFilter=OSISReferenceLinks|Reference Material Links + |Hide or show links in the Biblical text to study helps|x-glossary + ||On + +14-Aug-2013 Troy A. Griffitts + Added new version macros in swversion.h and removed + config.h as a packaged and included entity + +2-Aug-2013 Chris Little + Added basic bibliography method to SWModule + (mostly from refdoc's patch) + +16-July-2013 Troy A. Griffitts + Many classes have had class and method names normalized, including: + VerseMgr renamed to VersificationMgr + SWKey + ListKey + SWModule + +13-July-2013 Chris Little + Added LXX & Orthodox versifications + +13-July-2013 Troy A. Griffitts + InstallMgr FTP now has a 45 second timeout + +11-July-2013 Troy A. Griffitts + SWIG bindings updated to build and work with autotools + +8-Jul-2013 Chris Little + Applied submitted UTF8ArabicPoints code + Plugged Bzip2Compress & XzCompress into the API, though these + remain clones of the ZipCompress class and will not be + supported in 1.7.0 + +6-July-2013 Jaak Ristioja + InstallMgr HTTP transport, fix for buffer overrun in non-standard + Apache dir list output + +29-Jun=2013 Chris Little + Removed PLAINHTML and PLAINFootnotes filters + +19-Jun-2013 Gregory S. Hellings + Introduced CMake options to specify exact install locations + of subcomponents + +11-Jun-2013 Troy A. Griffitts + Changed SWBuf append methods to return *this, so they can be chained + Added a new method SWBuf::indexOf + New XHTML Filters based on HTMLHREF but now support: + tables, sub, and super elements, hi rend attribute for + overline of nom sac + better whitespace processing for: + block tags by supressing multiple vspace + poetry lines + +10-Jun-2013 Chris Little + Added basic OSISEnum & OSISXlit filters + Renamed OSISRuby to the more general OSISGlosses + +7-Jun-2013 Troy A. Griffitts + Enhanced regex searches to return result which cross a single + verse boundaries + +30-May-2013 Troy A. Griffitts + Generalized Transport interface from 'FTP' to 'Remote' to better + accommodate HTTP, SFTP, etc. + +11-April-2013 Troy A. Griffitts + Verse parser updates, including: + Fixed parsing of Ps.V + Added parsing of special 'inscriptio' and 'subscriptio' entries + resolving to special Book 0:0 and Book 1:0 + respectively + e.g., Matt.Inscr -> Matt.0.0; Matt.Subscrip -> Matt.1.0 + Better handling of verse suffix, e.g., John.1.3b + Handle comma verses properly after range which spans chapters, + e.g., jn.1.1-2.5,9 + +12-Mar-2013 Troy A. Griffitts + More examples, including: show a chapter, verse range + +24-Feb-2013 Troy A. Griffitts + Greatly improved navigation with intros and normalization turned + on/off + +1-Feb-2013 Troy A. Griffitts + New .conf entries honored: + StrongsPadding=false, which turns off + logic to detect strongs numbers and add padding + CaseSensitiveKeys=true, which makes a lexicon case sensitive + +29-Jan-2013 Jaak Ristioja + Removed warnings in header files for unused variables + +06-Jan-2013 Gregory S. Hellings + Added support to install from SFTP sources using username/password + authentication in places where cURL has SFTP support (no support + for public-key auth yet) + +19-Dec-2012 Manfred Bergmann + Added ObjC wrappers for the SWORD filter classes. Mainly because in + Eloquent project it is not possible to access any of the plain + C++ SWORD stuff. Wrappers are necessary + Added FilterProvider and FilterProviderFactory. They have been + created to add the possibility for application to override + the default filters (render/strip). To add a custom FilterProvider, + subclass DefaultFilterProvider and override the methods that are + required to return other filter instances. Then initialize the + Factory with this provider + +[FilterProviderFactory initWithImpl:] + +07-Nov-2012 Chris Little + Starting (very minimal) support for TEI in xml2gbs + Generalizing ruby as glosses (for use in non-Japanese texts or + even Japanese texts with non-ruby glosses) + +14-Sep-2012 Troy A. Griffitts + Changed default log level to WARN from INFO + +29-Aug-2012 Gregory S. Hellings + Swig bindings may now be built against shared or static libraries. + Cleaned up almost all gcc 4.7 warnings from the swig bindings and + eliminated errors which packagers had discovered. + Swig bindings are now installed by the normal 'make install' under + CMake + +11-Jul-2012 Troy A. Griffitts + New Lucene index field for searching 'morph' (lemma@morphology) + +21-Jun-2012 Peter von Kaehne + Added Pohnpeian language locale + +25-Apr-2012 Gregory S. Hellings + InstallMgr now supports HTTPS connections where cURL has support + for that transport + +24-Mar-2012 DM Smith + osis2mod: Allow comments to be in osis document and to be stripped out. + From John Zaitseff + osis2mod: Allow div in header of osis document. From John Zaitseff + + +21-Feb-2012 Troy A. Griffitts + Added constants for module types: + SWMgr::MODTYPE_BIBLES, MODTYPE_COMMENTARIES, MODTYPE_LEXDICTS, + MODTYPE_GENBOOKS, MODTYPE_DAILYDEVOS + +14-Feb-2012 Gregory S. Hellings + Added cross-compile support to CMake, including sample Toolchain files. + +13-Feb-2012 Karl Kleinpaste + Added ability for *HTML* wrappers to render n attribute from notes + +30-Jan-2012 Manfred Bergmann + Update to Lion Project. All SWORD utils are now in Xcode project and can + be built from there. They are however prepared to be used from with + Eloquent + +07-Dec-2011 Chris Little + Removed SynodalP v11n from library + +12-Nov-2011 DM Smith + osis2mod: re-added the preverse div markers + +02-Nov-2011 Gregory S. Hellings + Improved handling of CLucene and included support for CLucene 2 + +29-Oct-2011 Troy A. Griffitts + Added RTFHTML parsing of rtf \\number codes to facilitate .conf files + Adjusted abuser detection in SwordOrb and made orbs cycle when max is + reached for an IP (probably a server using us as a service) + Added translate and InstallMgr functions to orb + +29-Sep-2011 Troy A. Griffitts + Added sane parameter parsing to imp2ld + Added methods for utf8 / wchar conversion to help clucene + +07-Aug-2011 Manfred Bergmann + Added new Lion Xcode project where the SWORD stuff is compiled in Xcode + project. Changed -setClass: and instead added a protocol + implementation based setting of configuration + ObjC: Re-added ppc archiecture for Xcode project + +14-Jul-2011 Gregory S. Hellings + Added a sample Python script that demonstrates the bindings and compares + osisIDs in an XML file to known Versification schemes + +10-Jul-2011 Manfred Bergmann + ObjC: Fix and simplification for - + (id)attributeValueForParsedLinkData:(NSDictionary *)data + withTextRenderType:(TextPullType)textType + +10-Jul-2011 Manfred Bergmann + ObjC: Added option to retrieve texts for link data as rendered or + stripped. + Minor changes to SwordInstallSource and Controller. + Adaption of ModuleType "All" to modulesForType: method. + Added additional "All" enum ModuleType + Changed visibility of swordManager. + Added listModulesForType: method. + Added convenience constructor for SwordInstallSourceController. + SwordLocaleManager can be initialized with a given path to + locales.d. Swordbible decodeRef class method will now only pass back + values where not NULL was delivered. + +16-Mar-2011 Peter von Kaehne + Introducing localised keys to imp2vs.cpp + +15-Mar-2011 Peter von Kaehne + Faroese Locale + +10-Jul-2011 Manfred Bergmann + Module names are stored as lower case string in SwordManagers module + cache. -moduleForName: now als uses a lower case string to pull + the module from the cache @@ -74,7 +300,7 @@ API ChangeLog
Added initial set of v11n schemes (Chris Little): KJV, Leningrad, MT, KJVA, NRSV, NRSVA - + 12-Apr-2009 Troy A. Griffitts Added '.' feature for entryAttrib search, e.g, Word//Lemma./G932/ will find in Lemma, Lemma.1, etc. @@ -129,7 +355,6 @@ API ChangeLog Added param on SWBuf::stripPrefix to allow use more like a safe string tokenizer to replace strtok - 16-Dec-2008 Joachim A. Added two Chinese bookname translations provided by F. Lee @@ -150,7 +375,7 @@ API ChangeLog Added Japanese locale from http://bible.50webs.org/en/ Applied Ben Morgan's TEIHTMLHREF filter Added TEIHTMLHREF filter to BCB5 project - + 11-May-2008 Troy A. Griffitts Applied patch to better handle x-refs in notes -Ben Morgan @@ -263,7 +488,7 @@ API ChangeLog Added SWBuf::startsWith, endsWith Added entry attribute exposure of multipart words Added beginnings of VerseKey subclass which uses TreeKey - + 25-Apr-2006 Troy A. Griffitts Changed SWModule::search to fill result set up with more specialized SWKey objects, instead of always SWKey @@ -295,7 +520,7 @@ API ChangeLog Fixed the dutch locale file 21-Sep-2005 Martin Gruner - Added Hebrew locale for both Tanach (OT) and + Added Hebrew locale for both Tanach (OT) and Berit Chadashah (NT). * Release 1.5.8 * @@ -509,7 +734,7 @@ API ChangeLog more consistently deal with strongs numbers 23-Oct-2002 Daniel Glassey - Some base work for installmgr on classes to + Some base work for installmgr on classes to manage mods.d @@ -538,7 +763,7 @@ API ChangeLog 07-Oct-2002 Troy A. Griffitts Fixed rawFilter bug where entrySize was being passed - instead of maxBufferSize. This problem caused + instead of maxBufferSize. This problem caused a number of problems with the engine. Applied a few of Franklin Bratcher's critical patches to diatheke. @@ -679,7 +904,7 @@ API ChangeLog Updated make system to display better user output Updated 'readme'-type files Added make install_config - + 21-Mar-2002 Troy A. Griffitts Changed SWMgr::Load ONE MORE TIME (blame Osk) to return signed char for mac ppc to work correctly @@ -692,7 +917,7 @@ API ChangeLog Added new LocalOptionFilter GreekLexAttribs 18-Mar-2002 Troy A. Griffitts - Added ChrisLit's Diatheke, BibleCS, and InstallMgr updates + Added chrislit's Diatheke, BibleCS, and InstallMgr updates Fixed Joachim's bug report about TreeKeyIdx segfaulting if no data at DataPath Added Joachim's patch to remove throw in SWMgr::Load @@ -701,7 +926,7 @@ API ChangeLog Added Martin Gruner's suggestion to swmgr to look for global configuration in multiple location. Set default to: /etc/sword.conf:/usr/local/etc/sword.conf - Added ChrisLit's msvc and diatheke patches + Added chrislit's msvc and diatheke patches 15-Mar-2002 Troy A. Griffitts Added SWCacher to lib and made SWModule impl it @@ -714,7 +939,7 @@ API ChangeLog 14-Mar-2002 Troy A. Griffitts Changed all make system files to dglassey's ./configure autotool system - Applied ChrisLit's patch for macosx + Applied chrislit's patch for macosx 12-Mar-2002 Troy A. Griffitts Added new option to filemgr open to allow downgrade @@ -753,7 +978,7 @@ API ChangeLog Fixed RawGenBook memory bugs Isolated all byte swapping logic to sysdata.h Changed BIGENDIAN to SWBIGENDIAN - + 27-Feb-2002 Troy A. Griffitts Commited tbiggs' update to thmlhtmlhref.cpp Commited dglassey's update to make system @@ -841,12 +1066,12 @@ API ChangeLog 11-Jun-2001 Troy A. Griffitts Added limited unicode support Added French locale from Dominique Corbex - + 02-Jun-2001 Chris Little Added GBFMorph OptionFilter to handle tags and adjusted GBFStrongs & other filters to not handle as a Strong's number - + 20-May-2001 Joachim Ansorg Updated the Czech translation of booknames (cs.conf) @@ -860,7 +1085,7 @@ Kolatzek. Added emptyvss utility to list empty verses in a module Added warning to vpl2mod for cases where a verse is being overwritten - + 23-Mar-2001 Joachim Ansorg Made some changes to the API documentation in the headers (documented new classes). @@ -922,7 +1147,7 @@ Kolatzek. 10-Dec-2000 Chris Little Added addld utility for adding single entries to LD modules - + 09-Dec-2000 Chris Little Added addvs utility for adding single verses to modules Added Diatheke (and CGI/Tcl/PQA frontends to it) to source @@ -940,7 +1165,6 @@ Kolatzek. Added some initial support for writing to zText Added a 'not working yet' mod2zmod utility - 20-Nov-2000 Troy A. Griffitts Added new utility, step2vpl, for dumping BSISG STEP module in vpl format. @@ -957,12 +1181,11 @@ Kolatzek. * Release 1.5.1a * - 06-Nov-2000 Troy A. Griffitts Added more debug for tests/mgrtest.cpp Hardcoded VerseKey::NewIndex to KJV max index -01-Nov-2000 Joachim Ansorg +01-Nov-2000 Joachim Ansorg Added test program for indexes using VerseKey::NewIndex() 31-Oct-2000 Joachim Ansorg @@ -985,7 +1208,7 @@ Kolatzek. gbfhtml.cpp: Changed the HTML tag for new paragraph from

to
because it's bad HTML without a closing

tag. -23-Oct-2000 Joachim Ansorg +23-Oct-2000 Joachim Ansorg Changed the private section of versekey.h into a protected one because we need the change for current BibleTime! @@ -1002,7 +1225,7 @@ Kolatzek. Added write link support in RawText. Added new test introtest to test module intros. Fixed abbrev parsing to see Phil as Php. - + 05-Sep-2000 Joachim Ansorg Fixed a problem in Makefile.cfg with profiler support and non-debugging lib (-s removes the profiler support, @@ -1029,7 +1252,7 @@ Kolatzek. 16-Aug-2000 Joachim Ansorg Fixed utilities/mkfastmod.cpp - Added a template for translations of international booknames + Added a template for translations of international booknames (doc/translation-template.conf). 14-Aug-2000 Troy A. Griffitts @@ -1107,7 +1330,7 @@ Kolatzek. Added scoped searches More bug fixes, as always Profiling to speed up some sections of code - + 09-Jan-1999 Various API bug fixes. Added navigation support for all module types @@ -1123,12 +1346,12 @@ Kolatzek. Moved directory structure. Added Luis Cortes' wxSword frontend to apps tree. GREAT START! Fixed bug in canon.h that incorrectly assumed static structures were - allocated on the heap sequential if they were in the source + allocated on the heap sequential if they were in the source sequentially. Changed SWModule::Search(char *... to SWModule::Search(const char * Removed -Werror from Makefile.cfg to avoid problems with different warnings that get displayed with different versions of egcs - + 12-Dec-1997 Fixed typo in about box of BibleCS Changed font copyright notice in n27u4 @@ -1148,7 +1371,7 @@ Kolatzek. sword Bible Search WEB knee[ls] WARNING: case sensitive module names See ddetest program under BibleCS directory - + 29-Nov-1997 Added SWFilter and modified appropriate modules to use these. Added RawGBF class that automatically adds a GBFPlain filter to @@ -1168,7 +1391,7 @@ Kolatzek. Added module 'web' (The World English Bible) Added swmgr class for module management. Added swconfig class for .conf file manipulation. - + 05-Oct-1997 Added regular expression functionality to SWModule.Search() Used GNU regex.h and regex.c with slight modifications to #define's @@ -1195,10 +1418,8 @@ Kolatzek. once again.. probably many other things I forgot to list, but I'm getting better! ;) Sorry for the time lapse. - 8-Apr-1996 - Fixed bug in VerseKey for old testament references! Fixed VerseKey from crashing when set with text that it cannot parse. Removed the need for Keys data files. Added information instead to canon.h @@ -1207,9 +1428,7 @@ Kolatzek. Added Delphi components (frontend/windoze/delphi20/swordvc) and examples (examples/windoze/delphi/multimo[1-3]) - 14-Mar-1996 - Renamed RawDrv to RawVerse Moved RawVerse common index files and Index() to VerseKey Added StrKey, a VerseKey counterpart that accepts a string for its @@ -1228,9 +1447,7 @@ Kolatzek. Fixed VerseKey post-increment bug (operator ++(int)) ... once again: probably more that I forgot ... - 15-Feb-1996 - Many small changes. Moved raw file support to RawDrv class (modules/common/rawdrv.cpp) Added Module/Testament/Book/Chapter intro entries in RawDrv index @@ -1258,10 +1475,8 @@ Kolatzek. Almost useful .exe in frontend/windoze/bcowl25/ (at least it shows an example of coding direction for use of the API) ... probably more that I forgot ... - - -22-Jan-1996 +22-Jan-1996 Added chapmax and versemax information (canon.h) Made sword.cpp test program accept parameters: usage: sword ["Book CH:VS"] [number of verses to display] diff --git a/INSTALL b/INSTALL index d70ba81..f3cfb80 100644 --- a/INSTALL +++ b/INSTALL @@ -3,25 +3,53 @@ QUICKSTART -Try: +Either: + Obtain source via SVN with: + svn co http://crosswire.org/svn/sword/trunk sword + cd sword + ./autogen.sh + + or, + unpack a source package and change to that directory. + +Have a look at the OPTIONS in usrinst.sh to see if they suit your needs. +Pay particular attention to libdir=/usr/lib64. Ubuntu and many other +systems store 64bit libraries simply in /usr/lib. If you are building +on a 32-bit machine, you'll almost certainly wish to change this to +/usr/lib + +Then, try: ./usrinst.sh make - su - make install + sudo make install If you have never installed sword before and/or are happy with a default configuration, you may wish to type: - make install_config + sudo make install_config for a basic configuration. WARNING: THIS WILL OVERWRITE AN EXISTING CONFIGURATION. It is OK to rerun this if you have not changed any parameters in /etc/sword.conf +Now let's grab some content: + + cd utilities/ + sudo ./installmgr -sc + sudo ./installmgr -r CrossWire + sudo ./installmgr -ri CrossWire KJV + +Now lets try it out: + + cd ../examples/cmdline + make + ./lookup KJV Jn.3.16 + If the above steps do not work, or if you're particular about your configuration, please read on. +________________________________________________________________ BUILD CONFIGURATION @@ -133,7 +161,7 @@ Also, when a sword.conf file is used, any number of: AugmentDataPath=/where/more/modules/are/installed entries may be included. These are useful to tell sword to scan, -for example, CDROM, MMC, or other removable media locations. +for example, CDROM, SDCARD, or other removable media locations. diff --git a/Makefile.am b/Makefile.am index 4e18b98..5d74eac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ LDADD = $(top_builddir)/lib/libsword.la # Global config directory globalconfdir := @sysconfdir@ -SUBDIRS = lib . icu +SUBDIRS = lib . if BUILDTESTS TESTSDIR = tests @@ -81,7 +81,6 @@ install-data-am: installlocaleDATA installmodsDATA install-pkgconfigDATA uninstall-am: uninstall-info-am uninstalllocaleDATA \ uninstallmodsDATA uninstall-sysconfDATA uninstall-pkgconfigDATA - register: @echo "" echo "(***) $$USER@$$HOSTNAME, $$(date), $$(uname -m -r -s), SWORD @VERSION@, ${pkgdatadir}" | mail sword.users@crosswire.org diff --git a/Makefile.in b/Makefile.in index bc802d8..36b209e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,55 +81,87 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ noinst_PROGRAMS = buildtest$(EXEEXT) -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/doc/Makefile.am \ - $(srcdir)/locales.d/Makefile.am $(srcdir)/samples/Makefile.am \ - $(srcdir)/sword.pc.in $(srcdir)/sword.spec.in \ - $(top_srcdir)/configure $(top_srcdir)/include/config.h.in \ - AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \ - depcomp install-sh ltmain.sh missing +DIST_COMMON = $(srcdir)/locales.d/Makefile.am \ + $(srcdir)/samples/Makefile.am $(srcdir)/doc/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(top_srcdir)/include/config.h.in $(srcdir)/sword.pc.in \ + $(top_srcdir)/include/swversion.h.in $(srcdir)/sword.spec.in \ + depcomp AUTHORS COPYING ChangeLog INSTALL NEWS README \ + config.guess config.sub install-sh missing ltmain.sh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ - $(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = sword.pc sword.spec +CONFIG_CLEAN_FILES = sword.pc include/swversion.h sword.spec CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) am_buildtest_OBJECTS = buildtest.$(OBJEXT) buildtest_OBJECTS = $(am_buildtest_OBJECTS) buildtest_LDADD = $(LDADD) buildtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(buildtest_SOURCES) DIST_SOURCES = $(buildtest_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -107,24 +183,54 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(sysconfdir)" DATA = $(pkgconfig_DATA) $(sysconf_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = lib . icu tests utilities examples +CSCOPE = cscope +DIST_SUBDIRS = lib . tests utilities examples DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -152,11 +258,16 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -166,6 +277,8 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@ +CLUCENE2_LIBS = @CLUCENE2_LIBS@ CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@ CLUCENE_LIBS = @CLUCENE_LIBS@ CPP = @CPP@ @@ -191,9 +304,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GENCCODE = @GENCCODE@ -GENCMN = @GENCMN@ -GENRB = @GENRB@ GREP = @GREP@ ICU_CONFIG = @ICU_CONFIG@ ICU_IOLIBS = @ICU_IOLIBS@ @@ -214,6 +324,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -226,20 +337,29 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGDATA = @PKGDATA@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@ +SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@ +SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@ +SWORD_VERSION_NANO = @SWORD_VERSION_NANO@ +SWORD_VERSION_NUM = @SWORD_VERSION_NUM@ +SWORD_VERSION_STR = @SWORD_VERSION_STR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -276,7 +396,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -308,7 +427,7 @@ LDADD = $(top_builddir)/lib/libsword.la # Global config directory globalconfdir := @sysconfdir@ -SUBDIRS = lib . icu $(TESTSDIR) $(UTILSDIR) $(EXAMPLESDIR) +SUBDIRS = lib . $(TESTSDIR) $(UTILSDIR) $(EXAMPLESDIR) @BUILDTESTS_FALSE@TESTSDIR = @BUILDTESTS_TRUE@TESTSDIR = tests @BUILDUTILS_FALSE@UTILSDIR = @@ -317,7 +436,6 @@ SUBDIRS = lib . icu $(TESTSDIR) $(UTILSDIR) $(EXAMPLESDIR) @BUILDEXAMPLES_TRUE@EXAMPLESDIR = examples EXTRA_DIST = sword.spec sword.kdevprj sword.bmp usrinst.sh autogen.sh \ sword.pc.in $(localeDATA) samples/mods.d/globals.conf \ - $(swdocdir)/greektrans.txt \ $(swdocdir)/translation-template.conf @USE_PKGCONF_TRUE@pkgconfigdir = $(libdir)/pkgconfig @USE_PKGCONF_TRUE@pkgconfig_DATA = sword.pc @@ -333,7 +451,7 @@ all: all-recursive .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/locales.d/Makefile.am $(srcdir)/samples/Makefile.am $(srcdir)/doc/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -358,6 +476,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/locales.d/Makefile.am $(srcdir)/samples/Makefile.am $(srcdir)/doc/Makefile.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -369,10 +488,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): include/config.h: include/stamp-h1 - @if test ! -f $@; then \ - rm -f include/stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f include/stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1; else :; fi include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status @rm -f include/stamp-h1 @@ -386,6 +503,8 @@ distclean-hdr: -rm -f include/config.h include/stamp-h1 sword.pc: $(top_builddir)/config.status $(srcdir)/sword.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ +include/swversion.h: $(top_builddir)/config.status $(top_srcdir)/include/swversion.h.in + cd $(top_builddir) && $(SHELL) ./config.status $@ sword.spec: $(top_builddir)/config.status $(srcdir)/sword.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ @@ -397,9 +516,10 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -buildtest$(EXEEXT): $(buildtest_OBJECTS) $(buildtest_DEPENDENCIES) + +buildtest$(EXEEXT): $(buildtest_OBJECTS) $(buildtest_DEPENDENCIES) $(EXTRA_buildtest_DEPENDENCIES) @rm -f buildtest$(EXEEXT) - $(CXXLINK) $(buildtest_OBJECTS) $(buildtest_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(buildtest_OBJECTS) $(buildtest_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -410,25 +530,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buildtest.Po@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -440,8 +560,11 @@ distclean-libtool: -rm -f libtool config.lt install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -455,13 +578,14 @@ uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) - test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -475,27 +599,28 @@ uninstall-sysconfDATA: @$(NORMAL_UNINSTALL) @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(sysconfdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(sysconfdir)" && rm -f $$files + dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -510,57 +635,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -576,12 +656,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -593,15 +668,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -610,9 +681,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -648,13 +741,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -686,36 +776,36 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -726,8 +816,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -737,9 +827,9 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -747,6 +837,7 @@ distcheck: dist && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -770,13 +861,21 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -809,10 +908,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: @INSTCONF_FALSE@clean-generic: @@ -894,15 +998,14 @@ ps: ps-recursive ps-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-hdr \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool clean-noinstPROGRAMS cscope cscopelist-am ctags \ + ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \ + dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -913,8 +1016,8 @@ ps-am: installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-pkgconfigDATA uninstall-sysconfDATA + tags tags-am uninstall uninstall-am uninstall-pkgconfigDATA \ + uninstall-sysconfDATA @USE_PKGCONF_TRUE@$(pkgconfig_DATA): config.status diff --git a/README b/README index 64e6cfe..37a23f3 100644 --- a/README +++ b/README @@ -24,7 +24,9 @@ UNIX DEVELOPERS If you are an end user looking for a nice SWORD, graphical Bible study software suite, then you'll probably want to download one of the - many nice frontends found at http://crosswire.org + many nice frontends found at + + http://crosswire.org/applications.jsp ./buildtest.cpp compiles to the executable 'buildtest' as a test to see if the libs have compiled and can be linked against successfully. @@ -44,7 +46,7 @@ LANGUAGE BINDINGS Kylix bindings (and maybe Delphi bindings) may be found in sword/bindings/clx CORBA (orbit-c++) bindings with Java example classes in /bindings/corba Perl stuff in bindings/perl - SWIG stuff (Python, .NET, many others) in bindings/swig + SWIG stuff (Python, Perl) in bindings/swig C++BUILDER DEVELOPERS diff --git a/aclocal.m4 b/aclocal.m4 index b2d53d3..fea5b70 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,216 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +232,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,22 +251,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -84,7 +285,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -110,22 +311,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -144,16 +342,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -163,7 +359,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -176,12 +372,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -189,8 +386,9 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -229,16 +427,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -247,16 +445,16 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -304,7 +502,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -314,34 +512,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -354,7 +557,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -366,21 +569,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -398,7 +599,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -406,29 +607,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -444,7 +630,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -473,31 +659,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -508,28 +703,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -557,7 +756,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -576,16 +775,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -602,20 +799,17 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -623,13 +817,14 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -637,18 +832,14 @@ AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -666,7 +857,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -693,15 +884,12 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -709,11 +897,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -726,63 +913,64 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# -*- Autoconf -*- +# Obsolete and "removed" macros, that must however still report explicit +# error messages when used, to smooth transition. +# +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) +AC_DEFUN([AM_CONFIG_HEADER], +[AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl +AC_CONFIG_HEADERS($@)]) + +AC_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should simply use the 'AC][_PROG_CC' macro instead. +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', +but upon 'ac_cv_prog_cc_stdc'.])]) + +AC_DEFUN([AM_C_PROTOTYPES], + [AC_FATAL([automatic de-ANSI-fication support has been removed])]) +AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -795,22 +983,16 @@ AC_DEFUN([_AM_IF_OPTION], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -821,32 +1003,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -856,9 +1046,85 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -866,34 +1132,32 @@ AC_MSG_RESULT(yes)]) # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -901,24 +1165,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -928,81 +1190,119 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([m4/acx_clucene.m4]) -m4_include([m4/colored-echo.m4]) m4_include([m4/cppunit.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt new file mode 100644 index 0000000..9caf6d6 --- /dev/null +++ b/bindings/CMakeLists.txt @@ -0,0 +1,5 @@ +IF(SWORD_BINDINGS MATCHES ".*Python.*" + OR SWORD_BINDINGS MATCHES ".*Perl.*") + ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/swig") +ENDIF(SWORD_BINDINGS MATCHES ".*Python.*" + OR SWORD_BINDINGS MATCHES ".*Perl.*") diff --git a/bindings/Makefile b/bindings/Makefile deleted file mode 100644 index 2ea344d..0000000 --- a/bindings/Makefile +++ /dev/null @@ -1,9 +0,0 @@ - -root := .. -targets := ${root}/lib/libsword.a -clean-targets := none -include ${root}/Makefile.cfg - -cpp += flatapi.cpp - -include ${root}/Makefile.post diff --git a/bindings/Makefile.am b/bindings/Makefile.am deleted file mode 100644 index 7d6c0d2..0000000 --- a/bindings/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -if CORBA -corbadir = corba -else -corbadir = -endif - -SUBDIRS = $(corbadir) diff --git a/bindings/README b/bindings/README index 3cc3735..66b6790 100644 --- a/bindings/README +++ b/bindings/README @@ -1,3 +1,38 @@ +Building Perl or Python (through swig) +------------- + +Using autotools +--------------- +See swig/packages/README + +Using CMake +----------- +Building the SWIG (Perl, Python) bindings with the CMake toolchain requires installing +the CMake application appropriate to your operating system (most Linux distributions +will have this as an existing package as CMake is integral to building many popular +applications). + +Additionally you will need the development packages for the language you are targeting +and the swig application itself. All of these should be directly available through your +distribution's package system. + +Python: In Fedora you can get this with a 'yum install python-devel' and a similar call +to apt-get in Debian/Ubuntu/etc. +Perl: In Fedora you're looking for 'yum install perl-devel' and the equivalent package +in Debian/Ubuntu/etc. + +After this, you need to add the argument -DSWORD_BINDINGS="Python" or +-DSWORD_BINDINGS="Perl" when you invoke CMake. If you wish to build both bindings then +just call -DSWORD_BINDINGS="Python Perl" instead. This needs to be done at the level of +the whole SWORD library and not just here within the bindings directory. The files will +be installed to their standard system-wide location when you run 'make install' with +the rest of the library. + +If you wish to install the Python bindings to another directory instead you can specify +the option -DSWORD_PYTHON_INSTALL_DIR="/some/other/path" at configure time. No comparable +option is currently available for the Perl bindings because the maintainer is unaware +of how to implement it. + Building java ------------- diff --git a/bindings/autogen.sh b/bindings/autogen.sh deleted file mode 100755 index fd02786..0000000 --- a/bindings/autogen.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -echo "*** Sword build system generation" -#echo "*** Recreating libtool" -#if test -z "$LTIZE"; then -#LTIZE="$AUTODIR""libtoolize" -#fi -#echo "$LTIZE" -# $LTIZE --force --copy; - -ACLOCAL="$AUTODIR""aclocal" -echo "*** Recreating aclocal.m4" -echo "$ACLOCAL" - $ACLOCAL -I m4; - -echo "*** Recreating configure" -AUTOCONF="$AUTODIR""autoconf" -#AUTOHEAD="$AUTODIR""autoheader" -# $AUTOHEAD ; - $AUTOCONF; - -echo "*** Recreating the Makefile.in files" -AUTOMAKE="$AUTODIR""automake" - $AUTOMAKE -a -c --foreign; diff --git a/bindings/bcppmake/MainCLXTest.cpp b/bindings/bcppmake/MainCLXTest.cpp index 4bca371..98de24c 100644 --- a/bindings/bcppmake/MainCLXTest.cpp +++ b/bindings/bcppmake/MainCLXTest.cpp @@ -1,9 +1,10 @@ /****************************************************************************** - * This is part of a program to test CLX bindings * - * $Id: MainCLXTest.cpp 2327 2009-04-22 11:42:33Z scribe $ + * MainCLXTest.cpp - This is part of a program to test CLX bindings * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: MainCLXTest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/bindings/bcppmake/MainCLXTest.h b/bindings/bcppmake/MainCLXTest.h index fbb0f72..1fe2501 100644 --- a/bindings/bcppmake/MainCLXTest.h +++ b/bindings/bcppmake/MainCLXTest.h @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * MainCLXTest.h - This is part of a program to test CLX bindings + * + * $Id: MainCLXTest.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + //--------------------------------------------------------------------------- #ifndef MainCLXTestH diff --git a/bindings/bcppmake/MainTest.cpp b/bindings/bcppmake/MainTest.cpp index 9792ac7..c3e4009 100644 --- a/bindings/bcppmake/MainTest.cpp +++ b/bindings/bcppmake/MainTest.cpp @@ -1,9 +1,10 @@ /****************************************************************************** - * This is part of a program to test CLX bindings * - * $Id: MainTest.cpp 2327 2009-04-22 11:42:33Z scribe $ + * MainTest.cpp - This is part of a program to test CLX bindings * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: MainTest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/bindings/bcppmake/MainTest.h b/bindings/bcppmake/MainTest.h index 99802c8..ffc7566 100644 --- a/bindings/bcppmake/MainTest.h +++ b/bindings/bcppmake/MainTest.h @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * MainTest.h - This is part of a program to test CLX bindings + * + * $Id: MainTest.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + //--------------------------------------------------------------------------- #ifndef MainTestH diff --git a/bindings/bcppmake/clxtest.cpp b/bindings/bcppmake/clxtest.cpp index 0482bae..210c582 100644 --- a/bindings/bcppmake/clxtest.cpp +++ b/bindings/bcppmake/clxtest.cpp @@ -1,9 +1,10 @@ /****************************************************************************** - * This is part of a program to test CLX bindings * - * $Id: clxtest.cpp 2327 2009-04-22 11:42:33Z scribe $ + * clxtest.cpp - This is part of a program to test CLX bindings * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: clxtest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/bindings/bcppmake/sword.c b/bindings/bcppmake/sword.c index 705684c..2aca988 100644 --- a/bindings/bcppmake/sword.c +++ b/bindings/bcppmake/sword.c @@ -1,9 +1,10 @@ /****************************************************************************** - * This is part of a program to test CLX bindings * - * $Id: sword.c 2327 2009-04-22 11:42:33Z scribe $ + * sword.c - This is part of a program to test CLX bindings * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: sword.c 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/bindings/bcppmake/test.cpp b/bindings/bcppmake/test.cpp index bbd74a6..64c552e 100644 --- a/bindings/bcppmake/test.cpp +++ b/bindings/bcppmake/test.cpp @@ -1,9 +1,10 @@ /****************************************************************************** - * This is part of a program to test CLX bindings * - * $Id: test.cpp 2327 2009-04-22 11:42:33Z scribe $ + * test.cpp - This is part of a program to test CLX bindings * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: test.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/bindings/configure.ac b/bindings/configure.ac deleted file mode 100644 index dbcd610..0000000 --- a/bindings/configure.ac +++ /dev/null @@ -1,127 +0,0 @@ -# --------------------------------------------------------------------- -# Initialisation -# --------------------------------------------------------------------- - -# Version change: Change line 8 only ! -# Change it immediately after a release - -AC_INIT(swordbindings, 1.6.1, sword-bugs@crosswire.org) -AC_CONFIG_SRCDIR([flatapi.cpp]) -AC_PREREQ(2.52) -AC_REVISION($Revision$) - -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE - -#AM_CONFIG_HEADER(include/config.h) - - -# --------------------------------------------------------------------- -# Check Programs -# --------------------------------------------------------------------- -AC_LANG(C++) -AC_PROG_CC -AC_PROG_CXX -AC_PROG_INSTALL -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL - -AC_C_BIGENDIAN - -# --------------------------------------------------------------------- -# Java -# --------------------------------------------------------------------- -AC_CHECK_CLASSPATH -AC_PROG_JAVAC -AC_PROG_JAVA -AC_PROG_JAR - -# --------------------------------------------------------------------- -# With options -# --------------------------------------------------------------------- -AC_ARG_WITH(tomcathome, - AC_HELP_STRING([--with-tomcathome], - [tomcat home directory (default=[/usr/local/tomcat])]),, - with_tomcathome=[/usr/local/tomcat]) - - -# --------------------------------------------------------------------- -# Enable options -# --------------------------------------------------------------------- -AC_ARG_ENABLE(corba, - AC_HELP_STRING([--enable-corba],[build swordorbserver (default=no)]),,enable_corba=no) - -AM_MAINTAINER_MODE - -# --------------------------------------------------------------------- -# Check libraries -# --------------------------------------------------------------------- - -# --------------------------------------------------------------------- -# Find pkg-config -# --------------------------------------------------------------------- -use_pkgconfig=yes -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -if test x$PKG_CONFIG = xno ; then - AC_MSG_WARN([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/]) - AC_MSG_ERROR([not using pkg-config]) - use_pkgconfig=no -fi - -if $PKG_CONFIG --atleast-pkgconfig-version 0.14 ; then - : -else - AC_MSG_WARN([*** pkg-config too old; version 0.14 or better required.]) - AC_MSG_ERROR([not using pkg-config]) - use_pkgconfig=no -fi - -# --------------------------------------------------------------------- -# Find sword -# --------------------------------------------------------------------- -SWORD_CFLAGS= -SWORD_LIBS= -if test x$use_pkgconfig = xyes ; then - SWORD_LIBS=`$PKG_CONFIG --libs sword` - SWORD_CFLAGS=`$PKG_CONFIG --cflags sword` -fi - -# --------------------------------------------------------------------- -# Tomcat install directories -# --------------------------------------------------------------------- -TOMCAT_HOME=$with_tomcathome - -# --------------------------------------------------------------------- -# Find orbit-config -# --------------------------------------------------------------------- -ORBIT_LIBS= -ORBIT_CFLAGS= -if test x$enable_corba = xyes ; then - if test x$use_pkgconfig = xyes ; then - ORBIT_LIBS+=`$PKG_CONFIG --libs ORBit-2.0-cpp` - ORBIT_CFLAGS+=`$PKG_CONFIG --cflags ORBit-2.0` - ORBIT_CXXFLAGS+=`$PKG_CONFIG --cflags ORBit-2.0-cpp` - fi -fi - -# --------------------------------------------------------------------- -# Substitute variables into makefiles -# --------------------------------------------------------------------- -AC_SUBST(SWORD_LIBS) -AC_SUBST(SWORD_CFLAGS) -AC_SUBST(ORBIT_LIBS) -AC_SUBST(ORBIT_CFLAGS) -AC_SUBST(ORBIT_CXXFLAGS) -AC_SUBST(TOMCAT_HOME) - -# --------------------------------------------------------------------- -# Conditional variables -# --------------------------------------------------------------------- -AM_CONDITIONAL(CORBA, test x$enable_corba = xyes) - -# --------------------------------------------------------------------- -# Final output -# --------------------------------------------------------------------- -AC_CONFIG_FILES(Makefile corba/Makefile corba/orbitcpp/Makefile corba/java/Makefile) -AC_OUTPUT - diff --git a/bindings/corba/Makefile.am b/bindings/corba/Makefile.am deleted file mode 100644 index b2dff05..0000000 --- a/bindings/corba/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = swordorb.idl - -SUBDIRS = orbitcpp omniorbcpp java diff --git a/bindings/corba/java/Makefile b/bindings/corba/java/Makefile index c4ae46c..8b32da1 100644 --- a/bindings/corba/java/Makefile +++ b/bindings/corba/java/Makefile @@ -1,9 +1,10 @@ #CHANGE THESE TO MATCH YOUR SYSTEM TOMCAT_HOME=/opt/tomcat -instdir=${TOMCAT_HOME}/webapps/swordweb +#instdir=${TOMCAT_HOME}/webapps/swordweb # Typically you'll point this to your home directory, e.g. -#instdir=/home/swordweb/livehtml/webapp +instdir=/home/swordweb/livehtml/webapp +#instdir=/home/sword/html #instdir=/home/scribe/src/swordweb/webapp SERVLET_LIB=${TOMCAT_HOME}/lib/servlet-api.jar @@ -30,4 +31,4 @@ clean: rm -rf classes/* install: - cp -a classes/org/ ${instdir}/WEB-INF/classes/ + cp -r classes/org/ ${instdir}/WEB-INF/classes/ diff --git a/bindings/corba/java/Makefile.in b/bindings/corba/java/Makefile.in deleted file mode 100644 index 320afcc..0000000 --- a/bindings/corba/java/Makefile.in +++ /dev/null @@ -1,43 +0,0 @@ - -TOMCAT_HOME = @TOMCAT_HOME@ -VERSION = @VERSION@ -JAVAC = @JAVAC@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ -INSTALL = @INSTALL@ -JAR = @JAR@ - -#SWORDORBJAR=sword-orb-$(VERSION).jar -SWORDORBJAR=sword-orb.jar - -all: $(SWORDORBJAR) - -src/org/crosswire/sword/orb/SWMgr.java: $(top_builddir)/corba/java/src/org/crosswire/util/Base64.java - idlj -pkgTranslate swordorb org.crosswire.sword.orb -td src $(top_srcdir)/corba/swordorb.idl - -classes/org/crosswire/sword/orb/SwordOrb.class: src/org/crosswire/sword/orb/SWMgr.java - mkdir -p $(top_builddir)/corba/java/classes - $(JAVAC) -classpath ${TOMCAT_HOME}/common/lib/servlet-api.jar -d $(top_builddir)/corba/java/classes -sourcepath src src/org/crosswire/sword/orb/*.java src/org/crosswire/util/*.java - -$(top_builddir)/corba/java/src/org/crosswire/util/Base64.java: - cp -a $(top_srcdir)/corba/java/src . - find . -name .svn|xargs rm -r - -clean: - -rm src/org/crosswire/sword/orb/SW*.java - -rm src/org/crosswire/sword/orb/_SW*.java - -rm src/org/crosswire/sword/orb/Mod*.java - -rm src/org/crosswire/sword/orb/Search*.java - -rm src/org/crosswire/sword/orb/String*.java - -rm -rf classes/* - -rmdir -p src/org/crosswire/sword/orb - -rm $(SWORDORBJAR) - -$(SWORDORBJAR): classes/org/crosswire/sword/orb/SwordOrb.class - $(JAR) cf $(SWORDORBJAR) -C $(top_builddir)/corba/java/classes org - -install: - @INSTALL@ $(SWORDORBJAR) $(TOMCAT_HOME)/common/lib - -uninstall: - -rm $(TOMCAT_HOME)/common/lib/$(SWORDORBJAR) diff --git a/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java b/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java index bde7478..aab6001 100644 --- a/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java +++ b/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * SwordOrb.java - + * + * $Id: SwordOrb.java 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -35,9 +40,9 @@ import java.util.Properties; public class SwordOrb extends Object implements HttpSessionBindingListener { public static Properties config = null; public static String ORBEXE = "swordorbserver"; - public static final int MAX_REMOTE_ADDR_CONNECTIONS = 20; - public static final int MAX_ACCESS_COUNT_PER_INTERVAL = 10; - public static final long MAX_ACCESS_COUNT_INTERVAL = 10 * 1000; // milliseconds + public static final int MAX_REMOTE_ADDR_CONNECTIONS = 10; + public static final int MAX_ACCESS_COUNT_PER_INTERVAL = 50; + public static final long MAX_ACCESS_COUNT_INTERVAL = 50 * 1000; // milliseconds public static final long BLACKLIST_DURATION = 10 * 60 * 1000; // milliseconds public static final String BIBLES = "Biblical Texts"; public static final String COMMENTARIES = "Commentaries"; @@ -53,7 +58,7 @@ public class SwordOrb extends Object implements HttpSessionBindingListener { public static final int NONE = 0; // set this to your desired debug output level - public static int debugLevel = INFO; + public static int debugLevel = WARN; static void log(int level, String message, Throwable e) { @@ -256,7 +261,11 @@ log(INFO, "No ORB found in session; constructing a new instance", null); session.setAttribute("SwordOrb", orb); } - else throw new Exception("Max Remote Addr Connections from: ["+remoteAddr+"]"); + else { + // recycle oldest orb + orb = orbs.remove(0); + orbs.add(orb); + } } else { log(INFO, "ORB found in session", null); diff --git a/bindings/corba/omniorbcpp/Makefile b/bindings/corba/omniorbcpp/Makefile index 021f0dd..5385fb5 100644 --- a/bindings/corba/omniorbcpp/Makefile +++ b/bindings/corba/omniorbcpp/Makefile @@ -16,9 +16,9 @@ LIBS += $(shell PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig pkg-config --libs omniOR LIBS += -L/usr/lib64 #comment out for release -CXXFLAGS += -g -O0 -CFLAGS += -g -O0 -LDFLAGS += -g -O0 +#CXXFLAGS += -g -O0 +#CFLAGS += -g -O0 +#LDFLAGS += -g -O0 #----------------------------------------------------------------------------- diff --git a/bindings/corba/omniorbcpp/server.cpp b/bindings/corba/omniorbcpp/server.cpp index 8f33d23..b6f0ff5 100644 --- a/bindings/corba/omniorbcpp/server.cpp +++ b/bindings/corba/omniorbcpp/server.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * server.cpp - + * + * $Id: server.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/bindings/corba/omniorbcpp/swordorb-impl.cpp b/bindings/corba/omniorbcpp/swordorb-impl.cpp index d36c6a8..a6572ac 100644 --- a/bindings/corba/omniorbcpp/swordorb-impl.cpp +++ b/bindings/corba/omniorbcpp/swordorb-impl.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swordorb-impl.cpp - omniorb bindings + * + * $Id: swordorb-impl.cpp 2967 2013-08-18 16:15:46Z scribe $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -21,6 +26,7 @@ #include #include +#include #include #include #include @@ -58,22 +64,22 @@ swordorb::SearchHitList* swordorb_SWModule_i::search(const char* istr, swordorb: sword::ListKey result; if ((scope) && (strlen(scope)) > 0) { - sword::SWKey *p = delegate->CreateKey(); + sword::SWKey *p = delegate->createKey(); sword::VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p); if (!parser) { delete p; parser = new VerseKey(); } *parser = delegate->getKeyText(); - lscope = parser->ParseVerseList(scope, *parser, true); - result = delegate->Search(istr, stype, flags, &lscope); + lscope = parser->parseVerseList(scope, *parser, true); + result = delegate->search(istr, stype, flags, &lscope); delete parser; } - else result = delegate->Search(istr, stype, flags); + else result = delegate->search(istr, stype, flags); swordorb::SearchHitList *retVal = new swordorb::SearchHitList; int count = 0; - for (result = sword::TOP; !result.Error(); result++) count++; + for (result = sword::TOP; !result.popError(); result++) count++; retVal->length(count); int i = 0; @@ -82,8 +88,8 @@ swordorb::SearchHitList* swordorb_SWModule_i::search(const char* istr, swordorb: if ((count) && (long)result.getElement()->userData) result.sort(); - for (result = sword::TOP; !result.Error(); result++) { - (*retVal)[i].modName = CORBA::string_dup(assureValidUTF8(delegate->Name())); + for (result = sword::TOP; !result.popError(); result++) { + (*retVal)[i].modName = CORBA::string_dup(assureValidUTF8(delegate->getName())); (*retVal)[i].key = CORBA::string_dup(assureValidUTF8((const char *)result)); (*retVal)[i++].score = (long)result.getElement()->userData; } @@ -92,7 +98,7 @@ swordorb::SearchHitList* swordorb_SWModule_i::search(const char* istr, swordorb: } ::CORBA::Char swordorb_SWModule_i::error() { - return delegate->Error(); + return delegate->popError(); } ::CORBA::Long swordorb_SWModule_i::getEntrySize(){ @@ -100,7 +106,7 @@ swordorb::SearchHitList* swordorb_SWModule_i::search(const char* istr, swordorb: } swordorb::StringList* swordorb_SWModule_i::getEntryAttribute(const char* level1, const char* level2, const char* level3, ::CORBA::Boolean filtered){ - delegate->RenderText(); // force parse + delegate->renderText(); // force parse std::vector results; swordorb::StringList *retVal = new swordorb::StringList; @@ -113,35 +119,35 @@ swordorb::StringList* swordorb_SWModule_i::getEntryAttribute(const char* level1, i1Start = entryAttribs.find(level1); i1End = i1Start; if (i1End != entryAttribs.end()) - i1End++; + ++i1End; } else { i1Start = entryAttribs.begin(); i1End = entryAttribs.end(); } - for (;i1Start != i1End; i1Start++) { + for (;i1Start != i1End; ++i1Start) { if ((level2) && (*level2)) { i2Start = i1Start->second.find(level2); i2End = i2Start; if (i2End != i1Start->second.end()) - i2End++; + ++i2End; } else { i2Start = i1Start->second.begin(); i2End = i1Start->second.end(); } - for (;i2Start != i2End; i2Start++) { + for (;i2Start != i2End; ++i2Start) { if ((level3) && (*level3)) { i3Start = i2Start->second.find(level3); i3End = i3Start; if (i3End != i2Start->second.end()) - i3End++; + ++i3End; } else { i3Start = i2Start->second.begin(); i3End = i2Start->second.end(); } - for (;i3Start != i3End; i3Start++) { + for (;i3Start != i3End; ++i3Start) { results.push_back(i3Start->second); } if (i3Start != i3End) @@ -154,7 +160,7 @@ swordorb::StringList* swordorb_SWModule_i::getEntryAttribute(const char* level1, retVal->length(results.size()); for (int i = 0; i < results.size(); i++) { if (filtered) { - (*retVal)[i] = CORBA::string_dup(assureValidUTF8(delegate->RenderText(results[i].c_str()))); + (*retVal)[i] = CORBA::string_dup(assureValidUTF8(delegate->renderText(results[i].c_str()))); } else { (*retVal)[i] = CORBA::string_dup(assureValidUTF8(results[i].c_str())); @@ -169,15 +175,15 @@ swordorb::StringList* swordorb_SWModule_i::parseKeyList(const char* keyText){ swordorb::StringList *retVal = new swordorb::StringList; if (parser) { sword::ListKey result; - result = parser->ParseVerseList(keyText, *parser, true); + result = parser->parseVerseList(keyText, *parser, true); int count = 0; - for (result = sword::TOP; !result.Error(); result++) { + for (result = sword::TOP; !result.popError(); result++) { count++; } retVal->length(count); count = 0; - for (result = sword::TOP; !result.Error(); result++) { - (*retVal)[count++] = CORBA::string_dup(assureValidUTF8((const char *)result)); + for (result = sword::TOP; !result.popError(); result++) { + (*retVal)[count++] = CORBA::string_dup(assureValidUTF8(VerseKey(result).getOSISRef())); } } else { @@ -203,18 +209,18 @@ void swordorb_SWModule_i::setKeyText(const char* keyText) { } } else if (*keyText=='=') { - vkey->Headings(true); - vkey->AutoNormalize(false); + vkey->setIntros(true); + vkey->setAutoNormalize(false); vkey->setText(keyText+1); return; } } - delegate->KeyText(keyText); + delegate->setKey(keyText); } char* swordorb_SWModule_i::getKeyText(){ - return CORBA::string_dup(assureValidUTF8((char *)delegate->KeyText())); + return CORBA::string_dup(assureValidUTF8((char *)delegate->getKeyText())); } ::CORBA::Boolean swordorb_SWModule_i::hasKeyChildren(){ @@ -236,7 +242,7 @@ swordorb::StringList* swordorb_SWModule_i::getKeyChildren(){ sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey) { - retVal->length(7); + retVal->length(8); SWBuf num; num.appendFormatted("%d", vkey->getTestament()); (*retVal)[0] = CORBA::string_dup(num.c_str()); @@ -256,6 +262,7 @@ swordorb::StringList* swordorb_SWModule_i::getKeyChildren(){ num.appendFormatted("%d", vkey->getVerseMax()); (*retVal)[5] = CORBA::string_dup(num.c_str()); (*retVal)[6] = CORBA::string_dup(vkey->getBookName()); + (*retVal)[7] = CORBA::string_dup(vkey->getOSISRef()); } else { TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key); @@ -295,15 +302,15 @@ char* swordorb_SWModule_i::getKeyParent(){ } char* swordorb_SWModule_i::getName(){ - return CORBA::string_dup(assureValidUTF8((char *)delegate->Name())); + return CORBA::string_dup(assureValidUTF8((char *)delegate->getName())); } char* swordorb_SWModule_i::getDescription(){ - return CORBA::string_dup(assureValidUTF8((char *)delegate->Description())); + return CORBA::string_dup(assureValidUTF8((char *)delegate->getDescription())); } char* swordorb_SWModule_i::getCategory(){ - SWBuf type = delegate->Type(); + SWBuf type = delegate->getType(); SWBuf cat = delegate->getConfigEntry("Category"); if (cat.length() > 0) type = cat; @@ -323,15 +330,19 @@ void swordorb_SWModule_i::begin(){ } char* swordorb_SWModule_i::getStripText(){ - return CORBA::string_dup(assureValidUTF8((char *)delegate->StripText())); + return CORBA::string_dup(assureValidUTF8((const char *)delegate->stripText())); } char* swordorb_SWModule_i::getRenderText(){ - return CORBA::string_dup(assureValidUTF8((char *)delegate->RenderText())); + return CORBA::string_dup(assureValidUTF8((const char *)delegate->renderText())); +} + +char* swordorb_SWModule_i::getRenderHeader(){ + return CORBA::string_dup(assureValidUTF8(((const char *)(delegate->getRenderHeader() ? delegate->getRenderHeader():"")))); } char* swordorb_SWModule_i::getRawEntry(){ - return CORBA::string_dup(assureValidUTF8((char *)delegate->getRawEntry())); + return CORBA::string_dup(assureValidUTF8((const char *)delegate->getRawEntry())); } void swordorb_SWModule_i::setRawEntry(const char* entryBuffer){ @@ -366,7 +377,7 @@ swordorb::ModInfoList* swordorb_SWMgr_i::getModInfoList() { sword::SWModule *module = 0; int size = 0; - for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) { + for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) { if ((!(it->second->getConfigEntry("CipherKey"))) || (*(it->second->getConfigEntry("CipherKey")))) size++; } @@ -374,17 +385,17 @@ swordorb::ModInfoList* swordorb_SWMgr_i::getModInfoList() { // if (size > 183) size = 183; milist->length(size); int i = 0; - for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) { + for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) { module = it->second; if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) { - SWBuf type = module->Type(); + SWBuf type = module->getType(); SWBuf cat = module->getConfigEntry("Category"); if (cat.length() > 0) type = cat; - (*milist)[i].name = CORBA::string_dup(assureValidUTF8(module->Name())); - (*milist)[i].description = CORBA::string_dup(assureValidUTF8(module->Description())); + (*milist)[i].name = CORBA::string_dup(assureValidUTF8(module->getName())); + (*milist)[i].description = CORBA::string_dup(assureValidUTF8(module->getDescription())); (*milist)[i].category = CORBA::string_dup(assureValidUTF8(type.c_str())); - (*milist)[i++].language = CORBA::string_dup(assureValidUTF8(module->Lang())); + (*milist)[i++].language = CORBA::string_dup(assureValidUTF8(module->getLanguage())); if (i >= size) break; } } @@ -437,12 +448,12 @@ swordorb::StringList* swordorb_SWMgr_i::getGlobalOptions(){ sword::StringList options = delegate->getGlobalOptions(); swordorb::StringList *retVal = new swordorb::StringList; int count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { count++; } retVal->length(count); count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { (*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->c_str())); } return retVal; @@ -452,12 +463,12 @@ swordorb::StringList* swordorb_SWMgr_i::getGlobalOptionValues(const char* option sword::StringList options = delegate->getGlobalOptionValues(option); swordorb::StringList *retVal = new swordorb::StringList; int count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { count++; } retVal->length(count); count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { (*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->c_str())); } return retVal; @@ -483,12 +494,12 @@ swordorb::StringList* swordorb_SWMgr_i::getAvailableLocales(){ sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); swordorb::StringList *retVal = new swordorb::StringList; int count = 0; - for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) { + for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) { count++; } retVal->length(count); count = 0; - for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) { + for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) { (*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->c_str())); } return retVal; @@ -499,3 +510,27 @@ void swordorb_SWMgr_i::setDefaultLocale(const char* name){ } +char* swordorb_SWMgr_i::translate(const char* text, const char* localeName) { + return CORBA::string_dup(LocaleMgr::getSystemLocaleMgr()->translate(text, localeName)); +} + +swordorb::StringList* swordorb_SWMgr_i::getRepos() { + swordorb::StringList *retVal = new swordorb::StringList; + int count = 0; + sword::InstallMgr *installMgr = new sword::InstallMgr(); + for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) { + count++; + } + retVal->length(count); + count = 0; + for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) { + (*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->second->caption.c_str())); + } + delete installMgr; + return retVal; +} + +// Don't call me yet +swordorb::_objref_SWMgr* swordorb_SWMgr_i::getShadowMgr(const char*) { + return 0; +} diff --git a/bindings/corba/omniorbcpp/swordorb-impl.hpp b/bindings/corba/omniorbcpp/swordorb-impl.hpp index 400bcc3..fc9468a 100644 --- a/bindings/corba/omniorbcpp/swordorb-impl.hpp +++ b/bindings/corba/omniorbcpp/swordorb-impl.hpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swordorb-impl.hpp - + * + * $Id: swordorb-impl.hpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -62,9 +67,11 @@ public: void begin(); char* getStripText(); char* getRenderText(); + char* getRenderHeader(); char* getRawEntry(); void setRawEntry(const char* entryBuffer); char* getConfigEntry(const char* key); + char* translate(const char* text, const char* localeName); void deleteSearchFramework(); ::CORBA::Boolean hasSearchFramework(); @@ -107,6 +114,9 @@ public: void setJavascript(::CORBA::Boolean val); swordorb::StringList* getAvailableLocales(); void setDefaultLocale(const char* name); + char* translate(const char* text, const char* localeName); + swordorb::StringList* getRepos(); + swordorb::_objref_SWMgr* getShadowMgr(const char*); }; diff --git a/bindings/corba/omniorbcpp/testclient.cpp b/bindings/corba/omniorbcpp/testclient.cpp index ad7345d..4adff99 100644 --- a/bindings/corba/omniorbcpp/testclient.cpp +++ b/bindings/corba/omniorbcpp/testclient.cpp @@ -1,7 +1,10 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: f; c-basic-offset: 4 -*- */ - -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * testclient.cpp - + * + * $Id: testclient.cpp 2973 2013-09-10 11:53:43Z scribe $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -75,6 +78,7 @@ int main (int argc, char *argv[]) std::cout << (*localeNames)[i] << "\n"; } */ + std::cout << "filterText: " << mgr->filterText("OSISPlain", "this should be overlined") << "\n"; mgr->setDefaultLocale("de"); mgr->setJavascript(true); mgr->setGlobalOption("Textual Variants", "Secondary Reading"); @@ -93,6 +97,7 @@ int main (int argc, char *argv[]) std::cout << "KeyText: " << module->getKeyText() << "\n"; std::cout << "Text: " << module->getRenderText() << "\n"; } + std::cout << "RenderHeader:\n" << module->getRenderHeader() << "\n"; /* swordorb::SearchHitList *searchResults; bool lucene = module->hasSearchFramework(); diff --git a/bindings/corba/orbitcpp/server.cpp b/bindings/corba/orbitcpp/server.cpp index b7df734..4f86500 100644 --- a/bindings/corba/orbitcpp/server.cpp +++ b/bindings/corba/orbitcpp/server.cpp @@ -1,7 +1,10 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * server.cpp - + * + * $Id: server.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/bindings/corba/orbitcpp/swordorb-impl.cpp b/bindings/corba/orbitcpp/swordorb-impl.cpp index d45832a..4d40727 100644 --- a/bindings/corba/orbitcpp/swordorb-impl.cpp +++ b/bindings/corba/orbitcpp/swordorb-impl.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swordorb-impl.cpp - + * + * $Id: swordorb-impl.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -18,6 +23,7 @@ #include "swordorb-impl.hpp" #include #include +#include #include #include #include @@ -44,13 +50,13 @@ ModInfoList *SWMgr_impl::getModInfoList() throw(CORBA::SystemException) { ModInfoList *milist = new ModInfoList; sword::SWModule *module = 0; int size = 0; - for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) { + for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) { if ((!(it->second->getConfigEntry("CipherKey"))) || (*(it->second->getConfigEntry("CipherKey")))) size++; } milist->length(size); int i = 0; - for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) { + for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) { module = it->second; if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) { SWBuf type = module->Type(); @@ -88,12 +94,12 @@ StringList *SWMgr_impl::getGlobalOptions() throw(CORBA::SystemException) { sword::StringList options = delegate->getGlobalOptions(); StringList *retVal = new StringList; int count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { count++; } retVal->length(count); count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { (*retVal)[count++] = CORBA::string_dup(it->c_str()); } return retVal; @@ -104,12 +110,12 @@ StringList *SWMgr_impl::getGlobalOptionValues(const char *option) throw(CORBA::S sword::StringList options = delegate->getGlobalOptionValues(option); StringList *retVal = new StringList; int count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { count++; } retVal->length(count); count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { (*retVal)[count++] = CORBA::string_dup(it->c_str()); } return retVal; @@ -236,35 +242,35 @@ StringList *SWModule_impl::getEntryAttribute(const char *level1, const char *lev i1Start = entryAttribs.find(level1); i1End = i1Start; if (i1End != entryAttribs.end()) - i1End++; + ++i1End; } else { i1Start = entryAttribs.begin(); i1End = entryAttribs.end(); } - for (;i1Start != i1End; i1Start++) { + for (;i1Start != i1End; ++i1Start) { if ((level2) && (*level2)) { i2Start = i1Start->second.find(level2); i2End = i2Start; if (i2End != i1Start->second.end()) - i2End++; + ++i2End; } else { i2Start = i1Start->second.begin(); i2End = i1Start->second.end(); } - for (;i2Start != i2End; i2Start++) { + for (;i2Start != i2End; ++i2Start) { if ((level3) && (*level3)) { i3Start = i2Start->second.find(level3); i3End = i3Start; if (i3End != i2Start->second.end()) - i3End++; + ++i3End; } else { i3Start = i2Start->second.begin(); i3End = i2Start->second.end(); } - for (;i3Start != i3End; i3Start++) { + for (;i3Start != i3End; ++i3Start) { results.push_back(i3Start->second); } if (i3Start != i3End) @@ -394,12 +400,12 @@ StringList *SWMgr_impl::getAvailableLocales() throw(CORBA::SystemException) { sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); StringList *retVal = new StringList; int count = 0; - for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) { + for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) { count++; } retVal->length(count); count = 0; - for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) { + for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) { (*retVal)[count++] = CORBA::string_dup(it->c_str()); } return retVal; @@ -410,4 +416,28 @@ void SWMgr_impl::setDefaultLocale(const char *name) throw(CORBA::SystemException LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(name); } +char* SWMgr_impl::translate(const char* text, const char* localeName) throw(CORBA::SystemException) { + return CORBA::string_dup(LocaleMgr::getSystemLocaleMgr()->translate(text, localeName)); +} + +swordorb::StringList *SWMgr_impl::getRepos() throw(CORBA::SystemException) { + swordorb::StringList *retVal = new swordorb::StringList; + int count = 0; + sword::InstallMgr *installMgr = new sword::InstallMgr(); + for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) { + count++; + } + retVal->length(count); + count = 0; + for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) { + (*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->second->caption.c_str())); + } + delete installMgr; + return retVal; +} + +// Don't call me yet +swordorb::SWMgr_ptr SWMgr_impl::getShadowMgr (CORBA_char const *repoName) throw (CORBA::SystemException) { + return 0; +} } diff --git a/bindings/corba/orbitcpp/swordorb-impl.hpp b/bindings/corba/orbitcpp/swordorb-impl.hpp index 3acc1b8..4960f9a 100644 --- a/bindings/corba/orbitcpp/swordorb-impl.hpp +++ b/bindings/corba/orbitcpp/swordorb-impl.hpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swordorb-impl.hpp - + * + * $Id: swordorb-impl.hpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -43,7 +48,7 @@ public: void terminateSearch() throw(CORBA::SystemException) { delegate->terminateSearch = true; } char error() throw(CORBA::SystemException) { return delegate->Error(); } CORBA::Long getEntrySize() throw(CORBA::SystemException) { return delegate->getEntrySize(); } - void setKeyText(const char *key) throw(CORBA::SystemException) { delegate->KeyText(key); } + void setKeyText(const char *key) throw(CORBA::SystemException); char *getKeyText() throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->KeyText()); } StringList *getKeyChildren() throw(CORBA::SystemException); char *getKeyParent() throw(CORBA::SystemException); @@ -57,6 +62,7 @@ public: char *getStripText() throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->StripText()); } StringList *getEntryAttribute(const char *level1, const char *level2, const char *level3, CORBA::Boolean filtered) throw(CORBA::SystemException); char *getRenderText() throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->RenderText()); } + char *getRenderHeader() throw(CORBA::SystemException) { return CORBA::string_dup((char *)((delegate->getRenderHeader()?delegate->getRenderHeader():""))); } char *getRawEntry() throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->getRawEntry()); } void setRawEntry(const char *entryBuffer) throw(CORBA::SystemException) { delegate->setEntry(entryBuffer); } char *getConfigEntry(const char *key) throw(CORBA::SystemException) { return CORBA::string_dup(((char *)delegate->getConfigEntry(key)) ? (char *)delegate->getConfigEntry(key):SWNULL); } @@ -93,6 +99,9 @@ public: void setJavascript(CORBA::Boolean) throw(CORBA::SystemException); StringList *getAvailableLocales() throw(CORBA::SystemException); void setDefaultLocale(const char *name) throw(CORBA::SystemException); + char *translate(const char *text, const char *locale) throw(CORBA::SystemException); + StringList *getRepos() throw(CORBA::SystemException); + swordorb::SWMgr_ptr getShadowMgr (CORBA_char const *repoName) throw (CORBA::SystemException); }; }; diff --git a/bindings/corba/orbitcpp/testclient.cpp b/bindings/corba/orbitcpp/testclient.cpp index 340ea73..c1b358a 100644 --- a/bindings/corba/orbitcpp/testclient.cpp +++ b/bindings/corba/orbitcpp/testclient.cpp @@ -1,8 +1,11 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: f; c-basic-offset: 4 -*- */ - -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society +/****************************************************************************** + * + * testclient.cpp - + * + * $Id: testclient.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 * diff --git a/bindings/corba/orbitcpp/webmgr.hpp b/bindings/corba/orbitcpp/webmgr.hpp index c5c6207..048882c 100644 --- a/bindings/corba/orbitcpp/webmgr.hpp +++ b/bindings/corba/orbitcpp/webmgr.hpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * webmgr.cpp - + * + * $Id: webmgr.hpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -67,12 +72,12 @@ public: void AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) { // ThML word stuff needs to process before strongs strip - if (module->Markup() == FMT_THML) { - module->AddOptionFilter(thmlWordJS); + if (module->getMarkup() == FMT_THML) { + module->addOptionFilter(thmlWordJS); } - if (module->Markup() == FMT_GBF) { - module->AddOptionFilter(gbfWordJS); + if (module->getMarkup() == FMT_GBF) { + module->addOptionFilter(gbfWordJS); } // add other module filters @@ -94,12 +99,12 @@ public: if (module->getConfig().has("GlobalOptionFilter", "ThMLVariants")) { OptionFilterMap::iterator it = optionFilters.find("ThMLVariants"); if (it != optionFilters.end()) { - module->AddOptionFilter((*it).second); // add filter to module and option as a valid option + module->addOptionFilter((*it).second); // add filter to module and option as a valid option } } - if (module->Markup() == FMT_OSIS) { - module->AddOptionFilter(osisWordJS); + if (module->getMarkup() == FMT_OSIS) { + module->addOptionFilter(osisWordJS); } } diff --git a/bindings/corba/swordorb.idl b/bindings/corba/swordorb.idl index 9d34bec..e72bf56 100644 --- a/bindings/corba/swordorb.idl +++ b/bindings/corba/swordorb.idl @@ -75,7 +75,7 @@ interface SWModule { // This method returns child nodes for a genbook, // but has special handling if called on a VerseKey module: - // [0..6] [testament, book, chapter, verse, chapterMax, verseMax, bookName] + // [0..7] [testament, book, chapter, verse, chapterMax, verseMax, bookName, osisRef] StringList getKeyChildren(); string getKeyParent(); @@ -87,6 +87,8 @@ interface SWModule { void begin(); string getStripText(); string getRenderText(); + // CSS styles associated with this text + string getRenderHeader(); string getRawEntry(); void setRawEntry(in string entryBuffer); string getConfigEntry(in string key); @@ -115,6 +117,9 @@ interface SWMgr { void setJavascript(in boolean val); StringList getAvailableLocales(); void setDefaultLocale(in string name); + string translate(in string text, in string localeName); + StringList getRepos(); + SWMgr getShadowMgr(in string repoName); }; }; diff --git a/bindings/flatapi.cpp b/bindings/flatapi.cpp index 58476e8..55cf083 100644 --- a/bindings/flatapi.cpp +++ b/bindings/flatapi.cpp @@ -1,10 +1,11 @@ /****************************************************************************** - * swordapi.cpp - This file contains an api usable by non-C++ - * environments * - * $Id: flatapi.cpp 2325 2009-04-20 19:09:25Z scribe $ + * flatapi.cpp - This file contains an api usable by non-C++ + * environments * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: flatapi.cpp 2921 2013-07-28 17:21:44Z scribe $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -177,8 +178,8 @@ SWHANDLE SWModule_doSearch(SWHANDLE hmodule, const char *searchString, int type, if (!module) return -1; - results.ClearList(); - results = module->Search(searchString, type, params, scope, 0, percent, (void *) &percentUserData); + results.clear(); + results = module->search(searchString, type, params, scope, 0, percent, (void *) &percentUserData); return (SWHANDLE)&results; } @@ -188,7 +189,7 @@ SWHANDLE SWModule_doSearch(SWHANDLE hmodule, const char *searchString, int type, */ char SWModule_error(SWHANDLE hmodule) { SWModule *module = (SWModule *)hmodule; - return (module) ? module->Error() : 0; + return (module) ? module->popError() : 0; } @@ -209,7 +210,7 @@ void SWModule_setKeyText(SWHANDLE hmodule, const char *key) { const char *SWModule_getKeyText(SWHANDLE hmodule) { SWModule *module = (SWModule *)hmodule; - return (const char *)((module) ? module->KeyText() : 0); + return (const char *)((module) ? module->getKeyText() : 0); } @@ -218,19 +219,19 @@ const char *SWModule_getKeyText(SWHANDLE hmodule) { const char *SWModule_getName(SWHANDLE hmodule) { SWModule *module = (SWModule *)hmodule; - return (const char *)((module) ? module->Name() : 0); + return (const char *)((module) ? module->getName() : 0); } const char *SWModule_getDescription(SWHANDLE hmodule) { SWModule *module = (SWModule *)hmodule; - return (const char *)((module) ? module->Description() : 0); + return (const char *)((module) ? module->getDescription() : 0); } const char *SWModule_getType(SWHANDLE hmodule) { SWModule *module = (SWModule *)hmodule; - return (const char *)((module) ? module->Type() : 0); + return (const char *)((module) ? module->getType() : 0); } @@ -257,19 +258,19 @@ void SWModule_begin(SWHANDLE hmodule) { const char *SWModule_getStripText(SWHANDLE hmodule) { SWModule *module = (SWModule *)hmodule; - return (const char *)((module) ? module->StripText() : 0); + return (const char *)((module) ? module->stripText() : 0); } const char *SWModule_getRenderText(SWHANDLE hmodule) { SWModule *module = (SWModule *)hmodule; - return (const char *)((module) ? module->RenderText() : 0); + return (const char *)((module) ? module->renderText().c_str() : 0); } const char *SWModule_getEntryAttributes(SWHANDLE hmodule, const char *level1, const char *level2, const char *level3) { SWModule *module = (SWModule *)hmodule; static SWBuf retval; - module->RenderText(); + module->renderText(); retval = module->getEntryAttributes()[level1][level2][level3].c_str(); return (retval.length()) ? (const char*)retval.c_str() : NULL; } @@ -279,8 +280,8 @@ const char *SWModule_getPreverseHeader(SWHANDLE hmodule, const char *key, int pv static SWBuf preverseHeading; char buf[12]; sprintf(buf, "%i", pvHeading); - module->SetKey(key); - module->RenderText(); + module->setKey(key); + module->renderText(); preverseHeading = module->getEntryAttributes()["Heading"]["Preverse"][buf].c_str(); return (preverseHeading.length()) ? (const char*)preverseHeading.c_str() : NULL; } @@ -288,9 +289,9 @@ const char *SWModule_getPreverseHeader(SWHANDLE hmodule, const char *key, int pv const char *SWModule_getFootnoteType(SWHANDLE hmodule, const char *key, const char *note) { SWModule *module = (SWModule *)hmodule; static SWBuf type; - module->Error(); - module->SetKey(key); - module->RenderText(); + module->popError(); + module->setKey(key); + module->renderText(); type = module->getEntryAttributes()["Footnote"][note]["type"].c_str(); return (type) ? (const char*)type.c_str() : NULL; } @@ -298,9 +299,9 @@ const char *SWModule_getFootnoteType(SWHANDLE hmodule, const char *key, const ch const char *SWModule_getFootnoteBody(SWHANDLE hmodule, const char *key, const char *note) { SWModule *module = (SWModule *)hmodule; static SWBuf body; - module->Error(); + module->popError(); module->setKey(key); - module->RenderText(); + module->renderText(); body = module->getEntryAttributes()["Footnote"][note]["body"].c_str(); SWKey *keybuf = module->getKey();; module->renderFilter(body, keybuf); @@ -310,9 +311,9 @@ const char *SWModule_getFootnoteBody(SWHANDLE hmodule, const char *key, const ch const char *SWModule_getFootnoteRefList(SWHANDLE hmodule, const char *key, const char *note) { SWModule *module = (SWModule *)hmodule; static SWBuf refList; - module->Error(); - module->SetKey(key); - module->RenderText(); + module->popError(); + module->setKey(key); + module->renderText(); refList = module->getEntryAttributes()["Footnote"][note]["refList"].c_str(); return (refList) ? (const char*)refList.c_str() : NULL; } @@ -325,8 +326,8 @@ SWHANDLE listkey_getVerselistIterator(const char *list, const char *key, const c static ListKey verses; versekey.setText(key); - verses.ClearList(); - verses = versekey.ParseVerseList(list, versekey); + verses.clear(); + verses = versekey.parseVerseList(list, versekey); return (SWHANDLE)&verses; } @@ -357,7 +358,7 @@ void listkey_iterator_next(SWHANDLE lki) { const char *listkey_iterator_val(SWHANDLE lki) { ListKey *lk = (ListKey*)lki; - if(!lk->Error()) + if(!lk->popError()) return (const char *) lk->getText(); return NULL; } diff --git a/bindings/gsoap/gsoapsword.cpp b/bindings/gsoap/gsoapsword.cpp index e4ad51a..4fe933d 100644 --- a/bindings/gsoap/gsoapsword.cpp +++ b/bindings/gsoap/gsoapsword.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * gsoapsword.cpp - + * + * $Id: gsoapsword.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -108,17 +113,17 @@ int sword__Quick_getJScriptAttribArray(xsd__string modName, xsd__string modKey, static string retVal = ""; retVal = "var entryAttribs = new Array();\n"; string l1keys = "entryAttribs[0] = new Array("; - for (l1=0,i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); i1++,l1++) { + for (l1=0,i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); ++i1,++l1) { sprintf(lbuf1, "%d", l1+1); retVal += "entryAttribs["+lbuf1+"] = new Array();\n"; string l2keys = "entryAttribs["+lbuf1+"][0] = new Array("; cout << "[ " << i1->first << " ]\n"; - for (l2=0,i2 = i1->second.begin(); i2 != i1->second.end(); i2++,l2++) { + for (l2=0,i2 = i1->second.begin(); i2 != i1->second.end(); ++i2,++l2) { sprintf(lbuf2, "%d", l2+1); retVal += "entryAttribs["+lbuf1+"]["+lbuf2+"][0] = new Array();\n"; string l3keys = "entryAttribs["+lbuf1+"]["+lbuf2+"][0] = new Array("; cout << "\t[ " << i2->first << " ]\n"; - for (l3=0,i3 = i2->second.begin(); i3 != i2->second.end(); i3++,l3++) { + for (l3=0,i3 = i2->second.begin(); i3 != i2->second.end(); ++i3,++l3) { cout << "\t\t" << i3->first << " = " << i3->second << "\n"; } } diff --git a/bindings/gsoap/gsoapsword.h b/bindings/gsoap/gsoapsword.h index fd4f7a7..a62da72 100644 --- a/bindings/gsoap/gsoapsword.h +++ b/bindings/gsoap/gsoapsword.h @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * gsoapsword.h - + * + * $Id: gsoapsword.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/bindings/gsoap/testclient.cpp b/bindings/gsoap/testclient.cpp index 337705b..7b0c8a7 100644 --- a/bindings/gsoap/testclient.cpp +++ b/bindings/gsoap/testclient.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * testclient.cpp - + * + * $Id: testclient.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/bindings/java-jni/README b/bindings/java-jni/README index 1328bf0..80c256a 100644 --- a/bindings/java-jni/README +++ b/bindings/java-jni/README @@ -1,20 +1,9 @@ Android Build Instructions -You'll need an NDK with STL support. I have been trying crystax' release -lately. You can find it on the web. +You'll need the Android NDK. -After that, you'll need a basic Application.mk file to place in your -apps folder. Mine for bishop is here: - -~/android-ndk-r3-crystax/apps/bishop/Application.mk - -and contains: - -APP_PROJECT_PATH := $(call my-dir)/../../../src/bishop -APP_MODULES := sword swordcore -APP_PLATFORM := android-3 - -and I have a symlink: +Then link the sword/bindings/java-jni folder to your project's /jni folder. +I have a symlink: ~/src/bishop/jni -> ~/src/sword/bindings/java-jni/jni/ @@ -26,8 +15,7 @@ So, since my $HOME directly is /home/scribe, my configuration looks like this: /home/scribe/src/sword/ /home/scribe/src/bishop/ -/home/scribe/android-ndk-r3-crystax/ -/home/scribe/android-ndk-r3-crystax/apps/bishop/Application.mk +/home/scribe/android-ndk-r8e/ with: diff --git a/bindings/java-jni/jni/Android.mk b/bindings/java-jni/jni/Android.mk index c261081..5d793a0 100644 --- a/bindings/java-jni/jni/Android.mk +++ b/bindings/java-jni/jni/Android.mk @@ -28,7 +28,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := libswordcore LOCAL_C_INCLUDES := ../sword/include ../sword/include/internal/regex LOCAL_CFLAGS += -D__unix__ \ - -Dunix \ + -DSTDC_HEADERS \ + -Dunix \ -D_FTPLIB_NO_COMPAT \ -DANDROID \ -DOS_ANDROID @@ -53,6 +54,8 @@ LOCAL_SRC_FILES := ../../../src/modules/comments/zcom/zcom.cpp \ ../../../src/modules/common/rawstr4.cpp \ ../../../src/modules/common/lzsscomprs.cpp \ ../../../src/modules/common/zipcomprs.cpp \ +../../../src/modules/common/bz2comprs.cpp \ +../../../src/modules/common/xzcomprs.cpp \ ../../../src/modules/common/rawverse4.cpp \ ../../../src/modules/common/swcipher.cpp \ ../../../src/modules/common/swcomprs.cpp \ @@ -67,11 +70,10 @@ LOCAL_SRC_FILES := ../../../src/modules/comments/zcom/zcom.cpp \ ../../../src/modules/filters/utf8greekaccents.cpp \ ../../../src/modules/filters/utf16utf8.cpp \ ../../../src/modules/filters/gbfwebif.cpp \ -../../../src/modules/filters/plainfootnotes.cpp \ ../../../src/modules/filters/utf8transliterator.cpp \ ../../../src/modules/filters/gbfstrongs.cpp \ -../../../src/modules/filters/osisplain.cpp \ ../../../src/modules/filters/thmlhtmlhref.cpp \ +../../../src/modules/filters/thmlxhtml.cpp \ ../../../src/modules/filters/thmlgbf.cpp \ ../../../src/modules/filters/utf8utf16.cpp \ ../../../src/modules/filters/utf8cantillation.cpp \ @@ -84,55 +86,62 @@ LOCAL_SRC_FILES := ../../../src/modules/comments/zcom/zcom.cpp \ ../../../src/modules/filters/thmlosis.cpp \ ../../../src/modules/filters/utf8nfkd.cpp \ ../../../src/modules/filters/thmlstrongs.cpp \ +../../../src/modules/filters/osisenum.cpp \ +../../../src/modules/filters/osisfootnotes.cpp \ +../../../src/modules/filters/osisglosses.cpp \ +../../../src/modules/filters/osisheadings.cpp \ +../../../src/modules/filters/osishtmlhref.cpp \ +../../../src/modules/filters/osislemma.cpp \ +../../../src/modules/filters/osismorph.cpp \ +../../../src/modules/filters/osismorphsegmentation.cpp \ +../../../src/modules/filters/osisosis.cpp \ +../../../src/modules/filters/osisplain.cpp \ +../../../src/modules/filters/osisredletterwords.cpp \ +../../../src/modules/filters/osisrtf.cpp \ +../../../src/modules/filters/osisscripref.cpp \ +../../../src/modules/filters/osisstrongs.cpp \ ../../../src/modules/filters/osisvariants.cpp \ +../../../src/modules/filters/osiswebif.cpp \ +../../../src/modules/filters/osiswordjs.cpp \ +../../../src/modules/filters/osisxhtml.cpp \ +../../../src/modules/filters/osisxlit.cpp \ +../../../src/modules/filters/osisreferencelinks.cpp \ ../../../src/modules/filters/thmlmorph.cpp \ ../../../src/modules/filters/gbfplain.cpp \ ../../../src/modules/filters/gbfhtmlhref.cpp \ +../../../src/modules/filters/gbfxhtml.cpp \ ../../../src/modules/filters/utf8html.cpp \ ../../../src/modules/filters/utf8nfc.cpp \ ../../../src/modules/filters/rtfhtml.cpp \ ../../../src/modules/filters/gbfredletterwords.cpp \ ../../../src/modules/filters/latin1utf16.cpp \ -../../../src/modules/filters/osisscripref.cpp \ ../../../src/modules/filters/thmlhtml.cpp \ ../../../src/modules/filters/gbfthml.cpp \ ../../../src/modules/filters/teihtmlhref.cpp \ +../../../src/modules/filters/teixhtml.cpp \ ../../../src/modules/filters/gbfrtf.cpp \ ../../../src/modules/filters/gbfosis.cpp \ ../../../src/modules/filters/teirtf.cpp \ ../../../src/modules/filters/thmlwordjs.cpp \ ../../../src/modules/filters/papyriplain.cpp \ -../../../src/modules/filters/osisfootnotes.cpp \ -../../../src/modules/filters/osiswordjs.cpp \ -../../../src/modules/filters/osismorph.cpp \ -../../../src/modules/filters/osislemma.cpp \ -../../../src/modules/filters/osisredletterwords.cpp \ -../../../src/modules/filters/osisrtf.cpp \ -../../../src/modules/filters/gbfheadings.cpp \ -../../../src/modules/filters/osisruby.cpp \ -../../../src/modules/filters/osishtmlhref.cpp \ ../../../src/modules/filters/utf8bidireorder.cpp \ +../../../src/modules/filters/gbfheadings.cpp \ ../../../src/modules/filters/thmlrtf.cpp \ ../../../src/modules/filters/swoptfilter.cpp \ ../../../src/modules/filters/utf8arabicpoints.cpp \ -../../../src/modules/filters/osisstrongs.cpp \ -../../../src/modules/filters/osisheadings.cpp \ ../../../src/modules/filters/unicodertf.cpp \ ../../../src/modules/filters/gbffootnotes.cpp \ ../../../src/modules/filters/greeklexattribs.cpp \ -../../../src/modules/filters/osiswebif.cpp \ ../../../src/modules/filters/thmlfootnotes.cpp \ ../../../src/modules/filters/thmlplain.cpp \ -../../../src/modules/filters/osisosis.cpp \ ../../../src/modules/filters/utf8hebrewpoints.cpp \ -../../../src/modules/filters/osismorphsegmentation.cpp \ ../../../src/modules/filters/thmlwebif.cpp \ ../../../src/modules/filters/thmlvariants.cpp \ -../../../src/modules/filters/plainhtml.cpp \ ../../../src/modules/filters/thmllemma.cpp \ ../../../src/modules/filters/gbfmorph.cpp \ ../../../src/modules/filters/teiplain.cpp \ ../../../src/modules/filters/swbasicfilter.cpp \ +../../../src/modules/filters/scsuutf8.cpp \ ../../../src/mgr/stringmgr.cpp \ ../../../src/mgr/swmgr.cpp \ ../../../src/mgr/swsearchable.cpp \ @@ -145,8 +154,8 @@ LOCAL_SRC_FILES := ../../../src/modules/comments/zcom/zcom.cpp \ ../../../src/mgr/installmgr.cpp \ ../../../src/mgr/swlocale.cpp \ ../../../src/mgr/filemgr.cpp \ -../../../src/mgr/versemgr.cpp \ -../../../src/mgr/ftptrans.cpp \ +../../../src/mgr/versificationmgr.cpp \ +../../../src/mgr/remotetrans.cpp \ ../../../src/mgr/ftplibftpt.cpp \ ../../../src/utilfuns/swobject.cpp \ ../../../src/utilfuns/roman.cpp \ @@ -157,7 +166,6 @@ LOCAL_SRC_FILES := ../../../src/modules/comments/zcom/zcom.cpp \ ../../../src/utilfuns/url.cpp \ ../../../src/utilfuns/swversion.cpp \ ../../../src/utilfuns/utilxml.cpp \ -../../../src/utilfuns/swunicod.cpp \ ../../../src/utilfuns/regex.c \ ../../../src/keys/swkey.cpp \ ../../../src/keys/versetreekey.cpp \ diff --git a/bindings/java-jni/jni/Application.mk b/bindings/java-jni/jni/Application.mk new file mode 100644 index 0000000..528042e --- /dev/null +++ b/bindings/java-jni/jni/Application.mk @@ -0,0 +1 @@ +APP_STL := stlport_static diff --git a/bindings/java-jni/jni/swordstub.cpp b/bindings/java-jni/jni/swordstub.cpp index 476d204..a8ddb16 100644 --- a/bindings/java-jni/jni/swordstub.cpp +++ b/bindings/java-jni/jni/swordstub.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swordstub.cpp - JNI bindings + * + * $Id: swordstub.cpp 2894 2013-07-16 04:38:43Z scribe $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -154,7 +159,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getModInfo init(); int size = 0; - for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); it++) { + for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); ++it) { if ((!(it->second->getConfigEntry("CipherKey"))) || (*(it->second->getConfigEntry("CipherKey")))) size++; } @@ -172,11 +177,11 @@ SWLog::getSystemLog()->logDebug("getModInfoList returning %d length array\n", si jobjectArray ret = (jobjectArray) env->NewObjectArray(size, clazzModInfo, NULL); int i = 0; - for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); it++) { + for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); ++it) { SWModule *module = it->second; if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) { - SWBuf type = module->Type(); + SWBuf type = module->getType(); SWBuf cat = module->getConfigEntry("Category"); SWBuf version = module->getConfigEntry("Version"); if (cat.length() > 0) type = cat; @@ -184,10 +189,10 @@ SWLog::getSystemLog()->logDebug("getModInfoList returning %d length array\n", si jobject modInfo = env->AllocObject(clazzModInfo); jstring val; - val = env->NewStringUTF(assureValidUTF8(module->Name())); env->SetObjectField(modInfo, nameID , val); env->DeleteLocalRef(val); - val = env->NewStringUTF(assureValidUTF8(module->Description())); env->SetObjectField(modInfo, descID , val); env->DeleteLocalRef(val); + val = env->NewStringUTF(assureValidUTF8(module->getName())); env->SetObjectField(modInfo, nameID , val); env->DeleteLocalRef(val); + val = env->NewStringUTF(assureValidUTF8(module->getDescription())); env->SetObjectField(modInfo, descID , val); env->DeleteLocalRef(val); val = env->NewStringUTF(assureValidUTF8(type.c_str())); env->SetObjectField(modInfo, catID , val); env->DeleteLocalRef(val); - val = env->NewStringUTF(assureValidUTF8(module->Lang())); env->SetObjectField(modInfo, langID , val); env->DeleteLocalRef(val); + val = env->NewStringUTF(assureValidUTF8(module->getLanguage())); env->SetObjectField(modInfo, langID , val); env->DeleteLocalRef(val); val = env->NewStringUTF(assureValidUTF8(version.c_str())); env->SetObjectField(modInfo, versionID, val); env->DeleteLocalRef(val); val = env->NewStringUTF(assureValidUTF8("")); env->SetObjectField(modInfo, deltaID , val); env->DeleteLocalRef(val); @@ -217,14 +222,14 @@ JNIEXPORT jobject JNICALL Java_org_crosswire_android_sword_SWMgr_getModuleByName env->ReleaseStringUTFChars(modNameJS, modName); if (module) { - SWBuf type = module->Type(); + SWBuf type = module->getType(); SWBuf cat = module->getConfigEntry("Category"); if (cat.length() > 0) type = cat; jfieldID fieldID; jclass clazzSWModule = env->FindClass("org/crosswire/android/sword/SWModule"); retVal = env->AllocObject(clazzSWModule); - fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->Name()))); - fieldID = env->GetFieldID(clazzSWModule, "description", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->Description()))); + fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getName()))); + fieldID = env->GetFieldID(clazzSWModule, "description", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getDescription()))); fieldID = env->GetFieldID(clazzSWModule, "category", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(type.c_str()))); } return retVal; @@ -328,7 +333,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalO sword::StringList options = mgr->getGlobalOptions(); int count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { count++; } @@ -336,7 +341,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalO jobjectArray ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL); count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(*it))); } @@ -361,14 +366,14 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalO env->ReleaseStringUTFChars(optionJS, option); int count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { count++; } jclass clazzString = env->FindClass("java/lang/String"); jobjectArray ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL); count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(*it))); } @@ -422,7 +427,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getAvailab sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); int count = 0; - for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) { + for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) { count++; } @@ -430,7 +435,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getAvailab jobjectArray ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL); count = 0; - for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) { + for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) { env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(*it))); } return ret; @@ -499,7 +504,7 @@ JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_setKeyText if (module) { const char *keyText = env->GetStringUTFChars(keyTextJS, NULL); -SWLog::getSystemLog()->logDebug("setKeyText(%s, %s)", module->Name(), keyText); +SWLog::getSystemLog()->logDebug("setKeyText(%s, %s)", module->getName(), keyText); sword::SWKey *key = module->getKey(); sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey && (*keyText=='+' ||*keyText=='-')) { @@ -515,7 +520,7 @@ SWLog::getSystemLog()->logDebug("setKeyText(%s, %s)", module->Name(), keyText); } } - module->KeyText(keyText); + module->setKey(keyText); env->ReleaseStringUTFChars(keyTextJS, keyText); } } @@ -555,7 +560,7 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRenderTex jstring retVal = 0; if (module) { - retVal = env->NewStringUTF(assureValidUTF8(module->RenderText())); + retVal = env->NewStringUTF(assureValidUTF8(module->renderText())); } return retVal; } @@ -591,7 +596,7 @@ JNIEXPORT jchar JNICALL Java_org_crosswire_android_sword_SWModule_error SWModule *module = getModule(env, me); - return (module) ? module->Error() : -99; + return (module) ? module->popError() : -99; } @@ -633,7 +638,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getEntr if (module) { - module->RenderText(); // force parse + module->renderText(); // force parse vector results; sword::AttributeTypeList &entryAttribs = module->getEntryAttributes(); @@ -645,35 +650,35 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getEntr i1Start = entryAttribs.find(level1); i1End = i1Start; if (i1End != entryAttribs.end()) - i1End++; + ++i1End; } else { i1Start = entryAttribs.begin(); i1End = entryAttribs.end(); } - for (;i1Start != i1End; i1Start++) { + for (;i1Start != i1End; ++i1Start) { if ((level2) && (*level2)) { i2Start = i1Start->second.find(level2); i2End = i2Start; if (i2End != i1Start->second.end()) - i2End++; + ++i2End; } else { i2Start = i1Start->second.begin(); i2End = i1Start->second.end(); } - for (;i2Start != i2End; i2Start++) { + for (;i2Start != i2End; ++i2Start) { if ((level3) && (*level3)) { i3Start = i2Start->second.find(level3); i3End = i3Start; if (i3End != i2Start->second.end()) - i3End++; + ++i3End; } else { i3Start = i2Start->second.begin(); i3End = i2Start->second.end(); } - for (;i3Start != i3End; i3Start++) { + for (;i3Start != i3End; ++i3Start) { results.push_back(i3Start->second); } if (i3Start != i3End) @@ -689,7 +694,7 @@ SWLog::getSystemLog()->logDebug("getEntryAttributes: size returned: %d", results for (int i = 0; i < results.size(); i++) { if (filtered) { - env->SetObjectArrayElement(ret, i, env->NewStringUTF(assureValidUTF8(module->RenderText(results[i].c_str())))); + env->SetObjectArrayElement(ret, i, env->NewStringUTF(assureValidUTF8(module->renderText(results[i].c_str())))); } else { env->SetObjectArrayElement(ret, i, env->NewStringUTF(assureValidUTF8(results[i].c_str()))); @@ -726,15 +731,15 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_parseKe sword::VerseKey *parser = SWDYNAMIC_CAST(VerseKey, k); if (parser) { sword::ListKey result; - result = parser->ParseVerseList(keyListText, *parser, true); + result = parser->parseVerseList(keyListText, *parser, true); int count = 0; - for (result = sword::TOP; !result.Error(); result++) { + for (result = sword::TOP; !result.popError(); result++) { count++; } ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL); count = 0; - for (result = sword::TOP; !result.Error(); result++) { + for (result = sword::TOP; !result.popError(); result++) { env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8((const char *)result))); } } @@ -947,7 +952,7 @@ JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getStripText SWModule *module = getModule(env, me); if (module) { - retVal = module->StripText(); + retVal = module->stripText(); } return env->NewStringUTF(assureValidUTF8(retVal)); @@ -1117,7 +1122,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search init(); - const int MAX_RETURN_COUNT = 200; + const int MAX_RETURN_COUNT = 999999; const char *expression = env->GetStringUTFChars(expressionJS, NULL); const char *scope = env->GetStringUTFChars(scopeJS, NULL); @@ -1134,21 +1139,21 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search sword::ListKey result; if ((scope) && (strlen(scope)) > 0) { - sword::SWKey *p = module->CreateKey(); + sword::SWKey *p = module->createKey(); sword::VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p); if (!parser) { delete p; parser = new VerseKey(); } *parser = module->getKeyText(); - lscope = parser->ParseVerseList(scope, *parser, true); + lscope = parser->parseVerseList(scope, *parser, true); result = module->search(expression, srchType, flags, &lscope, 0, &percentUpdate, &peeuuu); delete parser; } else result = module->search(expression, srchType, flags, 0, 0, &percentUpdate, &peeuuu); int count = 0; - for (result = sword::TOP; !result.Error(); result++) count++; + for (result = sword::TOP; !result.popError(); result++) count++; if (count > MAX_RETURN_COUNT) count = MAX_RETURN_COUNT; @@ -1160,17 +1165,25 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search result.sort(); int i = 0; - for (result = sword::TOP; !result.Error(); result++) { + jstring modName = env->NewStringUTF(assureValidUTF8(module->getName())); + jfieldID fieldIDModName = env->GetFieldID(clazzSearchHit, "modName", "Ljava/lang/String;"); + jfieldID fieldIDKey = env->GetFieldID(clazzSearchHit, "key" , "Ljava/lang/String;"); + jfieldID fieldIDScore = env->GetFieldID(clazzSearchHit, "score" , "J"); + for (result = sword::TOP; !result.popError(); result++) { jfieldID fieldID; jobject searchHit = env->AllocObject(clazzSearchHit); - fieldID = env->GetFieldID(clazzSearchHit, "modName", "Ljava/lang/String;"); env->SetObjectField(searchHit, fieldID, env->NewStringUTF(assureValidUTF8(module->Name()))); - fieldID = env->GetFieldID(clazzSearchHit, "key", "Ljava/lang/String;"); env->SetObjectField(searchHit, fieldID, env->NewStringUTF(assureValidUTF8((const char *)result))); - fieldID = env->GetFieldID(clazzSearchHit, "score", "J"); env->SetLongField(searchHit, fieldID, (long)result.getElement()->userData); + env->SetObjectField(searchHit, fieldIDModName, modName); + jstring key = env->NewStringUTF(assureValidUTF8((const char *)result)); + env->SetObjectField(searchHit, fieldIDKey, key); + env->DeleteLocalRef(key); + env->SetLongField(searchHit, fieldIDScore, (long)result.getElement()->userData); env->SetObjectArrayElement(ret, i++, searchHit); - if (i > MAX_RETURN_COUNT) break; + env->DeleteLocalRef(searchHit); + if (i >= MAX_RETURN_COUNT) break; } + env->DeleteLocalRef(modName); } env->ReleaseStringUTFChars(scopeJS, scope); @@ -1232,7 +1245,7 @@ SWLog::getSystemLog()->logDebug("uninstallModule %s\n", modName); return -2; } module = it->second; - installMgr->removeModule(mgr, module->Name()); + installMgr->removeModule(mgr, module->getName()); env->ReleaseStringUTFChars(modNameJS, modName); @@ -1254,12 +1267,12 @@ JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRe jobjectArray ret; int count = 0; - for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) { + for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) { count++; } ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL); count = 0; - for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) { + for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) { env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(it->second->caption.c_str()))); } @@ -1323,7 +1336,7 @@ SWLog::getSystemLog()->logDebug("found source: %s\n", sourceName); map modStats = installMgr->getModuleStatus(*mgr, *source->second->getMgr()); int size = 0; - for (map::iterator it = modStats.begin(); it != modStats.end(); it++) { + for (map::iterator it = modStats.begin(); it != modStats.end(); ++it) { size++; } @@ -1331,7 +1344,7 @@ SWLog::getSystemLog()->logDebug("remoteListModules returning %d length array\n", jobjectArray ret = (jobjectArray) env->NewObjectArray(size, clazzModInfo, NULL); int i = 0; - for (map::iterator it = modStats.begin(); it != modStats.end(); it++) { + for (map::iterator it = modStats.begin(); it != modStats.end(); ++it) { SWModule *module = it->first; int status = it->second; @@ -1341,16 +1354,16 @@ SWLog::getSystemLog()->logDebug("remoteListModules returning %d length array\n", if (it->second & InstallMgr::MODSTAT_OLDER) statusString = "-"; if (it->second & InstallMgr::MODSTAT_UPDATED) statusString = "+"; - SWBuf type = module->Type(); + SWBuf type = module->getType(); SWBuf cat = module->getConfigEntry("Category"); if (cat.length() > 0) type = cat; jobject modInfo = env->AllocObject(clazzModInfo); jstring val; - val = env->NewStringUTF(assureValidUTF8(module->Name())); env->SetObjectField(modInfo, nameID , val); env->DeleteLocalRef(val); - val = env->NewStringUTF(assureValidUTF8(module->Description())); env->SetObjectField(modInfo, descID , val); env->DeleteLocalRef(val); + val = env->NewStringUTF(assureValidUTF8(module->getName())); env->SetObjectField(modInfo, nameID , val); env->DeleteLocalRef(val); + val = env->NewStringUTF(assureValidUTF8(module->getDescription())); env->SetObjectField(modInfo, descID , val); env->DeleteLocalRef(val); val = env->NewStringUTF(assureValidUTF8(type.c_str())); env->SetObjectField(modInfo, catID , val); env->DeleteLocalRef(val); - val = env->NewStringUTF(assureValidUTF8(module->Lang())); env->SetObjectField(modInfo, langID , val); env->DeleteLocalRef(val); + val = env->NewStringUTF(assureValidUTF8(module->getLanguage())); env->SetObjectField(modInfo, langID , val); env->DeleteLocalRef(val); val = env->NewStringUTF(assureValidUTF8(version.c_str())); env->SetObjectField(modInfo, versionID, val); env->DeleteLocalRef(val); val = env->NewStringUTF(assureValidUTF8(statusString.c_str())); env->SetObjectField(modInfo, deltaID , val); env->DeleteLocalRef(val); @@ -1399,7 +1412,7 @@ SWLog::getSystemLog()->logDebug("remoteInstallModule: modName: %s\n", modName); module = it->second; - int error = installMgr->installModule(mgr, 0, module->Name(), is); + int error = installMgr->installModule(mgr, 0, module->getName(), is); return error; } @@ -1434,14 +1447,14 @@ SWLog::getSystemLog()->logDebug("Couldn't find remote source [%s]\n", sourceName env->ReleaseStringUTFChars(modNameJS, modName); if (module) { - SWBuf type = module->Type(); + SWBuf type = module->getType(); SWBuf cat = module->getConfigEntry("Category"); if (cat.length() > 0) type = cat; jfieldID fieldID; jclass clazzSWModule = env->FindClass("org/crosswire/android/sword/SWModule"); retVal = env->AllocObject(clazzSWModule); - fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->Name()))); - fieldID = env->GetFieldID(clazzSWModule, "description", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->Description()))); + fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getName()))); + fieldID = env->GetFieldID(clazzSWModule, "description", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getDescription()))); fieldID = env->GetFieldID(clazzSWModule, "category", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(type.c_str()))); fieldID = env->GetFieldID(clazzSWModule, "remoteSourceName", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, sourceNameJS); } diff --git a/bindings/java-jni/jni/webmgr.hpp b/bindings/java-jni/jni/webmgr.hpp index 7acbff9..e70adbf 100644 --- a/bindings/java-jni/jni/webmgr.hpp +++ b/bindings/java-jni/jni/webmgr.hpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * webmgr.cpp - + * + * $Id: webmgr.hpp 2894 2013-07-16 04:38:43Z scribe $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -68,12 +73,12 @@ public: void AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) { // ThML word stuff needs to process before strongs strip - if (module->Markup() == FMT_THML) { - module->AddOptionFilter(thmlWordJS); + if (module->getMarkup() == FMT_THML) { + module->addOptionFilter(thmlWordJS); } - if (module->Markup() == FMT_GBF) { - module->AddOptionFilter(gbfWordJS); + if (module->getMarkup() == FMT_GBF) { + module->addOptionFilter(gbfWordJS); } // add other module filters @@ -95,12 +100,12 @@ public: if (module->getConfig().has("GlobalOptionFilter", "ThMLVariants")) { OptionFilterMap::iterator it = optionFilters.find("ThMLVariants"); if (it != optionFilters.end()) { - module->AddOptionFilter((*it).second); // add filter to module and option as a valid option + module->addOptionFilter((*it).second); // add filter to module and option as a valid option } } - if (module->Markup() == FMT_OSIS) { - module->AddOptionFilter(osisWordJS); + if (module->getMarkup() == FMT_OSIS) { + module->addOptionFilter(osisWordJS); } } diff --git a/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java b/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java index 66c920f..3edbd58 100644 --- a/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java +++ b/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * InstallMgr.java - + * + * $Id: InstallMgr.java 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + package org.crosswire.android.sword; public class InstallMgr { diff --git a/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java b/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java index dc78485..2ae2e01 100644 --- a/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java +++ b/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * SWMgr.java - + * + * $Id: SWMgr.java 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + package org.crosswire.android.sword; public class SWMgr { diff --git a/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java b/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java index 6a463f9..c7d4707 100644 --- a/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java +++ b/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * SWModule.java - + * + * $Id: SWModule.java 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + package org.crosswire.android.sword; public class SWModule { diff --git a/bindings/objc/ObjCSword.h b/bindings/objc/ObjCSword.h index 59671c6..5f2f5ce 100644 --- a/bindings/objc/ObjCSword.h +++ b/bindings/objc/ObjCSword.h @@ -23,7 +23,7 @@ #import #import #import -#import +#import #import #import #import diff --git a/bindings/objc/ObjCSword.xcodeproj/project.pbxproj b/bindings/objc/ObjCSword.xcodeproj/project.pbxproj index 5c902c1..8598424 100644 --- a/bindings/objc/ObjCSword.xcodeproj/project.pbxproj +++ b/bindings/objc/ObjCSword.xcodeproj/project.pbxproj @@ -3,61 +3,54 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { +/* Begin PBXAggregateTarget section */ + A9D271FA14D7193300DA8926 /* Utilities */ = { + isa = PBXAggregateTarget; + buildConfigurationList = A9D271FB14D7193300DA8926 /* Build configuration list for PBXAggregateTarget "Utilities" */; + buildPhases = ( + ); + dependencies = ( + A9D271FF14D7193A00DA8926 /* PBXTargetDependency */, + A9D2720114D7194E00DA8926 /* PBXTargetDependency */, + A9D2720314D7194E00DA8926 /* PBXTargetDependency */, + A9D2720514D7194E00DA8926 /* PBXTargetDependency */, + A9D2720714D7194E00DA8926 /* PBXTargetDependency */, + A9D2720914D7194E00DA8926 /* PBXTargetDependency */, + A9D2720B14D7194E00DA8926 /* PBXTargetDependency */, + A9D2720D14D7194E00DA8926 /* PBXTargetDependency */, + A9D2720F14D7194E00DA8926 /* PBXTargetDependency */, + A9D2721114D7194E00DA8926 /* PBXTargetDependency */, + A9D2721314D7194E00DA8926 /* PBXTargetDependency */, + A9D2721514D7194E00DA8926 /* PBXTargetDependency */, + A9D2721714D7194E00DA8926 /* PBXTargetDependency */, + A9D2721914D7194E00DA8926 /* PBXTargetDependency */, + A9D2721B14D7194E00DA8926 /* PBXTargetDependency */, + A9D2721D14D7194E00DA8926 /* PBXTargetDependency */, + A9D2721F14D7194E00DA8926 /* PBXTargetDependency */, + ); + name = Utilities; + productName = Utilities; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ + 8C92C31DC92DF0671FCEB5B3 /* SwordFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92CC111DC521DE0C054C60 /* SwordFilter.mm */; }; + 8C92CC7B68FDCDFFFB8B4A31 /* DefaultFilterProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */; }; + 8C92CE0B19FBB659FB8F8B71 /* FilterProviderFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */; }; + 8C92CE39E231FF9CAAB5308B /* SwordUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C291C40A77060C12A21B /* SwordUtil.m */; }; 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; }; - A9013CFD11E316C700E1CCCA /* ObjCSword.h in Headers */ = {isa = PBXBuildFile; fileRef = A975EAC411C77862007C1532 /* ObjCSword.h */; }; - A9013CFE11E316C700E1CCCA /* SwordBible.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE3117B28910018B06F /* SwordBible.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013CFF11E316C700E1CCCA /* SwordBibleBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE5117B28920018B06F /* SwordBibleBook.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0011E316C700E1CCCA /* SwordBibleChapter.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE7117B28920018B06F /* SwordBibleChapter.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0111E316C700E1CCCA /* SwordBibleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0211E316C700E1CCCA /* SwordBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEB117B28920018B06F /* SwordBook.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0311E316C700E1CCCA /* SwordCommentary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABED117B28920018B06F /* SwordCommentary.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0411E316C700E1CCCA /* SwordDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEF117B28920018B06F /* SwordDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0511E316C700E1CCCA /* SwordInstallSource.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF1117B28920018B06F /* SwordInstallSource.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0611E316C700E1CCCA /* SwordInstallSourceController.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF3117B28920018B06F /* SwordInstallSourceController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0711E316C700E1CCCA /* SwordKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF5117B28920018B06F /* SwordKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0811E316C700E1CCCA /* SwordListKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF7117B28920018B06F /* SwordListKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0911E316C700E1CCCA /* SwordManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF9117B28920018B06F /* SwordManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0B11E316C700E1CCCA /* SwordModule.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFD117B28920018B06F /* SwordModule.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0C11E316C700E1CCCA /* SwordModuleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0D11E316C700E1CCCA /* SwordModuleTreeEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0E11E316C700E1CCCA /* SwordVerseKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC05117B28920018B06F /* SwordVerseKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D0F11E316C700E1CCCA /* SwordVerseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC07117B28920018B06F /* SwordVerseManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D1011E316C700E1CCCA /* VerseEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC09117B28920018B06F /* VerseEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D1111E316C700E1CCCA /* Notifications.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A2C17C118D9D3D0002873D /* Notifications.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D1211E316C700E1CCCA /* Configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2856D11C446B700803CB5 /* Configuration.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D1311E316C700E1CCCA /* OSXConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2857111C4471400803CB5 /* OSXConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D1411E316C700E1CCCA /* SwordModule+Index.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9013D1611E316C700E1CCCA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; - A9013D1E11E316C700E1CCCA /* locales.d in Resources */ = {isa = PBXBuildFile; fileRef = A9D437CE11C52947007AFE83 /* locales.d */; }; - A9013D2011E316C700E1CCCA /* SwordBible.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE4117B28910018B06F /* SwordBible.mm */; }; - A9013D2111E316C700E1CCCA /* SwordBibleBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE6117B28920018B06F /* SwordBibleBook.mm */; }; - A9013D2211E316C700E1CCCA /* SwordBibleChapter.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE8117B28920018B06F /* SwordBibleChapter.m */; }; - A9013D2311E316C700E1CCCA /* SwordBibleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */; }; - A9013D2411E316C700E1CCCA /* SwordBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEC117B28920018B06F /* SwordBook.mm */; }; - A9013D2511E316C700E1CCCA /* SwordCommentary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEE117B28920018B06F /* SwordCommentary.mm */; }; - A9013D2611E316C700E1CCCA /* SwordDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF0117B28920018B06F /* SwordDictionary.mm */; }; - A9013D2711E316C700E1CCCA /* SwordInstallSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF2117B28920018B06F /* SwordInstallSource.mm */; }; - A9013D2811E316C700E1CCCA /* SwordInstallSourceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */; }; - A9013D2911E316C700E1CCCA /* SwordKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF6117B28920018B06F /* SwordKey.mm */; }; - A9013D2A11E316C700E1CCCA /* SwordListKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF8117B28920018B06F /* SwordListKey.mm */; }; - A9013D2B11E316C700E1CCCA /* SwordManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFA117B28920018B06F /* SwordManager.mm */; }; - A9013D2D11E316C700E1CCCA /* SwordModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFE117B28920018B06F /* SwordModule.mm */; }; - A9013D2E11E316C700E1CCCA /* SwordModuleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */; }; - A9013D2F11E316C700E1CCCA /* SwordModuleTreeEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */; }; - A9013D3011E316C700E1CCCA /* SwordVerseKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC06117B28920018B06F /* SwordVerseKey.mm */; }; - A9013D3111E316C700E1CCCA /* SwordVerseManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC08117B28920018B06F /* SwordVerseManager.mm */; }; - A9013D3211E316C700E1CCCA /* VerseEnumerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC0A117B28920018B06F /* VerseEnumerator.mm */; }; - A9013D3311E316C700E1CCCA /* OSXConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2857211C4471400803CB5 /* OSXConfiguration.m */; }; - A9013D3411E316C700E1CCCA /* Configuration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2858211C44A0A00803CB5 /* Configuration.m */; }; - A9013D3511E316C700E1CCCA /* SwordModule+Index.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */; }; - A9013D3811E316C700E1CCCA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; }; - A918B8E411C6697400024D84 /* SwordModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A918B8E211C6697400024D84 /* SwordModuleTest.h */; }; - A918B8E511C6697400024D84 /* SwordModuleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A918B8E311C6697400024D84 /* SwordModuleTest.m */; }; + A917AF2616B1BE38006367FC /* Tests-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A917AF2516B1BE38006367FC /* Tests-Info.plist */; }; + A91C8B6817523609008702B9 /* versificationmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A91C8B66175233F3008702B9 /* versificationmgr.cpp */; }; + A929619C16B1BA240094E5BE /* SwordBibleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */; }; + A929619D16B1BA240094E5BE /* SwordKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619716B1BA240094E5BE /* SwordKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A929619E16B1BA240094E5BE /* SwordKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A929619816B1BA240094E5BE /* SwordKey.mm */; }; + A929619F16B1BA240094E5BE /* SwordListKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619916B1BA240094E5BE /* SwordListKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A92961A016B1BA240094E5BE /* SwordListKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A929619A16B1BA240094E5BE /* SwordListKey.mm */; }; + A92961A116B1BA240094E5BE /* SwordVerseKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619B16B1BA240094E5BE /* SwordVerseKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC0B117B28920018B06F /* SwordBible.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE3117B28910018B06F /* SwordBible.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE4117B28910018B06F /* SwordBible.mm */; }; A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE5117B28920018B06F /* SwordBibleBook.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -65,7 +58,6 @@ A94EAC0F117B28920018B06F /* SwordBibleChapter.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE7117B28920018B06F /* SwordBibleChapter.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE8117B28920018B06F /* SwordBibleChapter.m */; }; A94EAC11117B28920018B06F /* SwordBibleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC12117B28920018B06F /* SwordBibleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */; }; A94EAC13117B28920018B06F /* SwordBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEB117B28920018B06F /* SwordBook.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC14117B28920018B06F /* SwordBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEC117B28920018B06F /* SwordBook.mm */; }; A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABED117B28920018B06F /* SwordCommentary.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -74,12 +66,8 @@ A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF0117B28920018B06F /* SwordDictionary.mm */; }; A94EAC19117B28920018B06F /* SwordInstallSource.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF1117B28920018B06F /* SwordInstallSource.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF2117B28920018B06F /* SwordInstallSource.mm */; }; - A94EAC1B117B28920018B06F /* SwordInstallSourceController.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF3117B28920018B06F /* SwordInstallSourceController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC1C117B28920018B06F /* SwordInstallSourceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */; }; - A94EAC1D117B28920018B06F /* SwordKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF5117B28920018B06F /* SwordKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC1E117B28920018B06F /* SwordKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF6117B28920018B06F /* SwordKey.mm */; }; - A94EAC1F117B28920018B06F /* SwordListKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF7117B28920018B06F /* SwordListKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A94EAC20117B28920018B06F /* SwordListKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF8117B28920018B06F /* SwordListKey.mm */; }; + A94EAC1B117B28920018B06F /* SwordInstallSourceManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF3117B28920018B06F /* SwordInstallSourceManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC1C117B28920018B06F /* SwordInstallSourceManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF4117B28920018B06F /* SwordInstallSourceManager.mm */; }; A94EAC21117B28920018B06F /* SwordManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF9117B28920018B06F /* SwordManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC22117B28920018B06F /* SwordManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFA117B28920018B06F /* SwordManager.mm */; }; A94EAC25117B28920018B06F /* SwordModule.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFD117B28920018B06F /* SwordModule.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -88,352 +76,598 @@ A94EAC28117B28920018B06F /* SwordModuleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */; }; A94EAC29117B28920018B06F /* SwordModuleTreeEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC2A117B28920018B06F /* SwordModuleTreeEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */; }; - A94EAC2D117B28920018B06F /* SwordVerseKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC05117B28920018B06F /* SwordVerseKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC2E117B28920018B06F /* SwordVerseKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC06117B28920018B06F /* SwordVerseKey.mm */; }; A94EAC2F117B28920018B06F /* SwordVerseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC07117B28920018B06F /* SwordVerseManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC30117B28920018B06F /* SwordVerseManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC08117B28920018B06F /* SwordVerseManager.mm */; }; A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC09117B28920018B06F /* VerseEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; }; A94EAC32117B28920018B06F /* VerseEnumerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC0A117B28920018B06F /* VerseEnumerator.mm */; }; - A956316611FD8C5B007DC7AD /* libsword-ub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A956316411FD8C55007DC7AD /* libsword-ub.a */; }; - A956316711FD8C5E007DC7AD /* libsword-ub.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = A956316411FD8C55007DC7AD /* libsword-ub.a */; }; - A956324411FD90CE007DC7AD /* libclucene-ub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A956324211FD90C9007DC7AD /* libclucene-ub.a */; }; - A956324511FD90D2007DC7AD /* libclucene-ub.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = A956324211FD90C9007DC7AD /* libclucene-ub.a */; }; - A964657C11C662CF00640FAC /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; }; - A964658F11C6654300640FAC /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */; }; - A96465A511C6657900640FAC /* SwordManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A964658111C663E200640FAC /* SwordManagerTest.m */; }; - A96465AD11C6658200640FAC /* SwordManagerTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A964658011C663E200640FAC /* SwordManagerTest.h */; }; + A954ABCB13EE9E460094E3FE /* AnalysisHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9E413EE9A2B0094E3FE /* AnalysisHeader.cpp */; }; + A954ABCC13EE9E460094E3FE /* Analyzers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9E613EE9A2B0094E3FE /* Analyzers.cpp */; }; + A954ABCD13EE9E470094E3FE /* StandardAnalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9E913EE9A2B0094E3FE /* StandardAnalyzer.cpp */; }; + A954ABCE13EE9E470094E3FE /* StandardFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9EB13EE9A2B0094E3FE /* StandardFilter.cpp */; }; + A954ABCF13EE9E470094E3FE /* StandardTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9ED13EE9A2B0094E3FE /* StandardTokenizer.cpp */; }; + A954ABD013EE9E470094E3FE /* gunichartables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9F913EE9A2B0094E3FE /* gunichartables.cpp */; }; + A954ABD113EE9E470094E3FE /* repl_lltot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9FE13EE9A2B0094E3FE /* repl_lltot.cpp */; }; + A954ABD213EE9E470094E3FE /* repl_tcscasecmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0013EE9A2B0094E3FE /* repl_tcscasecmp.cpp */; }; + A954ABD313EE9E470094E3FE /* repl_tcslwr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0113EE9A2B0094E3FE /* repl_tcslwr.cpp */; }; + A954ABD413EE9E470094E3FE /* repl_tcstod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0213EE9A2B0094E3FE /* repl_tcstod.cpp */; }; + A954ABD513EE9E470094E3FE /* repl_tcstoll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0313EE9A2B0094E3FE /* repl_tcstoll.cpp */; }; + A954ABD613EE9E470094E3FE /* repl_tprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0413EE9A2B0094E3FE /* repl_tprintf.cpp */; }; + A954ABD713EE9E470094E3FE /* threads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0813EE9A2B0094E3FE /* threads.cpp */; }; + A954ABD813EE9E470094E3FE /* utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0913EE9A2B0094E3FE /* utf8.cpp */; }; + A954ABD913EE9E470094E3FE /* condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0B13EE9A2B0094E3FE /* condition.cpp */; }; + A954ABDA13EE9E470094E3FE /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0D13EE9A2B0094E3FE /* error.cpp */; }; + A954ABDB13EE9E470094E3FE /* memtracking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1113EE9A2B0094E3FE /* memtracking.cpp */; }; + A954ABDC13EE9E470094E3FE /* DateField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1313EE9A2B0094E3FE /* DateField.cpp */; }; + A954ABDD13EE9E470094E3FE /* Document.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1513EE9A2B0094E3FE /* Document.cpp */; }; + A954ABDE13EE9E470094E3FE /* Field.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1713EE9A2B0094E3FE /* Field.cpp */; }; + A954ABDF13EE9E470094E3FE /* CompoundFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1A13EE9A2B0094E3FE /* CompoundFile.cpp */; }; + A954ABE013EE9E470094E3FE /* DocumentWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1C13EE9A2B0094E3FE /* DocumentWriter.cpp */; }; + A954ABE113EE9E470094E3FE /* FieldInfos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1F13EE9A2B0094E3FE /* FieldInfos.cpp */; }; + A954ABE213EE9E470094E3FE /* FieldsReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2113EE9A2B0094E3FE /* FieldsReader.cpp */; }; + A954ABE313EE9E470094E3FE /* FieldsWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2313EE9A2B0094E3FE /* FieldsWriter.cpp */; }; + A954ABE413EE9E470094E3FE /* IndexModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2513EE9A2B0094E3FE /* IndexModifier.cpp */; }; + A954ABE513EE9E470094E3FE /* IndexReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2713EE9A2B0094E3FE /* IndexReader.cpp */; }; + A954ABE613EE9E470094E3FE /* IndexWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2913EE9A2B0094E3FE /* IndexWriter.cpp */; }; + A954ABE713EE9E470094E3FE /* MultiReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2B13EE9A2B0094E3FE /* MultiReader.cpp */; }; + A954ABE813EE9E470094E3FE /* SegmentInfos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2E13EE9A2B0094E3FE /* SegmentInfos.cpp */; }; + A954ABE913EE9E470094E3FE /* SegmentMergeInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3013EE9A2B0094E3FE /* SegmentMergeInfo.cpp */; }; + A954ABEA13EE9E470094E3FE /* SegmentMergeQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3213EE9A2B0094E3FE /* SegmentMergeQueue.cpp */; }; + A954ABEB13EE9E470094E3FE /* SegmentMerger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3413EE9A2B0094E3FE /* SegmentMerger.cpp */; }; + A954ABEC13EE9E470094E3FE /* SegmentReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3613EE9A2B0094E3FE /* SegmentReader.cpp */; }; + A954ABED13EE9E470094E3FE /* SegmentTermDocs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3713EE9A2B0094E3FE /* SegmentTermDocs.cpp */; }; + A954ABEE13EE9E470094E3FE /* SegmentTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3813EE9A2B0094E3FE /* SegmentTermEnum.cpp */; }; + A954ABEF13EE9E470094E3FE /* SegmentTermPositions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3A13EE9A2B0094E3FE /* SegmentTermPositions.cpp */; }; + A954ABF013EE9E470094E3FE /* SegmentTermVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3B13EE9A2B0094E3FE /* SegmentTermVector.cpp */; }; + A954ABF113EE9E470094E3FE /* Term.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3C13EE9A2B0094E3FE /* Term.cpp */; }; + A954ABF213EE9E470094E3FE /* TermInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3E13EE9A2B0094E3FE /* TermInfo.cpp */; }; + A954ABF313EE9E470094E3FE /* TermInfosReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4013EE9A2B0094E3FE /* TermInfosReader.cpp */; }; + A954ABF413EE9E470094E3FE /* TermInfosWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4213EE9A2B0094E3FE /* TermInfosWriter.cpp */; }; + A954ABF513EE9E470094E3FE /* TermVectorReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4613EE9A2B0094E3FE /* TermVectorReader.cpp */; }; + A954ABF613EE9E470094E3FE /* TermVectorWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4713EE9A2B0094E3FE /* TermVectorWriter.cpp */; }; + A954ABF713EE9E470094E3FE /* Lexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4A13EE9A2B0094E3FE /* Lexer.cpp */; }; + A954ABF813EE9E470094E3FE /* MultiFieldQueryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4C13EE9A2B0094E3FE /* MultiFieldQueryParser.cpp */; }; + A954ABF913EE9E470094E3FE /* QueryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4E13EE9A2B0094E3FE /* QueryParser.cpp */; }; + A954ABFA13EE9E470094E3FE /* QueryParserBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5013EE9A2B0094E3FE /* QueryParserBase.cpp */; }; + A954ABFB13EE9E470094E3FE /* QueryToken.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5213EE9A2B0094E3FE /* QueryToken.cpp */; }; + A954ABFC13EE9E470094E3FE /* TokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5413EE9A2B0094E3FE /* TokenList.cpp */; }; + A954ABFD13EE9E470094E3FE /* BooleanQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5813EE9A2B0094E3FE /* BooleanQuery.cpp */; }; + A954ABFE13EE9E470094E3FE /* BooleanScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5A13EE9A2B0094E3FE /* BooleanScorer.cpp */; }; + A954ABFF13EE9E470094E3FE /* CachingWrapperFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5C13EE9A2B0094E3FE /* CachingWrapperFilter.cpp */; }; + A954AC0013EE9E470094E3FE /* ChainedFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5E13EE9A2B0094E3FE /* ChainedFilter.cpp */; }; + A954AC0113EE9E470094E3FE /* ConjunctionScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6113EE9A2B0094E3FE /* ConjunctionScorer.cpp */; }; + A954AC0213EE9E470094E3FE /* DateFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6313EE9A2B0094E3FE /* DateFilter.cpp */; }; + A954AC0313EE9E470094E3FE /* ExactPhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6513EE9A2B0094E3FE /* ExactPhraseScorer.cpp */; }; + A954AC0413EE9E470094E3FE /* Explanation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6713EE9A2B0094E3FE /* Explanation.cpp */; }; + A954AC0513EE9E470094E3FE /* FieldCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6913EE9A2B0094E3FE /* FieldCache.cpp */; }; + A954AC0613EE9E470094E3FE /* FieldCacheImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6B13EE9A2B0094E3FE /* FieldCacheImpl.cpp */; }; + A954AC0713EE9E470094E3FE /* FieldDocSortedHitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6E13EE9A2B0094E3FE /* FieldDocSortedHitQueue.cpp */; }; + A954AC0813EE9E470094E3FE /* FieldSortedHitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7013EE9A2B0094E3FE /* FieldSortedHitQueue.cpp */; }; + A954AC0913EE9E470094E3FE /* FilteredTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7313EE9A2B0094E3FE /* FilteredTermEnum.cpp */; }; + A954AC0A13EE9E470094E3FE /* FuzzyQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7513EE9A2B0094E3FE /* FuzzyQuery.cpp */; }; + A954AC0B13EE9E470094E3FE /* HitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7713EE9A2B0094E3FE /* HitQueue.cpp */; }; + A954AC0C13EE9E470094E3FE /* Hits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7913EE9A2B0094E3FE /* Hits.cpp */; }; + A954AC0D13EE9E470094E3FE /* IndexSearcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7A13EE9A2B0094E3FE /* IndexSearcher.cpp */; }; + A954AC0E13EE9E470094E3FE /* MultiSearcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7C13EE9A2B0094E3FE /* MultiSearcher.cpp */; }; + A954AC0F13EE9E470094E3FE /* MultiTermQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7E13EE9A2B0094E3FE /* MultiTermQuery.cpp */; }; + A954AC1013EE9E470094E3FE /* PhrasePositions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8013EE9A2B0094E3FE /* PhrasePositions.cpp */; }; + A954AC1113EE9E470094E3FE /* PhraseQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8213EE9A2B0094E3FE /* PhraseQuery.cpp */; }; + A954AC1213EE9E470094E3FE /* PhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8513EE9A2B0094E3FE /* PhraseScorer.cpp */; }; + A954AC1313EE9E470094E3FE /* PrefixQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8713EE9A2B0094E3FE /* PrefixQuery.cpp */; }; + A954AC1413EE9E470094E3FE /* QueryFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8913EE9A2B0094E3FE /* QueryFilter.cpp */; }; + A954AC1513EE9E470094E3FE /* RangeFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8B13EE9A2B0094E3FE /* RangeFilter.cpp */; }; + A954AC1613EE9E470094E3FE /* RangeQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8D13EE9A2B0094E3FE /* RangeQuery.cpp */; }; + A954AC1713EE9E470094E3FE /* SearchHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9013EE9A2B0094E3FE /* SearchHeader.cpp */; }; + A954AC1813EE9E470094E3FE /* Similarity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9213EE9A2B0094E3FE /* Similarity.cpp */; }; + A954AC1913EE9E470094E3FE /* SloppyPhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9413EE9A2B0094E3FE /* SloppyPhraseScorer.cpp */; }; + A954AC1A13EE9E470094E3FE /* Sort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9613EE9A2B0094E3FE /* Sort.cpp */; }; + A954AC1B13EE9E470094E3FE /* TermQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9813EE9A2B0094E3FE /* TermQuery.cpp */; }; + A954AC1C13EE9E470094E3FE /* TermScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9A13EE9A2B0094E3FE /* TermScorer.cpp */; }; + A954AC1D13EE9E470094E3FE /* WildcardQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9C13EE9A2B0094E3FE /* WildcardQuery.cpp */; }; + A954AC1E13EE9E470094E3FE /* WildcardTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9E13EE9A2B0094E3FE /* WildcardTermEnum.cpp */; }; + A954AC1F13EE9E470094E3FE /* StdHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA013EE9A2B0094E3FE /* StdHeader.cpp */; }; + A954AC2013EE9E470094E3FE /* FSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA413EE9A2B0094E3FE /* FSDirectory.cpp */; }; + A954AC2113EE9E470094E3FE /* IndexInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA613EE9A2B0094E3FE /* IndexInput.cpp */; }; + A954AC2213EE9E470094E3FE /* IndexOutput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA813EE9A2B0094E3FE /* IndexOutput.cpp */; }; + A954AC2313EE9E470094E3FE /* Lock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAAB13EE9A2B0094E3FE /* Lock.cpp */; }; + A954AC2413EE9E470094E3FE /* MMapInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAAD13EE9A2B0094E3FE /* MMapInput.cpp */; }; + A954AC2513EE9E470094E3FE /* RAMDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAAF13EE9A2B0094E3FE /* RAMDirectory.cpp */; }; + A954AC2613EE9E470094E3FE /* TransactionalRAMDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAB113EE9A2B0094E3FE /* TransactionalRAMDirectory.cpp */; }; + A954AC2713EE9E470094E3FE /* BitSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAB513EE9A2B0094E3FE /* BitSet.cpp */; }; + A954AC2813EE9E470094E3FE /* dirent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAB813EE9A2B0094E3FE /* dirent.cpp */; }; + A954AC2913EE9E470094E3FE /* Equators.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AABA13EE9A2B0094E3FE /* Equators.cpp */; }; + A954AC2A13EE9E470094E3FE /* FastCharStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AABC13EE9A2B0094E3FE /* FastCharStream.cpp */; }; + A954AC2B13EE9E470094E3FE /* fileinputstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AABE13EE9A2B0094E3FE /* fileinputstream.cpp */; }; + A954AC2C13EE9E470094E3FE /* MD5Digester.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAC313EE9A2B0094E3FE /* MD5Digester.cpp */; }; + A954AC2D13EE9E470094E3FE /* Misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAC513EE9A2B0094E3FE /* Misc.cpp */; }; + A954AC2E13EE9E470094E3FE /* Reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAC813EE9A2B0094E3FE /* Reader.cpp */; }; + A954AC2F13EE9E470094E3FE /* StringBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AACB13EE9A2B0094E3FE /* StringBuffer.cpp */; }; + A954AC3013EE9E470094E3FE /* StringIntern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AACD13EE9A2B0094E3FE /* StringIntern.cpp */; }; + A954AC3113EE9E470094E3FE /* ThreadLocal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAD113EE9A2B0094E3FE /* ThreadLocal.cpp */; }; + A954AC3313EE9F620094E3FE /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3213EE9F620094E3FE /* libcurl.dylib */; }; + A954AC3713EE9FA10094E3FE /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3413EE9FA10094E3FE /* libicucore.dylib */; }; + A954AC3813EE9FA10094E3FE /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3513EE9FA10094E3FE /* libstdc++.dylib */; }; + A954AC3913EE9FA10094E3FE /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3613EE9FA10094E3FE /* libz.dylib */; }; + A954AC3A13EEA0C10094E3FE /* swdisp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80113EE98B30094E3FE /* swdisp.cpp */; }; + A954AC3B13EEA0C10094E3FE /* swlog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80213EE98B30094E3FE /* swlog.cpp */; }; + A954AC3C13EEA0C10094E3FE /* listkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80913EE98B30094E3FE /* listkey.cpp */; }; + A954AC3D13EEA0C10094E3FE /* strkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81013EE98B30094E3FE /* strkey.cpp */; }; + A954AC3E13EEA0C10094E3FE /* swkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81113EE98B30094E3FE /* swkey.cpp */; }; + A954AC3F13EEA0C10094E3FE /* treekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81213EE98B30094E3FE /* treekey.cpp */; }; + A954AC4013EEA0C10094E3FE /* treekeyidx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81313EE98B30094E3FE /* treekeyidx.cpp */; }; + A954AC4113EEA0C10094E3FE /* versekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81413EE98B30094E3FE /* versekey.cpp */; }; + A954AC4213EEA0C10094E3FE /* versetreekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81513EE98B30094E3FE /* versetreekey.cpp */; }; + A954AC4313EEA0C10094E3FE /* curlftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81813EE98B30094E3FE /* curlftpt.cpp */; }; + A954AC4413EEA0C10094E3FE /* curlhttpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81913EE98B30094E3FE /* curlhttpt.cpp */; }; + A954AC4513EEA0C10094E3FE /* encfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81A13EE98B30094E3FE /* encfiltmgr.cpp */; }; + A954AC4613EEA0C10094E3FE /* filemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81B13EE98B30094E3FE /* filemgr.cpp */; }; + A954AC4713EEA0C10094E3FE /* ftplibftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81C13EE98B30094E3FE /* ftplibftpt.cpp */; }; + A954AC4913EEA0C10094E3FE /* installmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81E13EE98B30094E3FE /* installmgr.cpp */; }; + A954AC4A13EEA0C10094E3FE /* localemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81F13EE98B30094E3FE /* localemgr.cpp */; }; + A954AC4B13EEA0C10094E3FE /* markupfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82213EE98B30094E3FE /* markupfiltmgr.cpp */; }; + A954AC4C13EEA0C10094E3FE /* stringmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82313EE98B30094E3FE /* stringmgr.cpp */; }; + A954AC4D13EEA0C10094E3FE /* swcacher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82413EE98B30094E3FE /* swcacher.cpp */; }; + A954AC4E13EEA0C10094E3FE /* swconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82513EE98B30094E3FE /* swconfig.cpp */; }; + A954AC4F13EEA0C10094E3FE /* swfiltermgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82613EE98B30094E3FE /* swfiltermgr.cpp */; }; + A954AC5013EEA0C10094E3FE /* swlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82713EE98B30094E3FE /* swlocale.cpp */; }; + A954AC5113EEA0C10094E3FE /* swmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82813EE98B30094E3FE /* swmgr.cpp */; }; + A954AC5213EEA0C10094E3FE /* swsearchable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82913EE98B30094E3FE /* swsearchable.cpp */; }; + A954AC5413EEA0C10094E3FE /* hrefcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82E13EE98B30094E3FE /* hrefcom.cpp */; }; + A954AC5513EEA0C10094E3FE /* rawcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83613EE98B30094E3FE /* rawcom.cpp */; }; + A954AC5613EEA0C10094E3FE /* rawcom4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83913EE98B30094E3FE /* rawcom4.cpp */; }; + A954AC5713EEA0C10094E3FE /* rawfiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83D13EE98B30094E3FE /* rawfiles.cpp */; }; + A954AC5813EEA0C10094E3FE /* swcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83E13EE98B30094E3FE /* swcom.cpp */; }; + A954AC5913EEA0C10094E3FE /* zcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84213EE98B30094E3FE /* zcom.cpp */; }; + A954AC5A13EEA0C10094E3FE /* entriesblk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84513EE98B30094E3FE /* entriesblk.cpp */; }; + A954AC5B13EEA0C10094E3FE /* lzsscomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84613EE98B30094E3FE /* lzsscomprs.cpp */; }; + A954AC5C13EEA0C10094E3FE /* rawstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84913EE98B30094E3FE /* rawstr.cpp */; }; + A954AC5D13EEA0C10094E3FE /* rawstr4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84A13EE98B30094E3FE /* rawstr4.cpp */; }; + A954AC5E13EEA0C10094E3FE /* rawverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84B13EE98B30094E3FE /* rawverse.cpp */; }; + A954AC5F13EEA0C10094E3FE /* rawverse4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84C13EE98B30094E3FE /* rawverse4.cpp */; }; + A954AC6013EEA0C10094E3FE /* sapphire.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84D13EE98B30094E3FE /* sapphire.cpp */; }; + A954AC6113EEA0C10094E3FE /* swcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84E13EE98B30094E3FE /* swcipher.cpp */; }; + A954AC6213EEA0C10094E3FE /* swcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84F13EE98B30094E3FE /* swcomprs.cpp */; }; + A954AC6313EEA0C10094E3FE /* zipcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85113EE98B30094E3FE /* zipcomprs.cpp */; }; + A954AC6413EEA0C10094E3FE /* zstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85213EE98B30094E3FE /* zstr.cpp */; }; + A954AC6513EEA0C10094E3FE /* zverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85313EE98B30094E3FE /* zverse.cpp */; }; + A954AC6613EEA0C10094E3FE /* cipherfil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85513EE98B30094E3FE /* cipherfil.cpp */; }; + A954AC6713EEA0C10094E3FE /* gbffootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85613EE98B30094E3FE /* gbffootnotes.cpp */; }; + A954AC6813EEA0C10094E3FE /* gbfheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85713EE98B30094E3FE /* gbfheadings.cpp */; }; + A954AC6913EEA0C10094E3FE /* gbfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85813EE98B30094E3FE /* gbfhtml.cpp */; }; + A954AC6A13EEA0C10094E3FE /* gbfhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85913EE98B30094E3FE /* gbfhtmlhref.cpp */; }; + A954AC6B13EEA0C10094E3FE /* gbfmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85A13EE98B30094E3FE /* gbfmorph.cpp */; }; + A954AC6C13EEA0C10094E3FE /* gbfosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85B13EE98B30094E3FE /* gbfosis.cpp */; }; + A954AC6D13EEA0C10094E3FE /* gbfplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85C13EE98B30094E3FE /* gbfplain.cpp */; }; + A954AC6E13EEA0C10094E3FE /* gbfredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85D13EE98B30094E3FE /* gbfredletterwords.cpp */; }; + A954AC6F13EEA0C10094E3FE /* gbfrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85E13EE98B30094E3FE /* gbfrtf.cpp */; }; + A954AC7013EEA0C10094E3FE /* gbfstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85F13EE98B30094E3FE /* gbfstrongs.cpp */; }; + A954AC7113EEA0C10094E3FE /* gbfthml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86013EE98B30094E3FE /* gbfthml.cpp */; }; + A954AC7213EEA0C10094E3FE /* gbfwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86113EE98B30094E3FE /* gbfwebif.cpp */; }; + A954AC7313EEA0C10094E3FE /* gbfwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86213EE98B30094E3FE /* gbfwordjs.cpp */; }; + A954AC7413EEA0C10094E3FE /* gbfxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86313EE98B30094E3FE /* gbfxhtml.cpp */; }; + A954AC7513EEA0C10094E3FE /* greeklexattribs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86413EE98B30094E3FE /* greeklexattribs.cpp */; }; + A954AC7613EEA0C10094E3FE /* latin1utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86513EE98B30094E3FE /* latin1utf16.cpp */; }; + A954AC7713EEA0C10094E3FE /* latin1utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86613EE98B30094E3FE /* latin1utf8.cpp */; }; + A954AC7813EEA0C10094E3FE /* osisfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86913EE98B30094E3FE /* osisfootnotes.cpp */; }; + A954AC7913EEA0C10094E3FE /* osisheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86A13EE98B30094E3FE /* osisheadings.cpp */; }; + A954AC7A13EEA0C10094E3FE /* osishtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86B13EE98B30094E3FE /* osishtmlhref.cpp */; }; + A954AC7B13EEA0C10094E3FE /* osislemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86C13EE98B30094E3FE /* osislemma.cpp */; }; + A954AC7C13EEA0C10094E3FE /* osismorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86D13EE98B30094E3FE /* osismorph.cpp */; }; + A954AC7D13EEA0C10094E3FE /* osismorphsegmentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86E13EE98B30094E3FE /* osismorphsegmentation.cpp */; }; + A954AC7E13EEA0C10094E3FE /* osisosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86F13EE98B30094E3FE /* osisosis.cpp */; }; + A954AC7F13EEA0C10094E3FE /* osisplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87013EE98B30094E3FE /* osisplain.cpp */; }; + A954AC8013EEA0C10094E3FE /* osisredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87113EE98B30094E3FE /* osisredletterwords.cpp */; }; + A954AC8113EEA0C10094E3FE /* osisrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87213EE98B30094E3FE /* osisrtf.cpp */; }; + A954AC8313EEA0C10094E3FE /* osisscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87413EE98B30094E3FE /* osisscripref.cpp */; }; + A954AC8413EEA0C10094E3FE /* osisstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87513EE98B30094E3FE /* osisstrongs.cpp */; }; + A954AC8513EEA0C10094E3FE /* osisvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87613EE98B30094E3FE /* osisvariants.cpp */; }; + A954AC8613EEA0C10094E3FE /* osiswebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87713EE98B30094E3FE /* osiswebif.cpp */; }; + A954AC8713EEA0C10094E3FE /* osiswordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87813EE98B30094E3FE /* osiswordjs.cpp */; }; + A954AC8813EEA0C10094E3FE /* osisxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87913EE98B30094E3FE /* osisxhtml.cpp */; }; + A954AC8913EEA0C10094E3FE /* papyriplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87A13EE98B30094E3FE /* papyriplain.cpp */; }; + A954AC8C13EEA0C10094E3FE /* rtfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87D13EE98B30094E3FE /* rtfhtml.cpp */; }; + A954AC8D13EEA0C10094E3FE /* swbasicfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87E13EE98B30094E3FE /* swbasicfilter.cpp */; }; + A954AC8E13EEA0C10094E3FE /* swoptfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87F13EE98B30094E3FE /* swoptfilter.cpp */; }; + A954AC8F13EEA0C10094E3FE /* teihtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88013EE98B30094E3FE /* teihtmlhref.cpp */; }; + A954AC9013EEA0C10094E3FE /* teiplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88113EE98B30094E3FE /* teiplain.cpp */; }; + A954AC9113EEA0C10094E3FE /* teirtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88213EE98B30094E3FE /* teirtf.cpp */; }; + A954AC9213EEA0C10094E3FE /* thmlfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88313EE98B30094E3FE /* thmlfootnotes.cpp */; }; + A954AC9313EEA0C10094E3FE /* thmlgbf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88413EE98B30094E3FE /* thmlgbf.cpp */; }; + A954AC9413EEA0C10094E3FE /* thmlheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88513EE98B30094E3FE /* thmlheadings.cpp */; }; + A954AC9513EEA0C10094E3FE /* thmlhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88613EE98B30094E3FE /* thmlhtml.cpp */; }; + A954AC9613EEA0C10094E3FE /* thmlhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88713EE98B30094E3FE /* thmlhtmlhref.cpp */; }; + A954AC9713EEA0C10094E3FE /* thmllemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88813EE98B30094E3FE /* thmllemma.cpp */; }; + A954AC9813EEA0C10094E3FE /* thmlmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88913EE98B30094E3FE /* thmlmorph.cpp */; }; + A954AC9913EEA0C10094E3FE /* thmlosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88A13EE98B30094E3FE /* thmlosis.cpp */; }; + A954AC9A13EEA0C10094E3FE /* thmlplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88B13EE98B30094E3FE /* thmlplain.cpp */; }; + A954AC9B13EEA0C10094E3FE /* thmlrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88C13EE98B30094E3FE /* thmlrtf.cpp */; }; + A954AC9C13EEA0C10094E3FE /* thmlscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88D13EE98B30094E3FE /* thmlscripref.cpp */; }; + A954AC9D13EEA0C10094E3FE /* thmlstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88E13EE98B30094E3FE /* thmlstrongs.cpp */; }; + A954AC9E13EEA0C10094E3FE /* thmlvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88F13EE98B30094E3FE /* thmlvariants.cpp */; }; + A954AC9F13EEA0C10094E3FE /* thmlwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89013EE98B30094E3FE /* thmlwebif.cpp */; }; + A954ACA013EEA0C10094E3FE /* thmlwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89113EE98B30094E3FE /* thmlwordjs.cpp */; }; + A954ACA113EEA0C10094E3FE /* thmlxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89213EE98B30094E3FE /* thmlxhtml.cpp */; }; + A954ACA213EEA0C10094E3FE /* unicodertf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89313EE98B30094E3FE /* unicodertf.cpp */; }; + A954ACA313EEA0C10094E3FE /* utf16utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89413EE98B30094E3FE /* utf16utf8.cpp */; }; + A954ACA413EEA0C10094E3FE /* utf8arabicpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89513EE98B30094E3FE /* utf8arabicpoints.cpp */; }; + A954ACA513EEA0C10094E3FE /* utf8arshaping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89613EE98B30094E3FE /* utf8arshaping.cpp */; }; + A954ACA613EEA0C10094E3FE /* utf8bidireorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89713EE98B30094E3FE /* utf8bidireorder.cpp */; }; + A954ACA713EEA0C10094E3FE /* utf8cantillation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89813EE98B30094E3FE /* utf8cantillation.cpp */; }; + A954ACA813EEA0C10094E3FE /* utf8greekaccents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89913EE98B30094E3FE /* utf8greekaccents.cpp */; }; + A954ACA913EEA0C10094E3FE /* utf8hebrewpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89A13EE98B30094E3FE /* utf8hebrewpoints.cpp */; }; + A954ACAA13EEA0C10094E3FE /* utf8html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89B13EE98B30094E3FE /* utf8html.cpp */; }; + A954ACAB13EEA0C10094E3FE /* utf8latin1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89C13EE98B30094E3FE /* utf8latin1.cpp */; }; + A954ACAC13EEA0C10094E3FE /* utf8nfc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89D13EE98B30094E3FE /* utf8nfc.cpp */; }; + A954ACAD13EEA0C10094E3FE /* utf8nfkd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89E13EE98B30094E3FE /* utf8nfkd.cpp */; }; + A954ACAE13EEA0C10094E3FE /* utf8transliterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89F13EE98B30094E3FE /* utf8transliterator.cpp */; }; + A954ACAF13EEA0C10094E3FE /* utf8utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A013EE98B30094E3FE /* utf8utf16.cpp */; }; + A954ACB013EEA0C10094E3FE /* rawgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A713EE98B30094E3FE /* rawgenbook.cpp */; }; + A954ACB113EEA0C10094E3FE /* swgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A813EE98B30094E3FE /* swgenbook.cpp */; }; + A954ACB213EEA0C10094E3FE /* rawld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8AF13EE98B30094E3FE /* rawld.cpp */; }; + A954ACB313EEA0C10094E3FE /* rawld4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B313EE98B30094E3FE /* rawld4.cpp */; }; + A954ACB413EEA0C10094E3FE /* swld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B413EE98B30094E3FE /* swld.cpp */; }; + A954ACB513EEA0C10094E3FE /* zld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B813EE98B30094E3FE /* zld.cpp */; }; + A954ACB613EEA0C10094E3FE /* swmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8BC13EE98B30094E3FE /* swmodule.cpp */; }; + A954ACB713EEA0C10094E3FE /* rawtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8C613EE98B30094E3FE /* rawtext.cpp */; }; + A954ACB813EEA0C10094E3FE /* rawtext4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8C913EE98B30094E3FE /* rawtext4.cpp */; }; + A954ACB913EEA0C10094E3FE /* swtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8CA13EE98B30094E3FE /* swtext.cpp */; }; + A954ACBA13EEA0C10094E3FE /* ztext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8CE13EE98B30094E3FE /* ztext.cpp */; }; + A954ACBB13EEA0C10094E3FE /* roman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D513EE98B30094E3FE /* roman.cpp */; }; + A954ACBC13EEA0C10094E3FE /* swbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D613EE98B30094E3FE /* swbuf.cpp */; }; + A954ACBD13EEA0C10094E3FE /* swobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D713EE98B30094E3FE /* swobject.cpp */; }; + A954ACBF13EEA0C10094E3FE /* swversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D913EE98B30094E3FE /* swversion.cpp */; }; + A954ACC013EEA0C10094E3FE /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DA13EE98B30094E3FE /* url.cpp */; }; + A954ACC113EEA0C10094E3FE /* utilstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DB13EE98B30094E3FE /* utilstr.cpp */; }; + A954ACC213EEA0C10094E3FE /* utilxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DC13EE98B30094E3FE /* utilxml.cpp */; }; + A954ACCA13EEA5340094E3FE /* ftplib.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D013EE98B30094E3FE /* ftplib.c */; }; + A954ACCB13EEA5340094E3FE /* ftpparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D113EE98B30094E3FE /* ftpparse.c */; }; + A954ACCD13EEA5340094E3FE /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E113EE98B30094E3FE /* adler32.c */; }; + A954ACCE13EEA5340094E3FE /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E213EE98B30094E3FE /* compress.c */; }; + A954ACCF13EEA5340094E3FE /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E313EE98B30094E3FE /* crc32.c */; }; + A954ACD013EEA5340094E3FE /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E413EE98B30094E3FE /* deflate.c */; }; + A954ACD413EEA5340094E3FE /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8EB13EE98B30094E3FE /* inffast.c */; }; + A954ACD513EEA5340094E3FE /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8EE13EE98B30094E3FE /* inflate.c */; }; + A954ACD613EEA5340094E3FE /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8EF13EE98B30094E3FE /* inftrees.c */; }; + A954ACD913EEA5340094E3FE /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F413EE98B30094E3FE /* trees.c */; }; + A954ACDA13EEA5340094E3FE /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F613EE98B30094E3FE /* uncompr.c */; }; + A954ACDB13EEA5340094E3FE /* untgz.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F713EE98B30094E3FE /* untgz.c */; }; + A954ACDC13EEA5340094E3FE /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F813EE98B30094E3FE /* zutil.c */; }; + A954ACDD13EEA6780094E3FE /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; + A967FB5616806B16004ED73C /* teixhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */; }; + A96C2359176AFA3C008D714B /* remotetrans.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2351176AF188008D714B /* remotetrans.cpp */; }; + A96C235A176AFA3C008D714B /* osisenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2353176AF19C008D714B /* osisenum.cpp */; }; + A96C235B176AFA3C008D714B /* osisglosses.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2354176AF19C008D714B /* osisglosses.cpp */; }; + A96C235C176AFA3C008D714B /* osisxlit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2355176AF19C008D714B /* osisxlit.cpp */; }; + A96C235C176AFA3C008D714B /* osisreferencelinks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2355176AF19C008D714B /* osisreferencelinks.cpp */; }; + A96C235D176AFA3C008D714B /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C233E176AF139008D714B /* gzclose.c */; }; + A96C235E176AFA3C008D714B /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2340176AF139008D714B /* gzlib.c */; }; + A96C235F176AFA3C008D714B /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2341176AF139008D714B /* gzread.c */; }; + A96C2360176AFA3C008D714B /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2342176AF139008D714B /* gzwrite.c */; }; + A96C2361176AFA3C008D714B /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2343176AF139008D714B /* infback.c */; }; A975EAC511C77862007C1532 /* ObjCSword.h in Headers */ = {isa = PBXBuildFile; fileRef = A975EAC411C77862007C1532 /* ObjCSword.h */; settings = {ATTRIBUTES = (Public, ); }; }; A975EEE511C79308007C1532 /* mod2osis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAC11C7925C007C1532 /* mod2osis.cpp */; }; - A9921A1A11FD9CA8002DAA72 /* libSword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A9921A1911FD9CA8002DAA72 /* libSword.dylib */; }; + A999FF3F17951CCE00E65919 /* bz2comprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A999FF3917951C8900E65919 /* bz2comprs.cpp */; }; + A999FF4017951CCE00E65919 /* xzcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A999FF3A17951C8900E65919 /* xzcomprs.cpp */; }; + A999FF4117951CCE00E65919 /* scsuutf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A999FF3D17951CA000E65919 /* scsuutf8.cpp */; }; A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A2C17C118D9D3D0002873D /* Notifications.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A9A7EEAF14D5D4C300B76B6A /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; + A9A7EEBE14D5D64C00B76B6A /* osis2mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDB111C7925C007C1532 /* osis2mod.cpp */; }; + A9A7EEBF14D5D65900B76B6A /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */; }; A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; }; A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A964658011C663E200640FAC /* SwordManagerTest.h */; }; A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A918B8E211C6697400024D84 /* SwordModuleTest.h */; }; - A9BDFA781207F9F00067ED5B /* SwordListKeyTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */; }; - A9BDFA791207F9F00067ED5B /* SwordListKeyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */; }; A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */; }; A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */; }; - A9BDFA861207FC8C0067ED5B /* ImageModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA841207FC8C0067ED5B /* ImageModuleTest.h */; }; - A9BDFA871207FC8C0067ED5B /* ImageModuleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA851207FC8C0067ED5B /* ImageModuleTest.m */; }; + A9BFB0A513EDF51100032679 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BFB0A413EDF51000032679 /* SenTestingKit.framework */; }; + A9BFB0A713EDF51100032679 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BFB0A613EDF51100032679 /* Cocoa.framework */; }; + A9BFB0BC13EDF5C900032679 /* SwordManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A964658111C663E200640FAC /* SwordManagerTest.m */; }; + A9BFB0BD13EDF5C900032679 /* SwordModuleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A918B8E311C6697400024D84 /* SwordModuleTest.m */; }; + A9BFB0BE13EDF5C900032679 /* SwordListKeyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */; }; + A9BFB0BF13EDF5D500032679 /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; }; A9C2856F11C446B700803CB5 /* Configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2856D11C446B700803CB5 /* Configuration.h */; settings = {ATTRIBUTES = (Public, ); }; }; A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2857111C4471400803CB5 /* OSXConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; A9C2857411C4471400803CB5 /* OSXConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2857211C4471400803CB5 /* OSXConfiguration.m */; }; A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2858211C44A0A00803CB5 /* Configuration.m */; }; + A9D2714A14D717D800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; + A9D2715014D717F600DA8926 /* imp2gbs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9811C7925C007C1532 /* imp2gbs.cpp */; }; + A9D2715714D717FD00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; + A9D2715D14D7180F00DA8926 /* imp2ld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9911C7925C007C1532 /* imp2ld.cpp */; }; + A9D2716414D7181200DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; + A9D2716A14D7182100DA8926 /* imp2vs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9A11C7925C007C1532 /* imp2vs.cpp */; }; + A9D2717114D7182300DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; + A9D2717714D7183700DA8926 /* installmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9B11C7925C007C1532 /* installmgr.cpp */; }; + A9D2717E14D7183B00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; + A9D2718414D7184E00DA8926 /* mod2imp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAB11C7925C007C1532 /* mod2imp.cpp */; }; + A9D2718B14D7185800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; + A9D2719114D7186800DA8926 /* mod2vpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAD11C7925C007C1532 /* mod2vpl.cpp */; }; + A9D2719814D7186A00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; + A9D2719E14D7187A00DA8926 /* mod2zmod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAE11C7925C007C1532 /* mod2zmod.cpp */; }; + A9D271A514D7187E00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; + A9D271AB14D7189100DA8926 /* step2vpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDB811C7925C007C1532 /* step2vpl.cpp */; }; + A9D271B214D7189300DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; + A9D271B814D718A300DA8926 /* stepdump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDB911C7925C007C1532 /* stepdump.cpp */; }; + A9D271BF14D718A400DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; + A9D271C514D718B700DA8926 /* tei2mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDBB11C7925C007C1532 /* tei2mod.cpp */; }; + A9D271CC14D718B800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; + A9D271D214D718C600DA8926 /* vpl2mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDD811C7925C007C1532 /* vpl2mod.cpp */; }; + A9D271D914D718C800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; + A9D271DF14D718DE00DA8926 /* vs2osisref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDD911C7925C007C1532 /* vs2osisref.cpp */; }; + A9D271E614D718DF00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; + A9D271EC14D718F400DA8926 /* vs2osisreftxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */; }; + A9D271F314D718F500DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; + A9D271F914D7190400DA8926 /* xml2gbs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDDB11C7925C007C1532 /* xml2gbs.cpp */; }; A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */; settings = {ATTRIBUTES = (Public, ); }; }; A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */; }; A9D4382311C52947007AFE83 /* locales.d in Resources */ = {isa = PBXBuildFile; fileRef = A9D437CE11C52947007AFE83 /* locales.d */; }; - A9EF13B31205952C0078A27C /* libSword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A9EF13B21205952C0078A27C /* libSword.dylib */; }; + A9D9FA0B13EEE5CF00EA9DEB /* libsword.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; }; A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A9EF1414120595650078A27C /* SwordLocaleManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9EF1415120595650078A27C /* SwordLocaleManager.mm */; }; - A9EF1418120595650078A27C /* SwordLocaleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A9EF1414120595650078A27C /* SwordLocaleManager.h */; }; - A9EF1419120595650078A27C /* SwordLocaleManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9EF1415120595650078A27C /* SwordLocaleManager.mm */; }; - A9FB273711FD95CD004C4295 /* AnalysisHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB264511FD95CD004C4295 /* AnalysisHeader.cpp */; }; - A9FB273911FD95CD004C4295 /* Analyzers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB264711FD95CD004C4295 /* Analyzers.cpp */; }; - A9FB273B11FD95CD004C4295 /* StandardAnalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB264A11FD95CD004C4295 /* StandardAnalyzer.cpp */; }; - A9FB273D11FD95CD004C4295 /* StandardFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB264C11FD95CD004C4295 /* StandardFilter.cpp */; }; - A9FB273F11FD95CD004C4295 /* StandardTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB264E11FD95CD004C4295 /* StandardTokenizer.cpp */; }; - A9FB274A11FD95CD004C4295 /* gunichartables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB265A11FD95CD004C4295 /* gunichartables.cpp */; }; - A9FB274F11FD95CD004C4295 /* repl_lltot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB265F11FD95CD004C4295 /* repl_lltot.cpp */; }; - A9FB275111FD95CD004C4295 /* repl_tcscasecmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB266111FD95CD004C4295 /* repl_tcscasecmp.cpp */; }; - A9FB275211FD95CD004C4295 /* repl_tcslwr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB266211FD95CD004C4295 /* repl_tcslwr.cpp */; }; - A9FB275311FD95CD004C4295 /* repl_tcstod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB266311FD95CD004C4295 /* repl_tcstod.cpp */; }; - A9FB275411FD95CD004C4295 /* repl_tcstoll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB266411FD95CD004C4295 /* repl_tcstoll.cpp */; }; - A9FB275511FD95CD004C4295 /* repl_tprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB266511FD95CD004C4295 /* repl_tprintf.cpp */; }; - A9FB275911FD95CD004C4295 /* threads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB266911FD95CD004C4295 /* threads.cpp */; }; - A9FB275A11FD95CD004C4295 /* utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB266A11FD95CD004C4295 /* utf8.cpp */; }; - A9FB275B11FD95CD004C4295 /* condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB266C11FD95CD004C4295 /* condition.cpp */; }; - A9FB275D11FD95CD004C4295 /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB266E11FD95CD004C4295 /* error.cpp */; }; - A9FB276111FD95CD004C4295 /* memtracking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB267211FD95CD004C4295 /* memtracking.cpp */; }; - A9FB276211FD95CD004C4295 /* DateField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB267411FD95CD004C4295 /* DateField.cpp */; }; - A9FB276411FD95CD004C4295 /* Document.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB267611FD95CD004C4295 /* Document.cpp */; }; - A9FB276611FD95CD004C4295 /* Field.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB267811FD95CD004C4295 /* Field.cpp */; }; - A9FB276811FD95CD004C4295 /* CompoundFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB267B11FD95CD004C4295 /* CompoundFile.cpp */; }; - A9FB276A11FD95CD004C4295 /* DocumentWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB267D11FD95CD004C4295 /* DocumentWriter.cpp */; }; - A9FB276D11FD95CD004C4295 /* FieldInfos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB268011FD95CD004C4295 /* FieldInfos.cpp */; }; - A9FB276F11FD95CD004C4295 /* FieldsReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB268211FD95CD004C4295 /* FieldsReader.cpp */; }; - A9FB277111FD95CD004C4295 /* FieldsWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB268411FD95CD004C4295 /* FieldsWriter.cpp */; }; - A9FB277311FD95CD004C4295 /* IndexModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB268611FD95CD004C4295 /* IndexModifier.cpp */; }; - A9FB277511FD95CD004C4295 /* IndexReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB268811FD95CD004C4295 /* IndexReader.cpp */; }; - A9FB277711FD95CD004C4295 /* IndexWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB268A11FD95CD004C4295 /* IndexWriter.cpp */; }; - A9FB277911FD95CD004C4295 /* MultiReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB268C11FD95CD004C4295 /* MultiReader.cpp */; }; - A9FB277C11FD95CD004C4295 /* SegmentInfos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB268F11FD95CD004C4295 /* SegmentInfos.cpp */; }; - A9FB277E11FD95CD004C4295 /* SegmentMergeInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB269111FD95CD004C4295 /* SegmentMergeInfo.cpp */; }; - A9FB278011FD95CD004C4295 /* SegmentMergeQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB269311FD95CD004C4295 /* SegmentMergeQueue.cpp */; }; - A9FB278211FD95CD004C4295 /* SegmentMerger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB269511FD95CD004C4295 /* SegmentMerger.cpp */; }; - A9FB278411FD95CD004C4295 /* SegmentReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB269711FD95CD004C4295 /* SegmentReader.cpp */; }; - A9FB278511FD95CD004C4295 /* SegmentTermDocs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB269811FD95CD004C4295 /* SegmentTermDocs.cpp */; }; - A9FB278611FD95CD004C4295 /* SegmentTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB269911FD95CD004C4295 /* SegmentTermEnum.cpp */; }; - A9FB278811FD95CD004C4295 /* SegmentTermPositions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB269B11FD95CD004C4295 /* SegmentTermPositions.cpp */; }; - A9FB278911FD95CD004C4295 /* SegmentTermVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB269C11FD95CD004C4295 /* SegmentTermVector.cpp */; }; - A9FB278A11FD95CD004C4295 /* Term.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB269D11FD95CD004C4295 /* Term.cpp */; }; - A9FB278C11FD95CD004C4295 /* TermInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB269F11FD95CD004C4295 /* TermInfo.cpp */; }; - A9FB278E11FD95CD004C4295 /* TermInfosReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26A111FD95CD004C4295 /* TermInfosReader.cpp */; }; - A9FB279011FD95CD004C4295 /* TermInfosWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26A311FD95CD004C4295 /* TermInfosWriter.cpp */; }; - A9FB279411FD95CD004C4295 /* TermVectorReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26A711FD95CD004C4295 /* TermVectorReader.cpp */; }; - A9FB279511FD95CD004C4295 /* TermVectorWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26A811FD95CD004C4295 /* TermVectorWriter.cpp */; }; - A9FB279711FD95CD004C4295 /* Lexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26AB11FD95CD004C4295 /* Lexer.cpp */; }; - A9FB279911FD95CD004C4295 /* MultiFieldQueryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26AD11FD95CD004C4295 /* MultiFieldQueryParser.cpp */; }; - A9FB279B11FD95CD004C4295 /* QueryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26AF11FD95CD004C4295 /* QueryParser.cpp */; }; - A9FB279D11FD95CD004C4295 /* QueryParserBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26B111FD95CD004C4295 /* QueryParserBase.cpp */; }; - A9FB279F11FD95CD004C4295 /* QueryToken.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26B311FD95CD004C4295 /* QueryToken.cpp */; }; - A9FB27A111FD95CD004C4295 /* TokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26B511FD95CD004C4295 /* TokenList.cpp */; }; - A9FB27A411FD95CD004C4295 /* BooleanQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26B911FD95CD004C4295 /* BooleanQuery.cpp */; }; - A9FB27A611FD95CD004C4295 /* BooleanScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26BB11FD95CD004C4295 /* BooleanScorer.cpp */; }; - A9FB27A811FD95CD004C4295 /* CachingWrapperFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26BD11FD95CD004C4295 /* CachingWrapperFilter.cpp */; }; - A9FB27AA11FD95CD004C4295 /* ChainedFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26BF11FD95CD004C4295 /* ChainedFilter.cpp */; }; - A9FB27AD11FD95CD004C4295 /* ConjunctionScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26C211FD95CD004C4295 /* ConjunctionScorer.cpp */; }; - A9FB27AF11FD95CD004C4295 /* DateFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26C411FD95CD004C4295 /* DateFilter.cpp */; }; - A9FB27B111FD95CD004C4295 /* ExactPhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26C611FD95CD004C4295 /* ExactPhraseScorer.cpp */; }; - A9FB27B311FD95CD004C4295 /* Explanation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26C811FD95CD004C4295 /* Explanation.cpp */; }; - A9FB27B511FD95CD004C4295 /* FieldCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26CA11FD95CD004C4295 /* FieldCache.cpp */; }; - A9FB27B711FD95CD004C4295 /* FieldCacheImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26CC11FD95CD004C4295 /* FieldCacheImpl.cpp */; }; - A9FB27BA11FD95CD004C4295 /* FieldDocSortedHitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26CF11FD95CD004C4295 /* FieldDocSortedHitQueue.cpp */; }; - A9FB27BC11FD95CD004C4295 /* FieldSortedHitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26D111FD95CD004C4295 /* FieldSortedHitQueue.cpp */; }; - A9FB27BF11FD95CD004C4295 /* FilteredTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26D411FD95CD004C4295 /* FilteredTermEnum.cpp */; }; - A9FB27C111FD95CD004C4295 /* FuzzyQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26D611FD95CD004C4295 /* FuzzyQuery.cpp */; }; - A9FB27C311FD95CD004C4295 /* HitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26D811FD95CD004C4295 /* HitQueue.cpp */; }; - A9FB27C511FD95CD004C4295 /* Hits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26DA11FD95CD004C4295 /* Hits.cpp */; }; - A9FB27C611FD95CD004C4295 /* IndexSearcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26DB11FD95CD004C4295 /* IndexSearcher.cpp */; }; - A9FB27C811FD95CD004C4295 /* MultiSearcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26DD11FD95CD004C4295 /* MultiSearcher.cpp */; }; - A9FB27CA11FD95CD004C4295 /* MultiTermQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26DF11FD95CD004C4295 /* MultiTermQuery.cpp */; }; - A9FB27CC11FD95CD004C4295 /* PhrasePositions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26E111FD95CD004C4295 /* PhrasePositions.cpp */; }; - A9FB27CE11FD95CD004C4295 /* PhraseQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26E311FD95CD004C4295 /* PhraseQuery.cpp */; }; - A9FB27D111FD95CD004C4295 /* PhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26E611FD95CD004C4295 /* PhraseScorer.cpp */; }; - A9FB27D311FD95CD004C4295 /* PrefixQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26E811FD95CD004C4295 /* PrefixQuery.cpp */; }; - A9FB27D511FD95CD004C4295 /* QueryFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26EA11FD95CD004C4295 /* QueryFilter.cpp */; }; - A9FB27D711FD95CD004C4295 /* RangeFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26EC11FD95CD004C4295 /* RangeFilter.cpp */; }; - A9FB27D911FD95CD004C4295 /* RangeQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26EE11FD95CD004C4295 /* RangeQuery.cpp */; }; - A9FB27DC11FD95CD004C4295 /* SearchHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26F111FD95CD004C4295 /* SearchHeader.cpp */; }; - A9FB27DE11FD95CD004C4295 /* Similarity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26F311FD95CD004C4295 /* Similarity.cpp */; }; - A9FB27E011FD95CD004C4295 /* SloppyPhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26F511FD95CD004C4295 /* SloppyPhraseScorer.cpp */; }; - A9FB27E211FD95CD004C4295 /* Sort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26F711FD95CD004C4295 /* Sort.cpp */; }; - A9FB27E411FD95CD004C4295 /* TermQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26F911FD95CD004C4295 /* TermQuery.cpp */; }; - A9FB27E611FD95CD004C4295 /* TermScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26FB11FD95CD004C4295 /* TermScorer.cpp */; }; - A9FB27E811FD95CD004C4295 /* WildcardQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26FD11FD95CD004C4295 /* WildcardQuery.cpp */; }; - A9FB27EA11FD95CD004C4295 /* WildcardTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB26FF11FD95CD004C4295 /* WildcardTermEnum.cpp */; }; - A9FB27EC11FD95CD004C4295 /* StdHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB270111FD95CD004C4295 /* StdHeader.cpp */; }; - A9FB27EF11FD95CD004C4295 /* FSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB270511FD95CD004C4295 /* FSDirectory.cpp */; }; - A9FB27F111FD95CD004C4295 /* IndexInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB270711FD95CD004C4295 /* IndexInput.cpp */; }; - A9FB27F311FD95CD004C4295 /* IndexOutput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB270911FD95CD004C4295 /* IndexOutput.cpp */; }; - A9FB27F611FD95CD004C4295 /* Lock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB270C11FD95CD004C4295 /* Lock.cpp */; }; - A9FB27F811FD95CD004C4295 /* MMapInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB270E11FD95CD004C4295 /* MMapInput.cpp */; }; - A9FB27FA11FD95CD004C4295 /* RAMDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB271011FD95CD004C4295 /* RAMDirectory.cpp */; }; - A9FB27FC11FD95CD004C4295 /* TransactionalRAMDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB271211FD95CD004C4295 /* TransactionalRAMDirectory.cpp */; }; - A9FB27FF11FD95CD004C4295 /* BitSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB271611FD95CD004C4295 /* BitSet.cpp */; }; - A9FB280211FD95CD004C4295 /* dirent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB271911FD95CD004C4295 /* dirent.cpp */; }; - A9FB280411FD95CD004C4295 /* Equators.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB271B11FD95CD004C4295 /* Equators.cpp */; }; - A9FB280611FD95CD004C4295 /* FastCharStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB271D11FD95CD004C4295 /* FastCharStream.cpp */; }; - A9FB280811FD95CD004C4295 /* fileinputstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB271F11FD95CD004C4295 /* fileinputstream.cpp */; }; - A9FB280D11FD95CD004C4295 /* MD5Digester.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB272411FD95CD004C4295 /* MD5Digester.cpp */; }; - A9FB280F11FD95CD004C4295 /* Misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB272611FD95CD004C4295 /* Misc.cpp */; }; - A9FB281211FD95CD004C4295 /* Reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB272911FD95CD004C4295 /* Reader.cpp */; }; - A9FB281511FD95CD004C4295 /* StringBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB272C11FD95CD004C4295 /* StringBuffer.cpp */; }; - A9FB281711FD95CD004C4295 /* StringIntern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB272E11FD95CD004C4295 /* StringIntern.cpp */; }; - A9FB281B11FD95CD004C4295 /* ThreadLocal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB273211FD95CD004C4295 /* ThreadLocal.cpp */; }; - A9FB28ED11FD95E4004C4295 /* femain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB282311FD95E4004C4295 /* femain.cpp */; }; - A9FB28EE11FD95E4004C4295 /* hebrewmcim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB282511FD95E4004C4295 /* hebrewmcim.cpp */; }; - A9FB28EF11FD95E4004C4295 /* nullim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB282611FD95E4004C4295 /* nullim.cpp */; }; - A9FB28F011FD95E4004C4295 /* swinputmeth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB282711FD95E4004C4295 /* swinputmeth.cpp */; }; - A9FB28F111FD95E4004C4295 /* swdisp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB282811FD95E4004C4295 /* swdisp.cpp */; }; - A9FB28F211FD95E4004C4295 /* swlog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB282911FD95E4004C4295 /* swlog.cpp */; }; - A9FB28F311FD95E4004C4295 /* genarray.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB282D11FD95E4004C4295 /* genarray.c */; }; - A9FB28F411FD95E4004C4295 /* listkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB282E11FD95E4004C4295 /* listkey.cpp */; }; - A9FB28F511FD95E4004C4295 /* strkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283311FD95E4004C4295 /* strkey.cpp */; }; - A9FB28F611FD95E4004C4295 /* swkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283411FD95E4004C4295 /* swkey.cpp */; }; - A9FB28F711FD95E4004C4295 /* treekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283511FD95E4004C4295 /* treekey.cpp */; }; - A9FB28F811FD95E4004C4295 /* treekeyidx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283611FD95E4004C4295 /* treekeyidx.cpp */; }; - A9FB28F911FD95E4004C4295 /* versekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283711FD95E4004C4295 /* versekey.cpp */; }; - A9FB28FA11FD95E4004C4295 /* versetreekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283811FD95E4004C4295 /* versetreekey.cpp */; }; - A9FB28FB11FD95E4004C4295 /* curlftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283A11FD95E4004C4295 /* curlftpt.cpp */; }; - A9FB28FC11FD95E4004C4295 /* curlhttpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283B11FD95E4004C4295 /* curlhttpt.cpp */; }; - A9FB28FD11FD95E4004C4295 /* encfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283C11FD95E4004C4295 /* encfiltmgr.cpp */; }; - A9FB28FE11FD95E4004C4295 /* filemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283D11FD95E4004C4295 /* filemgr.cpp */; }; - A9FB28FF11FD95E4004C4295 /* ftplibftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283E11FD95E4004C4295 /* ftplibftpt.cpp */; }; - A9FB290011FD95E4004C4295 /* ftptrans.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB283F11FD95E4004C4295 /* ftptrans.cpp */; }; - A9FB290111FD95E4004C4295 /* installmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284011FD95E4004C4295 /* installmgr.cpp */; }; - A9FB290211FD95E4004C4295 /* localemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284111FD95E4004C4295 /* localemgr.cpp */; }; - A9FB290311FD95E4004C4295 /* markupfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284211FD95E4004C4295 /* markupfiltmgr.cpp */; }; - A9FB290411FD95E4004C4295 /* stringmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284311FD95E4004C4295 /* stringmgr.cpp */; }; - A9FB290511FD95E4004C4295 /* swcacher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284411FD95E4004C4295 /* swcacher.cpp */; }; - A9FB290611FD95E4004C4295 /* swconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284511FD95E4004C4295 /* swconfig.cpp */; }; - A9FB290711FD95E4004C4295 /* swfiltermgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284611FD95E4004C4295 /* swfiltermgr.cpp */; }; - A9FB290811FD95E4004C4295 /* swlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284711FD95E4004C4295 /* swlocale.cpp */; }; - A9FB290911FD95E4004C4295 /* swmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284811FD95E4004C4295 /* swmgr.cpp */; }; - A9FB290A11FD95E4004C4295 /* swsearchable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284911FD95E4004C4295 /* swsearchable.cpp */; }; - A9FB290B11FD95E4004C4295 /* versemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284A11FD95E4004C4295 /* versemgr.cpp */; }; - A9FB290C11FD95E4004C4295 /* hrefcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB284E11FD95E4004C4295 /* hrefcom.cpp */; }; - A9FB290D11FD95E4004C4295 /* rawcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285011FD95E4004C4295 /* rawcom.cpp */; }; - A9FB290E11FD95E4004C4295 /* rawcom4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285211FD95E4004C4295 /* rawcom4.cpp */; }; - A9FB290F11FD95E4004C4295 /* rawfiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285411FD95E4004C4295 /* rawfiles.cpp */; }; - A9FB291011FD95E4004C4295 /* swcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285511FD95E4004C4295 /* swcom.cpp */; }; - A9FB291111FD95E4004C4295 /* zcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285711FD95E4004C4295 /* zcom.cpp */; }; - A9FB291211FD95E4004C4295 /* entriesblk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285A11FD95E4004C4295 /* entriesblk.cpp */; }; - A9FB291311FD95E4004C4295 /* lzsscomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285B11FD95E4004C4295 /* lzsscomprs.cpp */; }; - A9FB291411FD95E4004C4295 /* rawstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285C11FD95E4004C4295 /* rawstr.cpp */; }; - A9FB291511FD95E4004C4295 /* rawstr4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285D11FD95E4004C4295 /* rawstr4.cpp */; }; - A9FB291611FD95E4004C4295 /* rawverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285E11FD95E4004C4295 /* rawverse.cpp */; }; - A9FB291711FD95E4004C4295 /* rawverse4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB285F11FD95E4004C4295 /* rawverse4.cpp */; }; - A9FB291811FD95E4004C4295 /* sapphire.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286011FD95E4004C4295 /* sapphire.cpp */; }; - A9FB291911FD95E4004C4295 /* swcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286111FD95E4004C4295 /* swcipher.cpp */; }; - A9FB291A11FD95E4004C4295 /* swcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286211FD95E4004C4295 /* swcomprs.cpp */; }; - A9FB291B11FD95E4004C4295 /* zipcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286411FD95E4004C4295 /* zipcomprs.cpp */; }; - A9FB291C11FD95E4004C4295 /* zstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286511FD95E4004C4295 /* zstr.cpp */; }; - A9FB291D11FD95E4004C4295 /* zverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286611FD95E4004C4295 /* zverse.cpp */; }; - A9FB291E11FD95E4004C4295 /* cipherfil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286811FD95E4004C4295 /* cipherfil.cpp */; }; - A9FB291F11FD95E4004C4295 /* gbffootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286911FD95E4004C4295 /* gbffootnotes.cpp */; }; - A9FB292011FD95E4004C4295 /* gbfheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286A11FD95E4004C4295 /* gbfheadings.cpp */; }; - A9FB292111FD95E4004C4295 /* gbfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286B11FD95E4004C4295 /* gbfhtml.cpp */; }; - A9FB292211FD95E4004C4295 /* gbfhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286C11FD95E4004C4295 /* gbfhtmlhref.cpp */; }; - A9FB292311FD95E4004C4295 /* gbfmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286D11FD95E4004C4295 /* gbfmorph.cpp */; }; - A9FB292411FD95E4004C4295 /* gbfosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286E11FD95E4004C4295 /* gbfosis.cpp */; }; - A9FB292511FD95E4004C4295 /* gbfplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB286F11FD95E4004C4295 /* gbfplain.cpp */; }; - A9FB292611FD95E4004C4295 /* gbfredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287011FD95E4004C4295 /* gbfredletterwords.cpp */; }; - A9FB292711FD95E4004C4295 /* gbfrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287111FD95E4004C4295 /* gbfrtf.cpp */; }; - A9FB292811FD95E4004C4295 /* gbfstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287211FD95E4004C4295 /* gbfstrongs.cpp */; }; - A9FB292911FD95E4004C4295 /* gbfthml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287311FD95E4004C4295 /* gbfthml.cpp */; }; - A9FB292A11FD95E4004C4295 /* gbfwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287411FD95E4004C4295 /* gbfwebif.cpp */; }; - A9FB292B11FD95E4004C4295 /* gbfwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287511FD95E4004C4295 /* gbfwordjs.cpp */; }; - A9FB292C11FD95E4004C4295 /* greeklexattribs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287611FD95E4004C4295 /* greeklexattribs.cpp */; }; - A9FB292D11FD95E4004C4295 /* latin1utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287711FD95E4004C4295 /* latin1utf16.cpp */; }; - A9FB292E11FD95E4004C4295 /* latin1utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287811FD95E4004C4295 /* latin1utf8.cpp */; }; - A9FB292F11FD95E4004C4295 /* osisfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287911FD95E4004C4295 /* osisfootnotes.cpp */; }; - A9FB293011FD95E4004C4295 /* osisheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287A11FD95E4004C4295 /* osisheadings.cpp */; }; - A9FB293111FD95E4004C4295 /* osishtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287B11FD95E4004C4295 /* osishtmlhref.cpp */; }; - A9FB293211FD95E4004C4295 /* osislemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287C11FD95E4004C4295 /* osislemma.cpp */; }; - A9FB293311FD95E4004C4295 /* osismorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287D11FD95E4004C4295 /* osismorph.cpp */; }; - A9FB293411FD95E4004C4295 /* osismorphsegmentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287E11FD95E4004C4295 /* osismorphsegmentation.cpp */; }; - A9FB293511FD95E4004C4295 /* osisosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB287F11FD95E4004C4295 /* osisosis.cpp */; }; - A9FB293611FD95E4004C4295 /* osisplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288011FD95E4004C4295 /* osisplain.cpp */; }; - A9FB293711FD95E4004C4295 /* osisredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288111FD95E4004C4295 /* osisredletterwords.cpp */; }; - A9FB293811FD95E4004C4295 /* osisrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288211FD95E4004C4295 /* osisrtf.cpp */; }; - A9FB293911FD95E4004C4295 /* osisruby.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288311FD95E4004C4295 /* osisruby.cpp */; }; - A9FB293A11FD95E4004C4295 /* osisscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288411FD95E4004C4295 /* osisscripref.cpp */; }; - A9FB293B11FD95E4004C4295 /* osisstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288511FD95E4004C4295 /* osisstrongs.cpp */; }; - A9FB293C11FD95E4004C4295 /* osisvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288611FD95E4004C4295 /* osisvariants.cpp */; }; - A9FB293D11FD95E4004C4295 /* osiswebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288711FD95E4004C4295 /* osiswebif.cpp */; }; - A9FB293E11FD95E4004C4295 /* osiswordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288811FD95E4004C4295 /* osiswordjs.cpp */; }; - A9FB293F11FD95E4004C4295 /* papyriplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288911FD95E4004C4295 /* papyriplain.cpp */; }; - A9FB294011FD95E4004C4295 /* plainfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288A11FD95E4004C4295 /* plainfootnotes.cpp */; }; - A9FB294111FD95E4004C4295 /* plainhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288B11FD95E4004C4295 /* plainhtml.cpp */; }; - A9FB294211FD95E4004C4295 /* rtfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288C11FD95E4004C4295 /* rtfhtml.cpp */; }; - A9FB294311FD95E4004C4295 /* swbasicfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288D11FD95E4004C4295 /* swbasicfilter.cpp */; }; - A9FB294411FD95E4004C4295 /* swoptfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288E11FD95E4004C4295 /* swoptfilter.cpp */; }; - A9FB294511FD95E4004C4295 /* teihtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB288F11FD95E4004C4295 /* teihtmlhref.cpp */; }; - A9FB294611FD95E4004C4295 /* teiplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289011FD95E4004C4295 /* teiplain.cpp */; }; - A9FB294711FD95E4004C4295 /* teirtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289111FD95E4004C4295 /* teirtf.cpp */; }; - A9FB294811FD95E4004C4295 /* thmlfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289211FD95E4004C4295 /* thmlfootnotes.cpp */; }; - A9FB294911FD95E4004C4295 /* thmlgbf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289311FD95E4004C4295 /* thmlgbf.cpp */; }; - A9FB294A11FD95E4004C4295 /* thmlheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289411FD95E4004C4295 /* thmlheadings.cpp */; }; - A9FB294B11FD95E4004C4295 /* thmlhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289511FD95E4004C4295 /* thmlhtml.cpp */; }; - A9FB294C11FD95E4004C4295 /* thmlhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289611FD95E4004C4295 /* thmlhtmlhref.cpp */; }; - A9FB294D11FD95E4004C4295 /* thmllemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289711FD95E4004C4295 /* thmllemma.cpp */; }; - A9FB294E11FD95E4004C4295 /* thmlmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289811FD95E4004C4295 /* thmlmorph.cpp */; }; - A9FB294F11FD95E4004C4295 /* thmlosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289911FD95E4004C4295 /* thmlosis.cpp */; }; - A9FB295011FD95E4004C4295 /* thmlplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289A11FD95E4004C4295 /* thmlplain.cpp */; }; - A9FB295111FD95E4004C4295 /* thmlrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289B11FD95E4004C4295 /* thmlrtf.cpp */; }; - A9FB295211FD95E4004C4295 /* thmlscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289C11FD95E4004C4295 /* thmlscripref.cpp */; }; - A9FB295311FD95E4004C4295 /* thmlstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289D11FD95E4004C4295 /* thmlstrongs.cpp */; }; - A9FB295411FD95E4004C4295 /* thmlvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289E11FD95E4004C4295 /* thmlvariants.cpp */; }; - A9FB295511FD95E4004C4295 /* thmlwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB289F11FD95E4004C4295 /* thmlwebif.cpp */; }; - A9FB295611FD95E4004C4295 /* thmlwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28A011FD95E4004C4295 /* thmlwordjs.cpp */; }; - A9FB295711FD95E4004C4295 /* unicodertf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28A111FD95E4004C4295 /* unicodertf.cpp */; }; - A9FB295811FD95E4004C4295 /* utf16utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28A211FD95E4004C4295 /* utf16utf8.cpp */; }; - A9FB295911FD95E4004C4295 /* utf8arabicpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28A311FD95E4004C4295 /* utf8arabicpoints.cpp */; }; - A9FB295A11FD95E4004C4295 /* utf8arshaping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28A411FD95E4004C4295 /* utf8arshaping.cpp */; }; - A9FB295B11FD95E4004C4295 /* utf8bidireorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28A511FD95E4004C4295 /* utf8bidireorder.cpp */; }; - A9FB295C11FD95E4004C4295 /* utf8cantillation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28A611FD95E4004C4295 /* utf8cantillation.cpp */; }; - A9FB295D11FD95E4004C4295 /* utf8greekaccents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28A711FD95E4004C4295 /* utf8greekaccents.cpp */; }; - A9FB295E11FD95E4004C4295 /* utf8hebrewpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28A811FD95E4004C4295 /* utf8hebrewpoints.cpp */; }; - A9FB295F11FD95E4004C4295 /* utf8html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28A911FD95E4004C4295 /* utf8html.cpp */; }; - A9FB296011FD95E4004C4295 /* utf8latin1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28AA11FD95E4004C4295 /* utf8latin1.cpp */; }; - A9FB296111FD95E4004C4295 /* utf8nfc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28AB11FD95E4004C4295 /* utf8nfc.cpp */; }; - A9FB296211FD95E4004C4295 /* utf8nfkd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28AC11FD95E4004C4295 /* utf8nfkd.cpp */; }; - A9FB296311FD95E4004C4295 /* utf8transliterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28AD11FD95E4004C4295 /* utf8transliterator.cpp */; }; - A9FB296411FD95E4004C4295 /* utf8utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28AE11FD95E4004C4295 /* utf8utf16.cpp */; }; - A9FB296511FD95E4004C4295 /* rawgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28B111FD95E4004C4295 /* rawgenbook.cpp */; }; - A9FB296611FD95E4004C4295 /* swgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28B211FD95E4004C4295 /* swgenbook.cpp */; }; - A9FB296711FD95E4004C4295 /* rawld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28B511FD95E4004C4295 /* rawld.cpp */; }; - A9FB296811FD95E4004C4295 /* rawld4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28B711FD95E4004C4295 /* rawld4.cpp */; }; - A9FB296911FD95E4004C4295 /* swld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28B811FD95E4004C4295 /* swld.cpp */; }; - A9FB296A11FD95E4004C4295 /* zld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28BA11FD95E4004C4295 /* zld.cpp */; }; - A9FB296B11FD95E4004C4295 /* swmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28BC11FD95E4004C4295 /* swmodule.cpp */; }; - A9FB296C11FD95E4004C4295 /* echomod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28BE11FD95E4004C4295 /* echomod.cpp */; }; - A9FB296D11FD95E4004C4295 /* rawtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28C111FD95E4004C4295 /* rawtext.cpp */; }; - A9FB296E11FD95E4004C4295 /* rawtext4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28C311FD95E4004C4295 /* rawtext4.cpp */; }; - A9FB296F11FD95E4004C4295 /* swtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28C411FD95E4004C4295 /* swtext.cpp */; }; - A9FB297011FD95E4004C4295 /* ztext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28C611FD95E4004C4295 /* ztext.cpp */; }; - A9FB297111FD95E4004C4295 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28C911FD95E4004C4295 /* adler32.c */; }; - A9FB297211FD95E4004C4295 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28CA11FD95E4004C4295 /* compress.c */; }; - A9FB297311FD95E4004C4295 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28CB11FD95E4004C4295 /* crc32.c */; }; - A9FB297411FD95E4004C4295 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28CC11FD95E4004C4295 /* deflate.c */; }; - A9FB297611FD95E4004C4295 /* gzio.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28CE11FD95E4004C4295 /* gzio.c */; }; - A9FB297711FD95E4004C4295 /* infblock.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28CF11FD95E4004C4295 /* infblock.c */; }; - A9FB297911FD95E4004C4295 /* infcodes.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28D111FD95E4004C4295 /* infcodes.c */; }; - A9FB297B11FD95E4004C4295 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28D311FD95E4004C4295 /* inffast.c */; }; - A9FB297E11FD95E4004C4295 /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28D611FD95E4004C4295 /* inflate.c */; }; - A9FB297F11FD95E4004C4295 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28D711FD95E4004C4295 /* inftrees.c */; }; - A9FB298111FD95E4004C4295 /* infutil.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28D911FD95E4004C4295 /* infutil.c */; }; - A9FB298311FD95E4004C4295 /* maketree.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28DB11FD95E4004C4295 /* maketree.c */; }; - A9FB298411FD95E4004C4295 /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28DC11FD95E4004C4295 /* trees.c */; }; - A9FB298611FD95E4004C4295 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28DE11FD95E4004C4295 /* uncompr.c */; }; - A9FB298711FD95E4004C4295 /* untgz.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28DF11FD95E4004C4295 /* untgz.c */; }; - A9FB298811FD95E4004C4295 /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28E011FD95E4004C4295 /* zutil.c */; }; - A9FB298A11FD95E4004C4295 /* ftplib.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28E211FD95E4004C4295 /* ftplib.c */; }; - A9FB298B11FD95E4004C4295 /* ftpparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28E311FD95E4004C4295 /* ftpparse.c */; }; - A9FB298C11FD95E4004C4295 /* regex.c in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28E411FD95E4004C4295 /* regex.c */; }; - A9FB298D11FD95E4004C4295 /* roman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28E511FD95E4004C4295 /* roman.cpp */; }; - A9FB298E11FD95E4004C4295 /* swbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28E611FD95E4004C4295 /* swbuf.cpp */; }; - A9FB298F11FD95E4004C4295 /* swobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28E711FD95E4004C4295 /* swobject.cpp */; }; - A9FB299011FD95E4004C4295 /* swunicod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28E811FD95E4004C4295 /* swunicod.cpp */; }; - A9FB299111FD95E4004C4295 /* swversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28E911FD95E4004C4295 /* swversion.cpp */; }; - A9FB299211FD95E4004C4295 /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28EA11FD95E4004C4295 /* url.cpp */; }; - A9FB299311FD95E4004C4295 /* utilstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28EB11FD95E4004C4295 /* utilstr.cpp */; }; - A9FB299411FD95E4004C4295 /* utilxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9FB28EC11FD95E4004C4295 /* utilxml.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - A964657A11C662CA00640FAC /* PBXContainerItemProxy */ = { + A954ABC913EE9D0F0094E3FE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9A7EEAD14D5D4BB00B76B6A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9A7EEC014D5D66400B76B6A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = 8DC2EF4F0486A6940098B216; remoteInfo = ObjCSword; }; - A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */ = { + A9BFB0BA13EDF5B600032679 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = 8DC2EF4F0486A6940098B216; remoteInfo = ObjCSword; }; - A9FB29A011FD965B004C4295 /* PBXContainerItemProxy */ = { + A9D2714614D717D800DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D2715314D717FD00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D2716014D7181200DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D2716D14D7182300DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D2717A14D7183B00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D2718714D7185800DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D2719414D7186A00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D271A114D7187E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D271AE14D7189300DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D271BB14D718A400DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D271C814D718B800DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D271D514D718C800DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D271E214D718DF00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D271EF14D718F500DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D271FE14D7193A00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A954ABC213EE9AB00094E3FE; + remoteInfo = sword; + }; + A9D2720014D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D2714414D717D800DA8926; + remoteInfo = imp2gbs; + }; + A9D2720214D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D2715114D717FD00DA8926; + remoteInfo = imp2ld; + }; + A9D2720414D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D2715E14D7181200DA8926; + remoteInfo = imp2vs; + }; + A9D2720614D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D2716B14D7182300DA8926; + remoteInfo = installmgr; + }; + A9D2720814D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D2717814D7183B00DA8926; + remoteInfo = mod2imp; + }; + A9D2720A14D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A975EED811C792B9007C1532; + remoteInfo = mod2osis; + }; + A9D2720C14D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D2718514D7185800DA8926; + remoteInfo = mod2vpl; + }; + A9D2720E14D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D2719214D7186A00DA8926; + remoteInfo = mod2zmod; + }; + A9D2721014D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9A7EEB314D5D61700B76B6A; + remoteInfo = osis2mod; + }; + A9D2721214D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D2719F14D7187E00DA8926; + remoteInfo = step2vpl; + }; + A9D2721414D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D271AC14D7189300DA8926; + remoteInfo = stepdump; + }; + A9D2721614D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D271B914D718A400DA8926; + remoteInfo = tei2mod; + }; + A9D2721814D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D271C614D718B800DA8926; + remoteInfo = vpl2mod; + }; + A9D2721A14D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D271D314D718C800DA8926; + remoteInfo = vs2osisref; + }; + A9D2721C14D7194E00DA8926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A9D271E014D718DF00DA8926; + remoteInfo = vs2osisreftxt; + }; + A9D2721E14D7194E00DA8926 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; proxyType = 1; - remoteGlobalIDString = A9FB25DF11FD939E004C4295; - remoteInfo = Sword_iOS; + remoteGlobalIDString = A9D271ED14D718F500DA8926; + remoteInfo = xml2gbs; }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - A9013D3911E316C700E1CCCA /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; A9A5050211C75C4B00EB6EA5 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - A956324511FD90D2007DC7AD /* libclucene-ub.a in CopyFiles */, - A956316711FD8C5E007DC7AD /* libsword-ub.a in CopyFiles */, + A9D9FA0B13EEE5CF00EA9DEB /* libsword.dylib in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -445,12 +679,26 @@ 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 32DBCF5E0370ADEE00C91783 /* ObjCSword_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword_Prefix.pch; sourceTree = ""; }; + 8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DefaultFilterProvider.mm; path = src/DefaultFilterProvider.mm; sourceTree = ""; }; + 8C92C02A5C86E1C75ED1CEF4 /* SwordFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordFilter.h; path = src/SwordFilter.h; sourceTree = ""; }; + 8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FilterProviderFactory.mm; path = src/FilterProviderFactory.mm; sourceTree = ""; }; + 8C92C291C40A77060C12A21B /* SwordUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordUtil.m; path = src/SwordUtil.m; sourceTree = ""; }; + 8C92C72ADACB017A434CD268 /* FilterProviderFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FilterProviderFactory.h; path = src/FilterProviderFactory.h; sourceTree = ""; }; + 8C92C7B2EB245D47FEB5E3B0 /* SwordUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordUtil.h; path = src/SwordUtil.h; sourceTree = ""; }; + 8C92C980D4DE32C7AB93159D /* DefaultFilterProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultFilterProvider.h; path = src/DefaultFilterProvider.h; sourceTree = ""; }; + 8C92CC111DC521DE0C054C60 /* SwordFilter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordFilter.mm; path = src/SwordFilter.mm; sourceTree = ""; }; 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjCSword.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - A9013D3E11E316C700E1CCCA /* ObjCSword_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjCSword_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - A9013D3F11E316C700E1CCCA /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = ""; }; - A918B8E211C6697400024D84 /* SwordModuleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTest.h; path = test/SwordModuleTest.h; sourceTree = ""; }; - A918B8E311C6697400024D84 /* SwordModuleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTest.m; path = test/SwordModuleTest.m; sourceTree = ""; }; + A917AF2516B1BE38006367FC /* Tests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; + A918B8E211C6697400024D84 /* SwordModuleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTest.h; path = ../test/SwordModuleTest.h; sourceTree = ""; }; + A918B8E311C6697400024D84 /* SwordModuleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTest.m; path = ../test/SwordModuleTest.m; sourceTree = ""; }; + A91C8B66175233F3008702B9 /* versificationmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versificationmgr.cpp; sourceTree = ""; }; + A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleTextEntry.m; path = src/SwordBibleTextEntry.m; sourceTree = ""; }; + A929619716B1BA240094E5BE /* SwordKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordKey.h; path = src/SwordKey.h; sourceTree = ""; }; + A929619816B1BA240094E5BE /* SwordKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordKey.mm; path = src/SwordKey.mm; sourceTree = ""; }; + A929619916B1BA240094E5BE /* SwordListKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKey.h; path = src/SwordListKey.h; sourceTree = ""; }; + A929619A16B1BA240094E5BE /* SwordListKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordListKey.mm; path = src/SwordListKey.mm; sourceTree = ""; }; + A929619B16B1BA240094E5BE /* SwordVerseKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseKey.h; path = src/SwordVerseKey.h; sourceTree = ""; }; A94EABE3117B28910018B06F /* SwordBible.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBible.h; path = src/SwordBible.h; sourceTree = ""; }; A94EABE4117B28910018B06F /* SwordBible.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBible.mm; path = src/SwordBible.mm; sourceTree = ""; }; A94EABE5117B28920018B06F /* SwordBibleBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleBook.h; path = src/SwordBibleBook.h; sourceTree = ""; }; @@ -458,7 +706,6 @@ A94EABE7117B28920018B06F /* SwordBibleChapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleChapter.h; path = src/SwordBibleChapter.h; sourceTree = ""; }; A94EABE8117B28920018B06F /* SwordBibleChapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleChapter.m; path = src/SwordBibleChapter.m; sourceTree = ""; }; A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleTextEntry.h; path = src/SwordBibleTextEntry.h; sourceTree = ""; }; - A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleTextEntry.m; path = src/SwordBibleTextEntry.m; sourceTree = ""; }; A94EABEB117B28920018B06F /* SwordBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBook.h; path = src/SwordBook.h; sourceTree = ""; }; A94EABEC117B28920018B06F /* SwordBook.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBook.mm; path = src/SwordBook.mm; sourceTree = ""; }; A94EABED117B28920018B06F /* SwordCommentary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordCommentary.h; path = src/SwordCommentary.h; sourceTree = ""; }; @@ -467,12 +714,8 @@ A94EABF0117B28920018B06F /* SwordDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordDictionary.mm; path = src/SwordDictionary.mm; sourceTree = ""; }; A94EABF1117B28920018B06F /* SwordInstallSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSource.h; path = src/SwordInstallSource.h; sourceTree = ""; }; A94EABF2117B28920018B06F /* SwordInstallSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSource.mm; path = src/SwordInstallSource.mm; sourceTree = ""; }; - A94EABF3117B28920018B06F /* SwordInstallSourceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSourceController.h; path = src/SwordInstallSourceController.h; sourceTree = ""; }; - A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSourceController.mm; path = src/SwordInstallSourceController.mm; sourceTree = ""; }; - A94EABF5117B28920018B06F /* SwordKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordKey.h; path = src/SwordKey.h; sourceTree = ""; }; - A94EABF6117B28920018B06F /* SwordKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordKey.mm; path = src/SwordKey.mm; sourceTree = ""; }; - A94EABF7117B28920018B06F /* SwordListKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKey.h; path = src/SwordListKey.h; sourceTree = ""; }; - A94EABF8117B28920018B06F /* SwordListKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordListKey.mm; path = src/SwordListKey.mm; sourceTree = ""; }; + A94EABF3117B28920018B06F /* SwordInstallSourceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSourceManager.h; path = src/SwordInstallSourceManager.h; sourceTree = ""; }; + A94EABF4117B28920018B06F /* SwordInstallSourceManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSourceManager.mm; path = src/SwordInstallSourceManager.mm; sourceTree = ""; }; A94EABF9117B28920018B06F /* SwordManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManager.h; path = src/SwordManager.h; sourceTree = ""; }; A94EABFA117B28920018B06F /* SwordManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordManager.mm; path = src/SwordManager.mm; sourceTree = ""; }; A94EABFD117B28920018B06F /* SwordModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModule.h; path = src/SwordModule.h; sourceTree = ""; }; @@ -481,16 +724,409 @@ A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTextEntry.m; path = src/SwordModuleTextEntry.m; sourceTree = ""; }; A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTreeEntry.h; path = src/SwordModuleTreeEntry.h; sourceTree = ""; }; A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTreeEntry.m; path = src/SwordModuleTreeEntry.m; sourceTree = ""; }; - A94EAC05117B28920018B06F /* SwordVerseKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseKey.h; path = src/SwordVerseKey.h; sourceTree = ""; }; A94EAC06117B28920018B06F /* SwordVerseKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseKey.mm; path = src/SwordVerseKey.mm; sourceTree = ""; }; A94EAC07117B28920018B06F /* SwordVerseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseManager.h; path = src/SwordVerseManager.h; sourceTree = ""; }; A94EAC08117B28920018B06F /* SwordVerseManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseManager.mm; path = src/SwordVerseManager.mm; sourceTree = ""; }; A94EAC09117B28920018B06F /* VerseEnumerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VerseEnumerator.h; path = src/VerseEnumerator.h; sourceTree = ""; }; A94EAC0A117B28920018B06F /* VerseEnumerator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VerseEnumerator.mm; path = src/VerseEnumerator.mm; sourceTree = ""; }; - A956316411FD8C55007DC7AD /* libsword-ub.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsword-ub.a"; path = "build_sword/build/result_inst/lib/libsword-ub.a"; sourceTree = ""; }; - A956324211FD90C9007DC7AD /* libclucene-ub.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libclucene-ub.a"; path = "build_clucene/build/result_inst/lib/libclucene-ub.a"; sourceTree = ""; }; - A964658011C663E200640FAC /* SwordManagerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManagerTest.h; path = test/SwordManagerTest.h; sourceTree = ""; }; - A964658111C663E200640FAC /* SwordManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordManagerTest.m; path = test/SwordManagerTest.m; sourceTree = ""; }; + A954A80113EE98B30094E3FE /* swdisp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swdisp.cpp; sourceTree = ""; }; + A954A80213EE98B30094E3FE /* swlog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swlog.cpp; sourceTree = ""; }; + A954A80913EE98B30094E3FE /* listkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = listkey.cpp; sourceTree = ""; }; + A954A81013EE98B30094E3FE /* strkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strkey.cpp; sourceTree = ""; }; + A954A81113EE98B30094E3FE /* swkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swkey.cpp; sourceTree = ""; }; + A954A81213EE98B30094E3FE /* treekey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = treekey.cpp; sourceTree = ""; }; + A954A81313EE98B30094E3FE /* treekeyidx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = treekeyidx.cpp; sourceTree = ""; }; + A954A81413EE98B30094E3FE /* versekey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versekey.cpp; sourceTree = ""; }; + A954A81513EE98B30094E3FE /* versetreekey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versetreekey.cpp; sourceTree = ""; }; + A954A81813EE98B30094E3FE /* curlftpt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = curlftpt.cpp; sourceTree = ""; }; + A954A81913EE98B30094E3FE /* curlhttpt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = curlhttpt.cpp; sourceTree = ""; }; + A954A81A13EE98B30094E3FE /* encfiltmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encfiltmgr.cpp; sourceTree = ""; }; + A954A81B13EE98B30094E3FE /* filemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filemgr.cpp; sourceTree = ""; }; + A954A81C13EE98B30094E3FE /* ftplibftpt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ftplibftpt.cpp; sourceTree = ""; }; + A954A81E13EE98B30094E3FE /* installmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = installmgr.cpp; sourceTree = ""; }; + A954A81F13EE98B30094E3FE /* localemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = localemgr.cpp; sourceTree = ""; }; + A954A82213EE98B30094E3FE /* markupfiltmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = markupfiltmgr.cpp; sourceTree = ""; }; + A954A82313EE98B30094E3FE /* stringmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stringmgr.cpp; sourceTree = ""; }; + A954A82413EE98B30094E3FE /* swcacher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcacher.cpp; sourceTree = ""; }; + A954A82513EE98B30094E3FE /* swconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swconfig.cpp; sourceTree = ""; }; + A954A82613EE98B30094E3FE /* swfiltermgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swfiltermgr.cpp; sourceTree = ""; }; + A954A82713EE98B30094E3FE /* swlocale.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swlocale.cpp; sourceTree = ""; }; + A954A82813EE98B30094E3FE /* swmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swmgr.cpp; sourceTree = ""; }; + A954A82913EE98B30094E3FE /* swsearchable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swsearchable.cpp; sourceTree = ""; }; + A954A82E13EE98B30094E3FE /* hrefcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hrefcom.cpp; sourceTree = ""; }; + A954A83613EE98B30094E3FE /* rawcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawcom.cpp; sourceTree = ""; }; + A954A83913EE98B30094E3FE /* rawcom4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawcom4.cpp; sourceTree = ""; }; + A954A83D13EE98B30094E3FE /* rawfiles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawfiles.cpp; sourceTree = ""; }; + A954A83E13EE98B30094E3FE /* swcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcom.cpp; sourceTree = ""; }; + A954A84013EE98B30094E3FE /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A954A84113EE98B30094E3FE /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; + A954A84213EE98B30094E3FE /* zcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zcom.cpp; sourceTree = ""; }; + A954A84513EE98B30094E3FE /* entriesblk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entriesblk.cpp; sourceTree = ""; }; + A954A84613EE98B30094E3FE /* lzsscomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lzsscomprs.cpp; sourceTree = ""; }; + A954A84913EE98B30094E3FE /* rawstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawstr.cpp; sourceTree = ""; }; + A954A84A13EE98B30094E3FE /* rawstr4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawstr4.cpp; sourceTree = ""; }; + A954A84B13EE98B30094E3FE /* rawverse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawverse.cpp; sourceTree = ""; }; + A954A84C13EE98B30094E3FE /* rawverse4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawverse4.cpp; sourceTree = ""; }; + A954A84D13EE98B30094E3FE /* sapphire.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sapphire.cpp; sourceTree = ""; }; + A954A84E13EE98B30094E3FE /* swcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcipher.cpp; sourceTree = ""; }; + A954A84F13EE98B30094E3FE /* swcomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcomprs.cpp; sourceTree = ""; }; + A954A85113EE98B30094E3FE /* zipcomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zipcomprs.cpp; sourceTree = ""; }; + A954A85213EE98B30094E3FE /* zstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zstr.cpp; sourceTree = ""; }; + A954A85313EE98B30094E3FE /* zverse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zverse.cpp; sourceTree = ""; }; + A954A85513EE98B30094E3FE /* cipherfil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cipherfil.cpp; sourceTree = ""; }; + A954A85613EE98B30094E3FE /* gbffootnotes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbffootnotes.cpp; sourceTree = ""; }; + A954A85713EE98B30094E3FE /* gbfheadings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfheadings.cpp; sourceTree = ""; }; + A954A85813EE98B30094E3FE /* gbfhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfhtml.cpp; sourceTree = ""; }; + A954A85913EE98B30094E3FE /* gbfhtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfhtmlhref.cpp; sourceTree = ""; }; + A954A85A13EE98B30094E3FE /* gbfmorph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfmorph.cpp; sourceTree = ""; }; + A954A85B13EE98B30094E3FE /* gbfosis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfosis.cpp; sourceTree = ""; }; + A954A85C13EE98B30094E3FE /* gbfplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfplain.cpp; sourceTree = ""; }; + A954A85D13EE98B30094E3FE /* gbfredletterwords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfredletterwords.cpp; sourceTree = ""; }; + A954A85E13EE98B30094E3FE /* gbfrtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfrtf.cpp; sourceTree = ""; }; + A954A85F13EE98B30094E3FE /* gbfstrongs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfstrongs.cpp; sourceTree = ""; }; + A954A86013EE98B30094E3FE /* gbfthml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfthml.cpp; sourceTree = ""; }; + A954A86113EE98B30094E3FE /* gbfwebif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfwebif.cpp; sourceTree = ""; }; + A954A86213EE98B30094E3FE /* gbfwordjs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfwordjs.cpp; sourceTree = ""; }; + A954A86313EE98B30094E3FE /* gbfxhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfxhtml.cpp; sourceTree = ""; }; + A954A86413EE98B30094E3FE /* greeklexattribs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = greeklexattribs.cpp; sourceTree = ""; }; + A954A86513EE98B30094E3FE /* latin1utf16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latin1utf16.cpp; sourceTree = ""; }; + A954A86613EE98B30094E3FE /* latin1utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latin1utf8.cpp; sourceTree = ""; }; + A954A86913EE98B30094E3FE /* osisfootnotes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisfootnotes.cpp; sourceTree = ""; }; + A954A86A13EE98B30094E3FE /* osisheadings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisheadings.cpp; sourceTree = ""; }; + A954A86B13EE98B30094E3FE /* osishtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osishtmlhref.cpp; sourceTree = ""; }; + A954A86C13EE98B30094E3FE /* osislemma.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osislemma.cpp; sourceTree = ""; }; + A954A86D13EE98B30094E3FE /* osismorph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osismorph.cpp; sourceTree = ""; }; + A954A86E13EE98B30094E3FE /* osismorphsegmentation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osismorphsegmentation.cpp; sourceTree = ""; }; + A954A86F13EE98B30094E3FE /* osisosis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisosis.cpp; sourceTree = ""; }; + A954A87013EE98B30094E3FE /* osisplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisplain.cpp; sourceTree = ""; }; + A954A87113EE98B30094E3FE /* osisredletterwords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisredletterwords.cpp; sourceTree = ""; }; + A954A87213EE98B30094E3FE /* osisrtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisrtf.cpp; sourceTree = ""; }; + A954A87413EE98B30094E3FE /* osisscripref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisscripref.cpp; sourceTree = ""; }; + A954A87513EE98B30094E3FE /* osisstrongs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisstrongs.cpp; sourceTree = ""; }; + A954A87613EE98B30094E3FE /* osisvariants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisvariants.cpp; sourceTree = ""; }; + A954A87713EE98B30094E3FE /* osiswebif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osiswebif.cpp; sourceTree = ""; }; + A954A87813EE98B30094E3FE /* osiswordjs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osiswordjs.cpp; sourceTree = ""; }; + A954A87913EE98B30094E3FE /* osisxhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisxhtml.cpp; sourceTree = ""; }; + A954A87A13EE98B30094E3FE /* papyriplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = papyriplain.cpp; sourceTree = ""; }; + A954A87D13EE98B30094E3FE /* rtfhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rtfhtml.cpp; sourceTree = ""; }; + A954A87E13EE98B30094E3FE /* swbasicfilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swbasicfilter.cpp; sourceTree = ""; }; + A954A87F13EE98B30094E3FE /* swoptfilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swoptfilter.cpp; sourceTree = ""; }; + A954A88013EE98B30094E3FE /* teihtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teihtmlhref.cpp; sourceTree = ""; }; + A954A88113EE98B30094E3FE /* teiplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teiplain.cpp; sourceTree = ""; }; + A954A88213EE98B30094E3FE /* teirtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teirtf.cpp; sourceTree = ""; }; + A954A88313EE98B30094E3FE /* thmlfootnotes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlfootnotes.cpp; sourceTree = ""; }; + A954A88413EE98B30094E3FE /* thmlgbf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlgbf.cpp; sourceTree = ""; }; + A954A88513EE98B30094E3FE /* thmlheadings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlheadings.cpp; sourceTree = ""; }; + A954A88613EE98B30094E3FE /* thmlhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlhtml.cpp; sourceTree = ""; }; + A954A88713EE98B30094E3FE /* thmlhtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlhtmlhref.cpp; sourceTree = ""; }; + A954A88813EE98B30094E3FE /* thmllemma.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmllemma.cpp; sourceTree = ""; }; + A954A88913EE98B30094E3FE /* thmlmorph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlmorph.cpp; sourceTree = ""; }; + A954A88A13EE98B30094E3FE /* thmlosis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlosis.cpp; sourceTree = ""; }; + A954A88B13EE98B30094E3FE /* thmlplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlplain.cpp; sourceTree = ""; }; + A954A88C13EE98B30094E3FE /* thmlrtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlrtf.cpp; sourceTree = ""; }; + A954A88D13EE98B30094E3FE /* thmlscripref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlscripref.cpp; sourceTree = ""; }; + A954A88E13EE98B30094E3FE /* thmlstrongs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlstrongs.cpp; sourceTree = ""; }; + A954A88F13EE98B30094E3FE /* thmlvariants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlvariants.cpp; sourceTree = ""; }; + A954A89013EE98B30094E3FE /* thmlwebif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlwebif.cpp; sourceTree = ""; }; + A954A89113EE98B30094E3FE /* thmlwordjs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlwordjs.cpp; sourceTree = ""; }; + A954A89213EE98B30094E3FE /* thmlxhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlxhtml.cpp; sourceTree = ""; }; + A954A89313EE98B30094E3FE /* unicodertf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unicodertf.cpp; sourceTree = ""; }; + A954A89413EE98B30094E3FE /* utf16utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf16utf8.cpp; sourceTree = ""; }; + A954A89513EE98B30094E3FE /* utf8arabicpoints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8arabicpoints.cpp; sourceTree = ""; }; + A954A89613EE98B30094E3FE /* utf8arshaping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8arshaping.cpp; sourceTree = ""; }; + A954A89713EE98B30094E3FE /* utf8bidireorder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8bidireorder.cpp; sourceTree = ""; }; + A954A89813EE98B30094E3FE /* utf8cantillation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8cantillation.cpp; sourceTree = ""; }; + A954A89913EE98B30094E3FE /* utf8greekaccents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8greekaccents.cpp; sourceTree = ""; }; + A954A89A13EE98B30094E3FE /* utf8hebrewpoints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8hebrewpoints.cpp; sourceTree = ""; }; + A954A89B13EE98B30094E3FE /* utf8html.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8html.cpp; sourceTree = ""; }; + A954A89C13EE98B30094E3FE /* utf8latin1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8latin1.cpp; sourceTree = ""; }; + A954A89D13EE98B30094E3FE /* utf8nfc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8nfc.cpp; sourceTree = ""; }; + A954A89E13EE98B30094E3FE /* utf8nfkd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8nfkd.cpp; sourceTree = ""; }; + A954A89F13EE98B30094E3FE /* utf8transliterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8transliterator.cpp; sourceTree = ""; }; + A954A8A013EE98B30094E3FE /* utf8utf16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8utf16.cpp; sourceTree = ""; }; + A954A8A713EE98B30094E3FE /* rawgenbook.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawgenbook.cpp; sourceTree = ""; }; + A954A8A813EE98B30094E3FE /* swgenbook.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swgenbook.cpp; sourceTree = ""; }; + A954A8AF13EE98B30094E3FE /* rawld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawld.cpp; sourceTree = ""; }; + A954A8B313EE98B30094E3FE /* rawld4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawld4.cpp; sourceTree = ""; }; + A954A8B413EE98B30094E3FE /* swld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swld.cpp; sourceTree = ""; }; + A954A8B813EE98B30094E3FE /* zld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zld.cpp; sourceTree = ""; }; + A954A8BC13EE98B30094E3FE /* swmodule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swmodule.cpp; sourceTree = ""; }; + A954A8BE13EE98B30094E3FE /* echomod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = echomod.cpp; sourceTree = ""; }; + A954A8C613EE98B30094E3FE /* rawtext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawtext.cpp; sourceTree = ""; }; + A954A8C913EE98B30094E3FE /* rawtext4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawtext4.cpp; sourceTree = ""; }; + A954A8CA13EE98B30094E3FE /* swtext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swtext.cpp; sourceTree = ""; }; + A954A8CE13EE98B30094E3FE /* ztext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ztext.cpp; sourceTree = ""; }; + A954A8D013EE98B30094E3FE /* ftplib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftplib.c; sourceTree = ""; }; + A954A8D113EE98B30094E3FE /* ftpparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftpparse.c; sourceTree = ""; }; + A954A8D413EE98B30094E3FE /* regex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = regex.c; sourceTree = ""; }; + A954A8D513EE98B30094E3FE /* roman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = roman.cpp; sourceTree = ""; }; + A954A8D613EE98B30094E3FE /* swbuf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swbuf.cpp; sourceTree = ""; }; + A954A8D713EE98B30094E3FE /* swobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swobject.cpp; sourceTree = ""; }; + A954A8D913EE98B30094E3FE /* swversion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swversion.cpp; sourceTree = ""; }; + A954A8DA13EE98B30094E3FE /* url.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url.cpp; sourceTree = ""; }; + A954A8DB13EE98B30094E3FE /* utilstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utilstr.cpp; sourceTree = ""; }; + A954A8DC13EE98B30094E3FE /* utilxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utilxml.cpp; sourceTree = ""; }; + A954A8E113EE98B30094E3FE /* adler32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = ""; }; + A954A8E213EE98B30094E3FE /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = ""; }; + A954A8E313EE98B30094E3FE /* crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crc32.c; sourceTree = ""; }; + A954A8E413EE98B30094E3FE /* deflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = deflate.c; sourceTree = ""; }; + A954A8EB13EE98B30094E3FE /* inffast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inffast.c; sourceTree = ""; }; + A954A8EE13EE98B30094E3FE /* inflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inflate.c; sourceTree = ""; }; + A954A8EF13EE98B30094E3FE /* inftrees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inftrees.c; sourceTree = ""; }; + A954A8F413EE98B30094E3FE /* trees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = trees.c; sourceTree = ""; }; + A954A8F613EE98B30094E3FE /* uncompr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = ""; }; + A954A8F713EE98B30094E3FE /* untgz.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = untgz.c; sourceTree = ""; }; + A954A8F813EE98B30094E3FE /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = ""; }; + A954A9E413EE9A2B0094E3FE /* AnalysisHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnalysisHeader.cpp; sourceTree = ""; }; + A954A9E513EE9A2B0094E3FE /* AnalysisHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnalysisHeader.h; sourceTree = ""; }; + A954A9E613EE9A2B0094E3FE /* Analyzers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Analyzers.cpp; sourceTree = ""; }; + A954A9E713EE9A2B0094E3FE /* Analyzers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Analyzers.h; sourceTree = ""; }; + A954A9E913EE9A2B0094E3FE /* StandardAnalyzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StandardAnalyzer.cpp; sourceTree = ""; }; + A954A9EA13EE9A2B0094E3FE /* StandardAnalyzer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardAnalyzer.h; sourceTree = ""; }; + A954A9EB13EE9A2B0094E3FE /* StandardFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StandardFilter.cpp; sourceTree = ""; }; + A954A9EC13EE9A2B0094E3FE /* StandardFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardFilter.h; sourceTree = ""; }; + A954A9ED13EE9A2B0094E3FE /* StandardTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StandardTokenizer.cpp; sourceTree = ""; }; + A954A9EE13EE9A2B0094E3FE /* StandardTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardTokenizer.h; sourceTree = ""; }; + A954A9EF13EE9A2B0094E3FE /* StandardTokenizerConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardTokenizerConstants.h; sourceTree = ""; }; + A954A9F013EE9A2B0094E3FE /* CLBackwards.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLBackwards.h; sourceTree = ""; }; + A954A9F113EE9A2B0094E3FE /* CLConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLConfig.h; sourceTree = ""; }; + A954A9F213EE9A2B0094E3FE /* clucene-config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "clucene-config.h"; sourceTree = ""; }; + A954A9F413EE9A2B0094E3FE /* compiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compiler.h; sourceTree = ""; }; + A954A9F513EE9A2B0094E3FE /* CompilerBcb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompilerBcb.h; sourceTree = ""; }; + A954A9F613EE9A2B0094E3FE /* CompilerGcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompilerGcc.h; sourceTree = ""; }; + A954A9F713EE9A2B0094E3FE /* CompilerMsvc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompilerMsvc.h; sourceTree = ""; }; + A954A9F813EE9A2B0094E3FE /* define_std.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = define_std.h; sourceTree = ""; }; + A954A9F913EE9A2B0094E3FE /* gunichartables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gunichartables.cpp; sourceTree = ""; }; + A954A9FA13EE9A2B0094E3FE /* gunichartables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gunichartables.h; sourceTree = ""; }; + A954A9FB13EE9A2B0094E3FE /* PlatformMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMac.h; sourceTree = ""; }; + A954A9FC13EE9A2B0094E3FE /* PlatformUnix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformUnix.h; sourceTree = ""; }; + A954A9FD13EE9A2B0094E3FE /* PlatformWin32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformWin32.h; sourceTree = ""; }; + A954A9FE13EE9A2B0094E3FE /* repl_lltot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_lltot.cpp; sourceTree = ""; }; + A954A9FF13EE9A2B0094E3FE /* repl_tchar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = repl_tchar.h; sourceTree = ""; }; + A954AA0013EE9A2B0094E3FE /* repl_tcscasecmp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcscasecmp.cpp; sourceTree = ""; }; + A954AA0113EE9A2B0094E3FE /* repl_tcslwr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcslwr.cpp; sourceTree = ""; }; + A954AA0213EE9A2B0094E3FE /* repl_tcstod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcstod.cpp; sourceTree = ""; }; + A954AA0313EE9A2B0094E3FE /* repl_tcstoll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcstoll.cpp; sourceTree = ""; }; + A954AA0413EE9A2B0094E3FE /* repl_tprintf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tprintf.cpp; sourceTree = ""; }; + A954AA0513EE9A2B0094E3FE /* repl_wchar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = repl_wchar.h; sourceTree = ""; }; + A954AA0613EE9A2B0094E3FE /* threadCSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threadCSection.h; sourceTree = ""; }; + A954AA0713EE9A2B0094E3FE /* threadPthread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threadPthread.h; sourceTree = ""; }; + A954AA0813EE9A2B0094E3FE /* threads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = threads.cpp; sourceTree = ""; }; + A954AA0913EE9A2B0094E3FE /* utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8.cpp; sourceTree = ""; }; + A954AA0B13EE9A2B0094E3FE /* condition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = condition.cpp; sourceTree = ""; }; + A954AA0C13EE9A2B0094E3FE /* condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = condition.h; sourceTree = ""; }; + A954AA0D13EE9A2B0094E3FE /* error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = error.cpp; sourceTree = ""; }; + A954AA0E13EE9A2B0094E3FE /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = ""; }; + A954AA0F13EE9A2B0094E3FE /* lucenebase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lucenebase.h; sourceTree = ""; }; + A954AA1013EE9A2B0094E3FE /* mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mem.h; sourceTree = ""; }; + A954AA1113EE9A2B0094E3FE /* memtracking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memtracking.cpp; sourceTree = ""; }; + A954AA1313EE9A2B0094E3FE /* DateField.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateField.cpp; sourceTree = ""; }; + A954AA1413EE9A2B0094E3FE /* DateField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateField.h; sourceTree = ""; }; + A954AA1513EE9A2B0094E3FE /* Document.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Document.cpp; sourceTree = ""; }; + A954AA1613EE9A2B0094E3FE /* Document.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Document.h; sourceTree = ""; }; + A954AA1713EE9A2B0094E3FE /* Field.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Field.cpp; sourceTree = ""; }; + A954AA1813EE9A2B0094E3FE /* Field.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Field.h; sourceTree = ""; }; + A954AA1A13EE9A2B0094E3FE /* CompoundFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompoundFile.cpp; sourceTree = ""; }; + A954AA1B13EE9A2B0094E3FE /* CompoundFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompoundFile.h; sourceTree = ""; }; + A954AA1C13EE9A2B0094E3FE /* DocumentWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentWriter.cpp; sourceTree = ""; }; + A954AA1D13EE9A2B0094E3FE /* DocumentWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentWriter.h; sourceTree = ""; }; + A954AA1E13EE9A2B0094E3FE /* FieldInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldInfo.h; sourceTree = ""; }; + A954AA1F13EE9A2B0094E3FE /* FieldInfos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldInfos.cpp; sourceTree = ""; }; + A954AA2013EE9A2B0094E3FE /* FieldInfos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldInfos.h; sourceTree = ""; }; + A954AA2113EE9A2B0094E3FE /* FieldsReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldsReader.cpp; sourceTree = ""; }; + A954AA2213EE9A2B0094E3FE /* FieldsReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldsReader.h; sourceTree = ""; }; + A954AA2313EE9A2B0094E3FE /* FieldsWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldsWriter.cpp; sourceTree = ""; }; + A954AA2413EE9A2B0094E3FE /* FieldsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldsWriter.h; sourceTree = ""; }; + A954AA2513EE9A2B0094E3FE /* IndexModifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexModifier.cpp; sourceTree = ""; }; + A954AA2613EE9A2B0094E3FE /* IndexModifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexModifier.h; sourceTree = ""; }; + A954AA2713EE9A2B0094E3FE /* IndexReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexReader.cpp; sourceTree = ""; }; + A954AA2813EE9A2B0094E3FE /* IndexReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexReader.h; sourceTree = ""; }; + A954AA2913EE9A2B0094E3FE /* IndexWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexWriter.cpp; sourceTree = ""; }; + A954AA2A13EE9A2B0094E3FE /* IndexWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexWriter.h; sourceTree = ""; }; + A954AA2B13EE9A2B0094E3FE /* MultiReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiReader.cpp; sourceTree = ""; }; + A954AA2C13EE9A2B0094E3FE /* MultiReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiReader.h; sourceTree = ""; }; + A954AA2D13EE9A2B0094E3FE /* SegmentHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentHeader.h; sourceTree = ""; }; + A954AA2E13EE9A2B0094E3FE /* SegmentInfos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentInfos.cpp; sourceTree = ""; }; + A954AA2F13EE9A2B0094E3FE /* SegmentInfos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentInfos.h; sourceTree = ""; }; + A954AA3013EE9A2B0094E3FE /* SegmentMergeInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentMergeInfo.cpp; sourceTree = ""; }; + A954AA3113EE9A2B0094E3FE /* SegmentMergeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentMergeInfo.h; sourceTree = ""; }; + A954AA3213EE9A2B0094E3FE /* SegmentMergeQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentMergeQueue.cpp; sourceTree = ""; }; + A954AA3313EE9A2B0094E3FE /* SegmentMergeQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentMergeQueue.h; sourceTree = ""; }; + A954AA3413EE9A2B0094E3FE /* SegmentMerger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentMerger.cpp; sourceTree = ""; }; + A954AA3513EE9A2B0094E3FE /* SegmentMerger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentMerger.h; sourceTree = ""; }; + A954AA3613EE9A2B0094E3FE /* SegmentReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentReader.cpp; sourceTree = ""; }; + A954AA3713EE9A2B0094E3FE /* SegmentTermDocs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermDocs.cpp; sourceTree = ""; }; + A954AA3813EE9A2B0094E3FE /* SegmentTermEnum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermEnum.cpp; sourceTree = ""; }; + A954AA3913EE9A2B0094E3FE /* SegmentTermEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentTermEnum.h; sourceTree = ""; }; + A954AA3A13EE9A2B0094E3FE /* SegmentTermPositions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermPositions.cpp; sourceTree = ""; }; + A954AA3B13EE9A2B0094E3FE /* SegmentTermVector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermVector.cpp; sourceTree = ""; }; + A954AA3C13EE9A2B0094E3FE /* Term.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Term.cpp; sourceTree = ""; }; + A954AA3D13EE9A2B0094E3FE /* Term.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Term.h; sourceTree = ""; }; + A954AA3E13EE9A2B0094E3FE /* TermInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermInfo.cpp; sourceTree = ""; }; + A954AA3F13EE9A2B0094E3FE /* TermInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermInfo.h; sourceTree = ""; }; + A954AA4013EE9A2B0094E3FE /* TermInfosReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermInfosReader.cpp; sourceTree = ""; }; + A954AA4113EE9A2B0094E3FE /* TermInfosReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermInfosReader.h; sourceTree = ""; }; + A954AA4213EE9A2B0094E3FE /* TermInfosWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermInfosWriter.cpp; sourceTree = ""; }; + A954AA4313EE9A2B0094E3FE /* TermInfosWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermInfosWriter.h; sourceTree = ""; }; + A954AA4413EE9A2B0094E3FE /* Terms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Terms.h; sourceTree = ""; }; + A954AA4513EE9A2B0094E3FE /* TermVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermVector.h; sourceTree = ""; }; + A954AA4613EE9A2B0094E3FE /* TermVectorReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermVectorReader.cpp; sourceTree = ""; }; + A954AA4713EE9A2B0094E3FE /* TermVectorWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermVectorWriter.cpp; sourceTree = ""; }; + A954AA4813EE9A2B0094E3FE /* LuceneThreads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuceneThreads.h; sourceTree = ""; }; + A954AA4A13EE9A2B0094E3FE /* Lexer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lexer.cpp; sourceTree = ""; }; + A954AA4B13EE9A2B0094E3FE /* Lexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lexer.h; sourceTree = ""; }; + A954AA4C13EE9A2B0094E3FE /* MultiFieldQueryParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiFieldQueryParser.cpp; sourceTree = ""; }; + A954AA4D13EE9A2B0094E3FE /* MultiFieldQueryParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiFieldQueryParser.h; sourceTree = ""; }; + A954AA4E13EE9A2B0094E3FE /* QueryParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryParser.cpp; sourceTree = ""; }; + A954AA4F13EE9A2B0094E3FE /* QueryParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryParser.h; sourceTree = ""; }; + A954AA5013EE9A2B0094E3FE /* QueryParserBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryParserBase.cpp; sourceTree = ""; }; + A954AA5113EE9A2B0094E3FE /* QueryParserBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryParserBase.h; sourceTree = ""; }; + A954AA5213EE9A2B0094E3FE /* QueryToken.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryToken.cpp; sourceTree = ""; }; + A954AA5313EE9A2B0094E3FE /* QueryToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryToken.h; sourceTree = ""; }; + A954AA5413EE9A2B0094E3FE /* TokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TokenList.cpp; sourceTree = ""; }; + A954AA5513EE9A2B0094E3FE /* TokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TokenList.h; sourceTree = ""; }; + A954AA5713EE9A2B0094E3FE /* BooleanClause.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BooleanClause.h; sourceTree = ""; }; + A954AA5813EE9A2B0094E3FE /* BooleanQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BooleanQuery.cpp; sourceTree = ""; }; + A954AA5913EE9A2B0094E3FE /* BooleanQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BooleanQuery.h; sourceTree = ""; }; + A954AA5A13EE9A2B0094E3FE /* BooleanScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BooleanScorer.cpp; sourceTree = ""; }; + A954AA5B13EE9A2B0094E3FE /* BooleanScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BooleanScorer.h; sourceTree = ""; }; + A954AA5C13EE9A2B0094E3FE /* CachingWrapperFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachingWrapperFilter.cpp; sourceTree = ""; }; + A954AA5D13EE9A2B0094E3FE /* CachingWrapperFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachingWrapperFilter.h; sourceTree = ""; }; + A954AA5E13EE9A2B0094E3FE /* ChainedFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChainedFilter.cpp; sourceTree = ""; }; + A954AA5F13EE9A2B0094E3FE /* ChainedFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChainedFilter.h; sourceTree = ""; }; + A954AA6013EE9A2B0094E3FE /* Compare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Compare.h; sourceTree = ""; }; + A954AA6113EE9A2B0094E3FE /* ConjunctionScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConjunctionScorer.cpp; sourceTree = ""; }; + A954AA6213EE9A2B0094E3FE /* ConjunctionScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConjunctionScorer.h; sourceTree = ""; }; + A954AA6313EE9A2B0094E3FE /* DateFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateFilter.cpp; sourceTree = ""; }; + A954AA6413EE9A2B0094E3FE /* DateFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateFilter.h; sourceTree = ""; }; + A954AA6513EE9A2B0094E3FE /* ExactPhraseScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExactPhraseScorer.cpp; sourceTree = ""; }; + A954AA6613EE9A2B0094E3FE /* ExactPhraseScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExactPhraseScorer.h; sourceTree = ""; }; + A954AA6713EE9A2B0094E3FE /* Explanation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Explanation.cpp; sourceTree = ""; }; + A954AA6813EE9A2B0094E3FE /* Explanation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Explanation.h; sourceTree = ""; }; + A954AA6913EE9A2B0094E3FE /* FieldCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldCache.cpp; sourceTree = ""; }; + A954AA6A13EE9A2B0094E3FE /* FieldCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldCache.h; sourceTree = ""; }; + A954AA6B13EE9A2B0094E3FE /* FieldCacheImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldCacheImpl.cpp; sourceTree = ""; }; + A954AA6C13EE9A2B0094E3FE /* FieldCacheImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldCacheImpl.h; sourceTree = ""; }; + A954AA6D13EE9A2B0094E3FE /* FieldDoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldDoc.h; sourceTree = ""; }; + A954AA6E13EE9A2B0094E3FE /* FieldDocSortedHitQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldDocSortedHitQueue.cpp; sourceTree = ""; }; + A954AA6F13EE9A2B0094E3FE /* FieldDocSortedHitQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldDocSortedHitQueue.h; sourceTree = ""; }; + A954AA7013EE9A2B0094E3FE /* FieldSortedHitQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldSortedHitQueue.cpp; sourceTree = ""; }; + A954AA7113EE9A2B0094E3FE /* FieldSortedHitQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldSortedHitQueue.h; sourceTree = ""; }; + A954AA7213EE9A2B0094E3FE /* Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Filter.h; sourceTree = ""; }; + A954AA7313EE9A2B0094E3FE /* FilteredTermEnum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilteredTermEnum.cpp; sourceTree = ""; }; + A954AA7413EE9A2B0094E3FE /* FilteredTermEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilteredTermEnum.h; sourceTree = ""; }; + A954AA7513EE9A2B0094E3FE /* FuzzyQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FuzzyQuery.cpp; sourceTree = ""; }; + A954AA7613EE9A2B0094E3FE /* FuzzyQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FuzzyQuery.h; sourceTree = ""; }; + A954AA7713EE9A2B0094E3FE /* HitQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HitQueue.cpp; sourceTree = ""; }; + A954AA7813EE9A2B0094E3FE /* HitQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HitQueue.h; sourceTree = ""; }; + A954AA7913EE9A2B0094E3FE /* Hits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Hits.cpp; sourceTree = ""; }; + A954AA7A13EE9A2B0094E3FE /* IndexSearcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexSearcher.cpp; sourceTree = ""; }; + A954AA7B13EE9A2B0094E3FE /* IndexSearcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexSearcher.h; sourceTree = ""; }; + A954AA7C13EE9A2B0094E3FE /* MultiSearcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiSearcher.cpp; sourceTree = ""; }; + A954AA7D13EE9A2B0094E3FE /* MultiSearcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiSearcher.h; sourceTree = ""; }; + A954AA7E13EE9A2B0094E3FE /* MultiTermQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiTermQuery.cpp; sourceTree = ""; }; + A954AA7F13EE9A2B0094E3FE /* MultiTermQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiTermQuery.h; sourceTree = ""; }; + A954AA8013EE9A2B0094E3FE /* PhrasePositions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhrasePositions.cpp; sourceTree = ""; }; + A954AA8113EE9A2B0094E3FE /* PhrasePositions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhrasePositions.h; sourceTree = ""; }; + A954AA8213EE9A2B0094E3FE /* PhraseQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhraseQuery.cpp; sourceTree = ""; }; + A954AA8313EE9A2B0094E3FE /* PhraseQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhraseQuery.h; sourceTree = ""; }; + A954AA8413EE9A2B0094E3FE /* PhraseQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhraseQueue.h; sourceTree = ""; }; + A954AA8513EE9A2B0094E3FE /* PhraseScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhraseScorer.cpp; sourceTree = ""; }; + A954AA8613EE9A2B0094E3FE /* PhraseScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhraseScorer.h; sourceTree = ""; }; + A954AA8713EE9A2B0094E3FE /* PrefixQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrefixQuery.cpp; sourceTree = ""; }; + A954AA8813EE9A2B0094E3FE /* PrefixQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefixQuery.h; sourceTree = ""; }; + A954AA8913EE9A2B0094E3FE /* QueryFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryFilter.cpp; sourceTree = ""; }; + A954AA8A13EE9A2B0094E3FE /* QueryFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryFilter.h; sourceTree = ""; }; + A954AA8B13EE9A2B0094E3FE /* RangeFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RangeFilter.cpp; sourceTree = ""; }; + A954AA8C13EE9A2B0094E3FE /* RangeFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RangeFilter.h; sourceTree = ""; }; + A954AA8D13EE9A2B0094E3FE /* RangeQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RangeQuery.cpp; sourceTree = ""; }; + A954AA8E13EE9A2B0094E3FE /* RangeQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RangeQuery.h; sourceTree = ""; }; + A954AA8F13EE9A2B0094E3FE /* Scorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scorer.h; sourceTree = ""; }; + A954AA9013EE9A2B0094E3FE /* SearchHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SearchHeader.cpp; sourceTree = ""; }; + A954AA9113EE9A2B0094E3FE /* SearchHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchHeader.h; sourceTree = ""; }; + A954AA9213EE9A2B0094E3FE /* Similarity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Similarity.cpp; sourceTree = ""; }; + A954AA9313EE9A2B0094E3FE /* Similarity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Similarity.h; sourceTree = ""; }; + A954AA9413EE9A2B0094E3FE /* SloppyPhraseScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SloppyPhraseScorer.cpp; sourceTree = ""; }; + A954AA9513EE9A2B0094E3FE /* SloppyPhraseScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SloppyPhraseScorer.h; sourceTree = ""; }; + A954AA9613EE9A2B0094E3FE /* Sort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sort.cpp; sourceTree = ""; }; + A954AA9713EE9A2B0094E3FE /* Sort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sort.h; sourceTree = ""; }; + A954AA9813EE9A2B0094E3FE /* TermQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermQuery.cpp; sourceTree = ""; }; + A954AA9913EE9A2B0094E3FE /* TermQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermQuery.h; sourceTree = ""; }; + A954AA9A13EE9A2B0094E3FE /* TermScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermScorer.cpp; sourceTree = ""; }; + A954AA9B13EE9A2B0094E3FE /* TermScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermScorer.h; sourceTree = ""; }; + A954AA9C13EE9A2B0094E3FE /* WildcardQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WildcardQuery.cpp; sourceTree = ""; }; + A954AA9D13EE9A2B0094E3FE /* WildcardQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WildcardQuery.h; sourceTree = ""; }; + A954AA9E13EE9A2B0094E3FE /* WildcardTermEnum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WildcardTermEnum.cpp; sourceTree = ""; }; + A954AA9F13EE9A2B0094E3FE /* WildcardTermEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WildcardTermEnum.h; sourceTree = ""; }; + A954AAA013EE9A2B0094E3FE /* StdHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StdHeader.cpp; sourceTree = ""; }; + A954AAA113EE9A2B0094E3FE /* StdHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StdHeader.h; sourceTree = ""; }; + A954AAA313EE9A2B0094E3FE /* Directory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Directory.h; sourceTree = ""; }; + A954AAA413EE9A2B0094E3FE /* FSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FSDirectory.cpp; sourceTree = ""; }; + A954AAA513EE9A2B0094E3FE /* FSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSDirectory.h; sourceTree = ""; }; + A954AAA613EE9A2B0094E3FE /* IndexInput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexInput.cpp; sourceTree = ""; }; + A954AAA713EE9A2B0094E3FE /* IndexInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexInput.h; sourceTree = ""; }; + A954AAA813EE9A2B0094E3FE /* IndexOutput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexOutput.cpp; sourceTree = ""; }; + A954AAA913EE9A2B0094E3FE /* IndexOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexOutput.h; sourceTree = ""; }; + A954AAAA13EE9A2B0094E3FE /* InputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputStream.h; sourceTree = ""; }; + A954AAAB13EE9A2B0094E3FE /* Lock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lock.cpp; sourceTree = ""; }; + A954AAAC13EE9A2B0094E3FE /* Lock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lock.h; sourceTree = ""; }; + A954AAAD13EE9A2B0094E3FE /* MMapInput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MMapInput.cpp; sourceTree = ""; }; + A954AAAE13EE9A2B0094E3FE /* OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputStream.h; sourceTree = ""; }; + A954AAAF13EE9A2B0094E3FE /* RAMDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RAMDirectory.cpp; sourceTree = ""; }; + A954AAB013EE9A2B0094E3FE /* RAMDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAMDirectory.h; sourceTree = ""; }; + A954AAB113EE9A2B0094E3FE /* TransactionalRAMDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransactionalRAMDirectory.cpp; sourceTree = ""; }; + A954AAB213EE9A2B0094E3FE /* TransactionalRAMDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransactionalRAMDirectory.h; sourceTree = ""; }; + A954AAB413EE9A2B0094E3FE /* Arrays.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Arrays.h; sourceTree = ""; }; + A954AAB513EE9A2B0094E3FE /* BitSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitSet.cpp; sourceTree = ""; }; + A954AAB613EE9A2B0094E3FE /* BitSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitSet.h; sourceTree = ""; }; + A954AAB713EE9A2B0094E3FE /* bufferedstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bufferedstream.h; sourceTree = ""; }; + A954AAB813EE9A2B0094E3FE /* dirent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dirent.cpp; sourceTree = ""; }; + A954AAB913EE9A2B0094E3FE /* dirent2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dirent2.h; sourceTree = ""; }; + A954AABA13EE9A2B0094E3FE /* Equators.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Equators.cpp; sourceTree = ""; }; + A954AABB13EE9A2B0094E3FE /* Equators.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Equators.h; sourceTree = ""; }; + A954AABC13EE9A2B0094E3FE /* FastCharStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FastCharStream.cpp; sourceTree = ""; }; + A954AABD13EE9A2B0094E3FE /* FastCharStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastCharStream.h; sourceTree = ""; }; + A954AABE13EE9A2B0094E3FE /* fileinputstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fileinputstream.cpp; sourceTree = ""; }; + A954AABF13EE9A2B0094E3FE /* fileinputstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fileinputstream.h; sourceTree = ""; }; + A954AAC013EE9A2B0094E3FE /* googlesparsemap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = googlesparsemap.h; sourceTree = ""; }; + A954AAC113EE9A2B0094E3FE /* inputstreambuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inputstreambuffer.h; sourceTree = ""; }; + A954AAC213EE9A2B0094E3FE /* jstreamsconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jstreamsconfig.h; sourceTree = ""; }; + A954AAC313EE9A2B0094E3FE /* MD5Digester.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MD5Digester.cpp; sourceTree = ""; }; + A954AAC413EE9A2B0094E3FE /* MD5Digester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MD5Digester.h; sourceTree = ""; }; + A954AAC513EE9A2B0094E3FE /* Misc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Misc.cpp; sourceTree = ""; }; + A954AAC613EE9A2B0094E3FE /* Misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Misc.h; sourceTree = ""; }; + A954AAC713EE9A2B0094E3FE /* PriorityQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriorityQueue.h; sourceTree = ""; }; + A954AAC813EE9A2B0094E3FE /* Reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Reader.cpp; sourceTree = ""; }; + A954AAC913EE9A2B0094E3FE /* Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reader.h; sourceTree = ""; }; + A954AACA13EE9A2B0094E3FE /* streambase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = streambase.h; sourceTree = ""; }; + A954AACB13EE9A2B0094E3FE /* StringBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringBuffer.cpp; sourceTree = ""; }; + A954AACC13EE9A2B0094E3FE /* StringBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringBuffer.h; sourceTree = ""; }; + A954AACD13EE9A2B0094E3FE /* StringIntern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringIntern.cpp; sourceTree = ""; }; + A954AACE13EE9A2B0094E3FE /* StringIntern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringIntern.h; sourceTree = ""; }; + A954AACF13EE9A2B0094E3FE /* stringreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringreader.h; sourceTree = ""; }; + A954AAD013EE9A2B0094E3FE /* subinputstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = subinputstream.h; sourceTree = ""; }; + A954AAD113EE9A2B0094E3FE /* ThreadLocal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadLocal.cpp; sourceTree = ""; }; + A954AAD213EE9A2B0094E3FE /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = ""; }; + A954AAD313EE9A2B0094E3FE /* VoidList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoidList.h; sourceTree = ""; }; + A954AAD413EE9A2B0094E3FE /* VoidMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoidMap.h; sourceTree = ""; }; + A954AAD513EE9A2B0094E3FE /* CLucene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLucene.h; sourceTree = ""; }; + A954ABC313EE9AB00094E3FE /* libsword.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsword.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + A954AC3213EE9F620094E3FE /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = SDKs/MacOSX10.7.sdk/usr/lib/libcurl.dylib; sourceTree = DEVELOPER_DIR; }; + A954AC3413EE9FA10094E3FE /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = SDKs/MacOSX10.7.sdk/usr/lib/libicucore.dylib; sourceTree = DEVELOPER_DIR; }; + A954AC3513EE9FA10094E3FE /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "SDKs/MacOSX10.7.sdk/usr/lib/libstdc++.dylib"; sourceTree = DEVELOPER_DIR; }; + A954AC3613EE9FA10094E3FE /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = SDKs/MacOSX10.7.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; + A964658011C663E200640FAC /* SwordManagerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManagerTest.h; path = ../test/SwordManagerTest.h; sourceTree = ""; }; + A964658111C663E200640FAC /* SwordManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordManagerTest.m; path = ../test/SwordManagerTest.m; sourceTree = ""; }; + A96C233E176AF139008D714B /* gzclose.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzclose.c; sourceTree = ""; }; + A96C2340176AF139008D714B /* gzlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzlib.c; sourceTree = ""; }; + A96C2341176AF139008D714B /* gzread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzread.c; sourceTree = ""; }; + A96C2342176AF139008D714B /* gzwrite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzwrite.c; sourceTree = ""; }; + A96C2343176AF139008D714B /* infback.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = infback.c; sourceTree = ""; }; + A96C2351176AF188008D714B /* remotetrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = remotetrans.cpp; sourceTree = ""; }; + A96C2353176AF19C008D714B /* osisenum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisenum.cpp; sourceTree = ""; }; + A96C2354176AF19C008D714B /* osisglosses.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisglosses.cpp; sourceTree = ""; }; + A96C2355176AF19C008D714B /* osisxlit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisxlit.cpp; sourceTree = ""; }; + A96C2355176AF19C008D714B /* osisreferencelinks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisreferencelinks.cpp; sourceTree = ""; }; A975EAC411C77862007C1532 /* ObjCSword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword.h; sourceTree = ""; }; A975ED9811C7925C007C1532 /* imp2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2gbs.cpp; sourceTree = ""; }; A975ED9911C7925C007C1532 /* imp2ld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2ld.cpp; sourceTree = ""; }; @@ -510,602 +1146,47 @@ A975EDDB11C7925C007C1532 /* xml2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml2gbs.cpp; sourceTree = ""; }; A975EED911C792B9007C1532 /* mod2osis */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2osis; sourceTree = BUILT_PRODUCTS_DIR; }; A9921A1911FD9CA8002DAA72 /* libSword.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSword.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + A999FF3917951C8900E65919 /* bz2comprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bz2comprs.cpp; sourceTree = ""; }; + A999FF3A17951C8900E65919 /* xzcomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xzcomprs.cpp; sourceTree = ""; }; + A999FF3D17951CA000E65919 /* scsuutf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scsuutf8.cpp; sourceTree = ""; }; A9A2C17C118D9D3D0002873D /* Notifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Notifications.h; path = src/Notifications.h; sourceTree = ""; }; + A9A7EEB414D5D61700B76B6A /* osis2mod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = osis2mod; sourceTree = BUILT_PRODUCTS_DIR; }; A9BDFA6B1207F9870067ED5B /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; - A9BDFA6E1207F9870067ED5B /* Tests-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info copy.plist"; sourceTree = ""; }; - A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKeyTest.h; path = test/SwordListKeyTest.h; sourceTree = ""; }; - A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordListKeyTest.m; path = test/SwordListKeyTest.m; sourceTree = ""; }; - A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleLongRunTest.h; path = test/SwordModuleLongRunTest.h; sourceTree = ""; }; - A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModuleLongRunTest.mm; path = test/SwordModuleLongRunTest.mm; sourceTree = ""; }; - A9BDFA841207FC8C0067ED5B /* ImageModuleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageModuleTest.h; path = ../../../../test/ImageModuleTest.h; sourceTree = SOURCE_ROOT; }; - A9BDFA851207FC8C0067ED5B /* ImageModuleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ImageModuleTest.m; path = ../../../../test/ImageModuleTest.m; sourceTree = SOURCE_ROOT; }; + A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKeyTest.h; path = ../test/SwordListKeyTest.h; sourceTree = ""; }; + A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordListKeyTest.m; path = ../test/SwordListKeyTest.m; sourceTree = ""; }; + A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleLongRunTest.h; path = ../test/SwordModuleLongRunTest.h; sourceTree = ""; }; + A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModuleLongRunTest.mm; path = ../test/SwordModuleLongRunTest.mm; sourceTree = ""; }; + A9BFB0A213EDF51000032679 /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; + A9BFB0A413EDF51000032679 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; + A9BFB0A613EDF51100032679 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; + A9BFB0A913EDF51100032679 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + A9BFB0AA13EDF51100032679 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; + A9BFB0AB13EDF51100032679 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; - A9C2819611C43C4900803CB5 /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; - A9C2819711C43C4900803CB5 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; A9C2856D11C446B700803CB5 /* Configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Configuration.h; path = src/services/Configuration.h; sourceTree = ""; }; A9C2857111C4471400803CB5 /* OSXConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OSXConfiguration.h; path = src/services/OSXConfiguration.h; sourceTree = ""; }; A9C2857211C4471400803CB5 /* OSXConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OSXConfiguration.m; path = src/services/OSXConfiguration.m; sourceTree = ""; }; A9C2858211C44A0A00803CB5 /* Configuration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Configuration.m; path = src/services/Configuration.m; sourceTree = ""; }; + A9D2714E14D717D800DA8926 /* imp2gbs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = imp2gbs; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D2715B14D717FD00DA8926 /* imp2ld */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = imp2ld; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D2716814D7181200DA8926 /* imp2vs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = imp2vs; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D2717514D7182300DA8926 /* installmgr */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = installmgr; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D2718214D7183B00DA8926 /* mod2imp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2imp; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D2718F14D7185800DA8926 /* mod2vpl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2vpl; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D2719C14D7186A00DA8926 /* mod2zmod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2zmod; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D271A914D7187E00DA8926 /* step2vpl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = step2vpl; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D271B614D7189300DA8926 /* stepdump */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = stepdump; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D271C314D718A400DA8926 /* tei2mod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tei2mod; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D271D014D718B800DA8926 /* vpl2mod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vpl2mod; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D271DD14D718C800DA8926 /* vs2osisref */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vs2osisref; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D271EA14D718DF00DA8926 /* vs2osisreftxt */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vs2osisreftxt; sourceTree = BUILT_PRODUCTS_DIR; }; + A9D271F714D718F500DA8926 /* xml2gbs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = xml2gbs; sourceTree = BUILT_PRODUCTS_DIR; }; A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SwordModule+Index.h"; path = "src/SwordModule+Index.h"; sourceTree = ""; }; A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "SwordModule+Index.mm"; path = "src/SwordModule+Index.mm"; sourceTree = ""; }; A9D437CE11C52947007AFE83 /* locales.d */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locales.d; path = ../../locales.d; sourceTree = SOURCE_ROOT; }; - A9D4399E11C52E9B007AFE83 /* canon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon.h; sourceTree = ""; }; - A9D4399F11C52E9B007AFE83 /* canon_abbrevs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_abbrevs.h; sourceTree = ""; }; - A9D439A011C52E9B007AFE83 /* canon_german.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_german.h; sourceTree = ""; }; - A9D439A111C52E9B007AFE83 /* canon_kjva.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_kjva.h; sourceTree = ""; }; - A9D439A211C52E9B007AFE83 /* canon_leningrad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_leningrad.h; sourceTree = ""; }; - A9D439A311C52E9B007AFE83 /* canon_luther.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_luther.h; sourceTree = ""; }; - A9D439A411C52E9B007AFE83 /* canon_mt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_mt.h; sourceTree = ""; }; - A9D439A511C52E9B007AFE83 /* canon_nrsv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_nrsv.h; sourceTree = ""; }; - A9D439A611C52E9B007AFE83 /* canon_nrsva.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_nrsva.h; sourceTree = ""; }; - A9D439A711C52E9B007AFE83 /* canon_null.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_null.h; sourceTree = ""; }; - A9D439A811C52E9B007AFE83 /* canon_synodal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_synodal.h; sourceTree = ""; }; - A9D439A911C52E9B007AFE83 /* canon_vulg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canon_vulg.h; sourceTree = ""; }; - A9D439AA11C52E9B007AFE83 /* cipherfil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cipherfil.h; sourceTree = ""; }; - A9D439AB11C52E9B007AFE83 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; }; - A9D439AD11C52E9B007AFE83 /* curlftpt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curlftpt.h; sourceTree = ""; }; - A9D439AE11C52E9B007AFE83 /* curlhttpt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curlhttpt.h; sourceTree = ""; }; - A9D439AF11C52E9B007AFE83 /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = ""; }; - A9D439B011C52E9B007AFE83 /* echomod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = echomod.h; sourceTree = ""; }; - A9D439B111C52E9B007AFE83 /* encfiltmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = encfiltmgr.h; sourceTree = ""; }; - A9D439B211C52E9B007AFE83 /* entriesblk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entriesblk.h; sourceTree = ""; }; - A9D439B311C52E9B007AFE83 /* femain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = femain.h; sourceTree = ""; }; - A9D439B411C52E9B007AFE83 /* filemgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filemgr.h; sourceTree = ""; }; - A9D439B511C52E9B007AFE83 /* flatapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flatapi.h; sourceTree = ""; }; - A9D439B611C52E9B007AFE83 /* ftplib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ftplib.h; sourceTree = ""; }; - A9D439B711C52E9B007AFE83 /* ftplibftpt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ftplibftpt.h; sourceTree = ""; }; - A9D439B811C52E9B007AFE83 /* ftpparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ftpparse.h; sourceTree = ""; }; - A9D439B911C52E9B007AFE83 /* ftptrans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ftptrans.h; sourceTree = ""; }; - A9D439BA11C52E9B007AFE83 /* gbffootnotes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbffootnotes.h; sourceTree = ""; }; - A9D439BB11C52E9B007AFE83 /* gbfheadings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfheadings.h; sourceTree = ""; }; - A9D439BC11C52E9B007AFE83 /* gbfhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfhtml.h; sourceTree = ""; }; - A9D439BD11C52E9B007AFE83 /* gbfhtmlhref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfhtmlhref.h; sourceTree = ""; }; - A9D439BE11C52E9B007AFE83 /* gbfmorph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfmorph.h; sourceTree = ""; }; - A9D439BF11C52E9B007AFE83 /* gbfosis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfosis.h; sourceTree = ""; }; - A9D439C011C52E9B007AFE83 /* gbfplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfplain.h; sourceTree = ""; }; - A9D439C111C52E9B007AFE83 /* gbfredletterwords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfredletterwords.h; sourceTree = ""; }; - A9D439C211C52E9B007AFE83 /* gbfrtf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfrtf.h; sourceTree = ""; }; - A9D439C311C52E9B007AFE83 /* gbfstrongs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfstrongs.h; sourceTree = ""; }; - A9D439C411C52E9B007AFE83 /* gbfthml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfthml.h; sourceTree = ""; }; - A9D439C511C52E9B007AFE83 /* gbfwebif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfwebif.h; sourceTree = ""; }; - A9D439C611C52E9B007AFE83 /* gbfwordjs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gbfwordjs.h; sourceTree = ""; }; - A9D439C711C52E9B007AFE83 /* Greek2Greek.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Greek2Greek.h; sourceTree = ""; }; - A9D439C811C52E9B007AFE83 /* GreekChars.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GreekChars.h; sourceTree = ""; }; - A9D439C911C52E9B007AFE83 /* greeklexattribs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = greeklexattribs.h; sourceTree = ""; }; - A9D439CA11C52E9B007AFE83 /* hebrewmcim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hebrewmcim.h; sourceTree = ""; }; - A9D439CB11C52E9B007AFE83 /* hrefcom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hrefcom.h; sourceTree = ""; }; - A9D439CC11C52E9B007AFE83 /* installmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = installmgr.h; sourceTree = ""; }; - A9D439CF11C52E9B007AFE83 /* regex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = regex.h; sourceTree = ""; }; - A9D439D011C52E9B007AFE83 /* latin1utf16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = latin1utf16.h; sourceTree = ""; }; - A9D439D111C52E9B007AFE83 /* latin1utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = latin1utf8.h; sourceTree = ""; }; - A9D439D211C52E9B007AFE83 /* listkey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = listkey.h; sourceTree = ""; }; - A9D439D311C52E9B007AFE83 /* localemgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = localemgr.h; sourceTree = ""; }; - A9D439D411C52E9B007AFE83 /* lzsscomprs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzsscomprs.h; sourceTree = ""; }; - A9D439D711C52E9B007AFE83 /* markupfiltmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = markupfiltmgr.h; sourceTree = ""; }; - A9D439D811C52E9B007AFE83 /* multimapwdef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = multimapwdef.h; sourceTree = ""; }; - A9D439D911C52E9B007AFE83 /* nullim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nullim.h; sourceTree = ""; }; - A9D439DA11C52E9B007AFE83 /* osisfootnotes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisfootnotes.h; sourceTree = ""; }; - A9D439DB11C52E9B007AFE83 /* osisheadings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisheadings.h; sourceTree = ""; }; - A9D439DC11C52E9B007AFE83 /* osishtmlhref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osishtmlhref.h; sourceTree = ""; }; - A9D439DD11C52E9B007AFE83 /* osislemma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osislemma.h; sourceTree = ""; }; - A9D439DE11C52E9B007AFE83 /* osismorph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osismorph.h; sourceTree = ""; }; - A9D439DF11C52E9B007AFE83 /* osismorphsegmentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osismorphsegmentation.h; sourceTree = ""; }; - A9D439E011C52E9B007AFE83 /* osisosis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisosis.h; sourceTree = ""; }; - A9D439E111C52E9B007AFE83 /* osisplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisplain.h; sourceTree = ""; }; - A9D439E211C52E9B007AFE83 /* osisredletterwords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisredletterwords.h; sourceTree = ""; }; - A9D439E311C52E9B007AFE83 /* osisrtf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisrtf.h; sourceTree = ""; }; - A9D439E411C52E9B007AFE83 /* osisruby.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisruby.h; sourceTree = ""; }; - A9D439E511C52E9B007AFE83 /* osisscripref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisscripref.h; sourceTree = ""; }; - A9D439E611C52E9B007AFE83 /* osisstrongs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisstrongs.h; sourceTree = ""; }; - A9D439E711C52E9B007AFE83 /* osisvariants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osisvariants.h; sourceTree = ""; }; - A9D439E811C52E9B007AFE83 /* osiswebif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osiswebif.h; sourceTree = ""; }; - A9D439E911C52E9B007AFE83 /* osiswordjs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osiswordjs.h; sourceTree = ""; }; - A9D439EA11C52E9B007AFE83 /* papyriplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = papyriplain.h; sourceTree = ""; }; - A9D439EB11C52E9B007AFE83 /* plainfootnotes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plainfootnotes.h; sourceTree = ""; }; - A9D439EC11C52E9B007AFE83 /* plainhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plainhtml.h; sourceTree = ""; }; - A9D439ED11C52E9B007AFE83 /* rawcom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawcom.h; sourceTree = ""; }; - A9D439EE11C52E9B007AFE83 /* rawcom4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawcom4.h; sourceTree = ""; }; - A9D439EF11C52E9B007AFE83 /* rawfiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawfiles.h; sourceTree = ""; }; - A9D439F011C52E9B007AFE83 /* rawgenbook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawgenbook.h; sourceTree = ""; }; - A9D439F111C52E9B007AFE83 /* rawld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawld.h; sourceTree = ""; }; - A9D439F211C52E9B007AFE83 /* rawld4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawld4.h; sourceTree = ""; }; - A9D439F311C52E9B007AFE83 /* rawstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawstr.h; sourceTree = ""; }; - A9D439F411C52E9B007AFE83 /* rawstr4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawstr4.h; sourceTree = ""; }; - A9D439F511C52E9B007AFE83 /* rawtext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawtext.h; sourceTree = ""; }; - A9D439F611C52E9B007AFE83 /* rawtext4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawtext4.h; sourceTree = ""; }; - A9D439F711C52E9B007AFE83 /* rawverse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawverse.h; sourceTree = ""; }; - A9D439F811C52E9B007AFE83 /* rawverse4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawverse4.h; sourceTree = ""; }; - A9D439F911C52E9B007AFE83 /* roman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = roman.h; sourceTree = ""; }; - A9D439FA11C52E9B007AFE83 /* rtfhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rtfhtml.h; sourceTree = ""; }; - A9D439FB11C52E9B007AFE83 /* sapphire.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sapphire.h; sourceTree = ""; }; - A9D439FD11C52E9B007AFE83 /* stringmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringmgr.h; sourceTree = ""; }; - A9D439FE11C52E9B007AFE83 /* strkey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strkey.h; sourceTree = ""; }; - A9D439FF11C52E9B007AFE83 /* swbasicfilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swbasicfilter.h; sourceTree = ""; }; - A9D43A0011C52E9B007AFE83 /* swbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swbuf.h; sourceTree = ""; }; - A9D43A0111C52E9B007AFE83 /* swcacher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swcacher.h; sourceTree = ""; }; - A9D43A0211C52E9B007AFE83 /* swcipher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swcipher.h; sourceTree = ""; }; - A9D43A0311C52E9B007AFE83 /* swcom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swcom.h; sourceTree = ""; }; - A9D43A0411C52E9B007AFE83 /* swcomprs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swcomprs.h; sourceTree = ""; }; - A9D43A0511C52E9B007AFE83 /* swconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swconfig.h; sourceTree = ""; }; - A9D43A0611C52E9B007AFE83 /* swdisp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swdisp.h; sourceTree = ""; }; - A9D43A0711C52E9B007AFE83 /* swfilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swfilter.h; sourceTree = ""; }; - A9D43A0811C52E9B007AFE83 /* swfiltermgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swfiltermgr.h; sourceTree = ""; }; - A9D43A0911C52E9B007AFE83 /* swgenbook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swgenbook.h; sourceTree = ""; }; - A9D43A0A11C52E9B007AFE83 /* swinputmeth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swinputmeth.h; sourceTree = ""; }; - A9D43A0B11C52E9B007AFE83 /* swkey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swkey.h; sourceTree = ""; }; - A9D43A0C11C52E9B007AFE83 /* swld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swld.h; sourceTree = ""; }; - A9D43A0D11C52E9B007AFE83 /* swlocale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swlocale.h; sourceTree = ""; }; - A9D43A0E11C52E9B007AFE83 /* swlog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swlog.h; sourceTree = ""; }; - A9D43A0F11C52E9B007AFE83 /* swmacs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swmacs.h; sourceTree = ""; }; - A9D43A1011C52E9B007AFE83 /* swmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swmgr.h; sourceTree = ""; }; - A9D43A1111C52E9B007AFE83 /* swmodule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swmodule.h; sourceTree = ""; }; - A9D43A1211C52E9B007AFE83 /* swobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swobject.h; sourceTree = ""; }; - A9D43A1311C52E9B007AFE83 /* swoptfilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swoptfilter.h; sourceTree = ""; }; - A9D43A1511C52E9B007AFE83 /* swsearchable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swsearchable.h; sourceTree = ""; }; - A9D43A1611C52E9B007AFE83 /* swtext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swtext.h; sourceTree = ""; }; - A9D43A1711C52E9B007AFE83 /* swunicod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swunicod.h; sourceTree = ""; }; - A9D43A1811C52E9B007AFE83 /* swversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swversion.h; sourceTree = ""; }; - A9D43A1911C52E9B007AFE83 /* sysdata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysdata.h; sourceTree = ""; }; - A9D43A1A11C52E9B007AFE83 /* teihtmlhref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = teihtmlhref.h; sourceTree = ""; }; - A9D43A1B11C52E9B007AFE83 /* teiplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = teiplain.h; sourceTree = ""; }; - A9D43A1C11C52E9B007AFE83 /* teirtf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = teirtf.h; sourceTree = ""; }; - A9D43A1D11C52E9B007AFE83 /* thmlfootnotes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlfootnotes.h; sourceTree = ""; }; - A9D43A1E11C52E9B007AFE83 /* thmlgbf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlgbf.h; sourceTree = ""; }; - A9D43A1F11C52E9B007AFE83 /* thmlheadings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlheadings.h; sourceTree = ""; }; - A9D43A2011C52E9B007AFE83 /* thmlhtml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlhtml.h; sourceTree = ""; }; - A9D43A2111C52E9B007AFE83 /* thmlhtmlhref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlhtmlhref.h; sourceTree = ""; }; - A9D43A2211C52E9B007AFE83 /* thmllemma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmllemma.h; sourceTree = ""; }; - A9D43A2311C52E9B007AFE83 /* thmlmorph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlmorph.h; sourceTree = ""; }; - A9D43A2411C52E9B007AFE83 /* thmlosis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlosis.h; sourceTree = ""; }; - A9D43A2511C52E9B007AFE83 /* thmlplain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlplain.h; sourceTree = ""; }; - A9D43A2611C52E9B007AFE83 /* thmlrtf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlrtf.h; sourceTree = ""; }; - A9D43A2711C52E9B007AFE83 /* thmlscripref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlscripref.h; sourceTree = ""; }; - A9D43A2811C52E9B007AFE83 /* thmlstrongs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlstrongs.h; sourceTree = ""; }; - A9D43A2911C52E9B007AFE83 /* thmlvariants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlvariants.h; sourceTree = ""; }; - A9D43A2A11C52E9B007AFE83 /* thmlwebif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlwebif.h; sourceTree = ""; }; - A9D43A2B11C52E9B007AFE83 /* thmlwordjs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thmlwordjs.h; sourceTree = ""; }; - A9D43A2C11C52E9B007AFE83 /* treekey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = treekey.h; sourceTree = ""; }; - A9D43A2D11C52E9B007AFE83 /* treekeyidx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = treekeyidx.h; sourceTree = ""; }; - A9D43A2E11C52E9B007AFE83 /* unicodertf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unicodertf.h; sourceTree = ""; }; - A9D43A2F11C52E9B007AFE83 /* untgz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = untgz.h; sourceTree = ""; }; - A9D43A3011C52E9B007AFE83 /* url.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url.h; sourceTree = ""; }; - A9D43A3111C52E9B007AFE83 /* utf16utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf16utf8.h; sourceTree = ""; }; - A9D43A3211C52E9B007AFE83 /* utf8arabicpoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8arabicpoints.h; sourceTree = ""; }; - A9D43A3311C52E9B007AFE83 /* utf8arshaping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8arshaping.h; sourceTree = ""; }; - A9D43A3411C52E9B007AFE83 /* utf8bidireorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8bidireorder.h; sourceTree = ""; }; - A9D43A3511C52E9B007AFE83 /* utf8cantillation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8cantillation.h; sourceTree = ""; }; - A9D43A3611C52E9B007AFE83 /* utf8greekaccents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8greekaccents.h; sourceTree = ""; }; - A9D43A3711C52E9B007AFE83 /* utf8hebrewpoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8hebrewpoints.h; sourceTree = ""; }; - A9D43A3811C52E9B007AFE83 /* utf8html.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8html.h; sourceTree = ""; }; - A9D43A3911C52E9B007AFE83 /* utf8latin1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8latin1.h; sourceTree = ""; }; - A9D43A3A11C52E9B007AFE83 /* utf8nfc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8nfc.h; sourceTree = ""; }; - A9D43A3B11C52E9B007AFE83 /* utf8nfkd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8nfkd.h; sourceTree = ""; }; - A9D43A3C11C52E9B007AFE83 /* utf8transliterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8transliterator.h; sourceTree = ""; }; - A9D43A3D11C52E9B007AFE83 /* utf8utf16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8utf16.h; sourceTree = ""; }; - A9D43A3E11C52E9B007AFE83 /* utilstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utilstr.h; sourceTree = ""; }; - A9D43A3F11C52E9B007AFE83 /* utilxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utilxml.h; sourceTree = ""; }; - A9D43A4011C52E9B007AFE83 /* versekey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = versekey.h; sourceTree = ""; }; - A9D43A4111C52E9B007AFE83 /* versemgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = versemgr.h; sourceTree = ""; }; - A9D43A4211C52E9B007AFE83 /* versetreekey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = versetreekey.h; sourceTree = ""; }; - A9D43A4311C52E9B007AFE83 /* zcom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zcom.h; sourceTree = ""; }; - A9D43A4411C52E9B007AFE83 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = ""; }; - A9D43A4511C52E9B007AFE83 /* zipcomprs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zipcomprs.h; sourceTree = ""; }; - A9D43A4611C52E9B007AFE83 /* zld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zld.h; sourceTree = ""; }; - A9D43A4711C52E9B007AFE83 /* zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zlib.h; sourceTree = ""; }; - A9D43A4811C52E9B007AFE83 /* zstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zstr.h; sourceTree = ""; }; - A9D43A4911C52E9B007AFE83 /* ztext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ztext.h; sourceTree = ""; }; - A9D43A4A11C52E9B007AFE83 /* zverse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zverse.h; sourceTree = ""; }; - A9EF13B21205952C0078A27C /* libSword.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSword.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teixhtml.cpp; sourceTree = ""; }; A9EF1414120595650078A27C /* SwordLocaleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordLocaleManager.h; path = src/SwordLocaleManager.h; sourceTree = ""; }; A9EF1415120595650078A27C /* SwordLocaleManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordLocaleManager.mm; path = src/SwordLocaleManager.mm; sourceTree = ""; }; - A9FB264511FD95CD004C4295 /* AnalysisHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnalysisHeader.cpp; sourceTree = ""; }; - A9FB264611FD95CD004C4295 /* AnalysisHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnalysisHeader.h; sourceTree = ""; }; - A9FB264711FD95CD004C4295 /* Analyzers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Analyzers.cpp; sourceTree = ""; }; - A9FB264811FD95CD004C4295 /* Analyzers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Analyzers.h; sourceTree = ""; }; - A9FB264A11FD95CD004C4295 /* StandardAnalyzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StandardAnalyzer.cpp; sourceTree = ""; }; - A9FB264B11FD95CD004C4295 /* StandardAnalyzer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardAnalyzer.h; sourceTree = ""; }; - A9FB264C11FD95CD004C4295 /* StandardFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StandardFilter.cpp; sourceTree = ""; }; - A9FB264D11FD95CD004C4295 /* StandardFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardFilter.h; sourceTree = ""; }; - A9FB264E11FD95CD004C4295 /* StandardTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StandardTokenizer.cpp; sourceTree = ""; }; - A9FB264F11FD95CD004C4295 /* StandardTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardTokenizer.h; sourceTree = ""; }; - A9FB265011FD95CD004C4295 /* StandardTokenizerConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardTokenizerConstants.h; sourceTree = ""; }; - A9FB265111FD95CD004C4295 /* CLBackwards.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLBackwards.h; sourceTree = ""; }; - A9FB265211FD95CD004C4295 /* CLConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLConfig.h; sourceTree = ""; }; - A9FB265311FD95CD004C4295 /* clucene-config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "clucene-config.h"; sourceTree = ""; }; - A9FB265511FD95CD004C4295 /* compiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compiler.h; sourceTree = ""; }; - A9FB265611FD95CD004C4295 /* CompilerBcb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompilerBcb.h; sourceTree = ""; }; - A9FB265711FD95CD004C4295 /* CompilerGcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompilerGcc.h; sourceTree = ""; }; - A9FB265811FD95CD004C4295 /* CompilerMsvc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompilerMsvc.h; sourceTree = ""; }; - A9FB265911FD95CD004C4295 /* define_std.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = define_std.h; sourceTree = ""; }; - A9FB265A11FD95CD004C4295 /* gunichartables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gunichartables.cpp; sourceTree = ""; }; - A9FB265B11FD95CD004C4295 /* gunichartables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gunichartables.h; sourceTree = ""; }; - A9FB265C11FD95CD004C4295 /* PlatformMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMac.h; sourceTree = ""; }; - A9FB265D11FD95CD004C4295 /* PlatformUnix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformUnix.h; sourceTree = ""; }; - A9FB265E11FD95CD004C4295 /* PlatformWin32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformWin32.h; sourceTree = ""; }; - A9FB265F11FD95CD004C4295 /* repl_lltot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_lltot.cpp; sourceTree = ""; }; - A9FB266011FD95CD004C4295 /* repl_tchar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = repl_tchar.h; sourceTree = ""; }; - A9FB266111FD95CD004C4295 /* repl_tcscasecmp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcscasecmp.cpp; sourceTree = ""; }; - A9FB266211FD95CD004C4295 /* repl_tcslwr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcslwr.cpp; sourceTree = ""; }; - A9FB266311FD95CD004C4295 /* repl_tcstod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcstod.cpp; sourceTree = ""; }; - A9FB266411FD95CD004C4295 /* repl_tcstoll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcstoll.cpp; sourceTree = ""; }; - A9FB266511FD95CD004C4295 /* repl_tprintf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tprintf.cpp; sourceTree = ""; }; - A9FB266611FD95CD004C4295 /* repl_wchar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = repl_wchar.h; sourceTree = ""; }; - A9FB266711FD95CD004C4295 /* threadCSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threadCSection.h; sourceTree = ""; }; - A9FB266811FD95CD004C4295 /* threadPthread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threadPthread.h; sourceTree = ""; }; - A9FB266911FD95CD004C4295 /* threads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = threads.cpp; sourceTree = ""; }; - A9FB266A11FD95CD004C4295 /* utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8.cpp; sourceTree = ""; }; - A9FB266C11FD95CD004C4295 /* condition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = condition.cpp; sourceTree = ""; }; - A9FB266D11FD95CD004C4295 /* condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = condition.h; sourceTree = ""; }; - A9FB266E11FD95CD004C4295 /* error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = error.cpp; sourceTree = ""; }; - A9FB266F11FD95CD004C4295 /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = ""; }; - A9FB267011FD95CD004C4295 /* lucenebase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lucenebase.h; sourceTree = ""; }; - A9FB267111FD95CD004C4295 /* mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mem.h; sourceTree = ""; }; - A9FB267211FD95CD004C4295 /* memtracking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memtracking.cpp; sourceTree = ""; }; - A9FB267411FD95CD004C4295 /* DateField.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateField.cpp; sourceTree = ""; }; - A9FB267511FD95CD004C4295 /* DateField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateField.h; sourceTree = ""; }; - A9FB267611FD95CD004C4295 /* Document.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Document.cpp; sourceTree = ""; }; - A9FB267711FD95CD004C4295 /* Document.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Document.h; sourceTree = ""; }; - A9FB267811FD95CD004C4295 /* Field.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Field.cpp; sourceTree = ""; }; - A9FB267911FD95CD004C4295 /* Field.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Field.h; sourceTree = ""; }; - A9FB267B11FD95CD004C4295 /* CompoundFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompoundFile.cpp; sourceTree = ""; }; - A9FB267C11FD95CD004C4295 /* CompoundFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompoundFile.h; sourceTree = ""; }; - A9FB267D11FD95CD004C4295 /* DocumentWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentWriter.cpp; sourceTree = ""; }; - A9FB267E11FD95CD004C4295 /* DocumentWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentWriter.h; sourceTree = ""; }; - A9FB267F11FD95CD004C4295 /* FieldInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldInfo.h; sourceTree = ""; }; - A9FB268011FD95CD004C4295 /* FieldInfos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldInfos.cpp; sourceTree = ""; }; - A9FB268111FD95CD004C4295 /* FieldInfos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldInfos.h; sourceTree = ""; }; - A9FB268211FD95CD004C4295 /* FieldsReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldsReader.cpp; sourceTree = ""; }; - A9FB268311FD95CD004C4295 /* FieldsReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldsReader.h; sourceTree = ""; }; - A9FB268411FD95CD004C4295 /* FieldsWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldsWriter.cpp; sourceTree = ""; }; - A9FB268511FD95CD004C4295 /* FieldsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldsWriter.h; sourceTree = ""; }; - A9FB268611FD95CD004C4295 /* IndexModifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexModifier.cpp; sourceTree = ""; }; - A9FB268711FD95CD004C4295 /* IndexModifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexModifier.h; sourceTree = ""; }; - A9FB268811FD95CD004C4295 /* IndexReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexReader.cpp; sourceTree = ""; }; - A9FB268911FD95CD004C4295 /* IndexReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexReader.h; sourceTree = ""; }; - A9FB268A11FD95CD004C4295 /* IndexWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexWriter.cpp; sourceTree = ""; }; - A9FB268B11FD95CD004C4295 /* IndexWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexWriter.h; sourceTree = ""; }; - A9FB268C11FD95CD004C4295 /* MultiReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiReader.cpp; sourceTree = ""; }; - A9FB268D11FD95CD004C4295 /* MultiReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiReader.h; sourceTree = ""; }; - A9FB268E11FD95CD004C4295 /* SegmentHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentHeader.h; sourceTree = ""; }; - A9FB268F11FD95CD004C4295 /* SegmentInfos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentInfos.cpp; sourceTree = ""; }; - A9FB269011FD95CD004C4295 /* SegmentInfos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentInfos.h; sourceTree = ""; }; - A9FB269111FD95CD004C4295 /* SegmentMergeInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentMergeInfo.cpp; sourceTree = ""; }; - A9FB269211FD95CD004C4295 /* SegmentMergeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentMergeInfo.h; sourceTree = ""; }; - A9FB269311FD95CD004C4295 /* SegmentMergeQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentMergeQueue.cpp; sourceTree = ""; }; - A9FB269411FD95CD004C4295 /* SegmentMergeQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentMergeQueue.h; sourceTree = ""; }; - A9FB269511FD95CD004C4295 /* SegmentMerger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentMerger.cpp; sourceTree = ""; }; - A9FB269611FD95CD004C4295 /* SegmentMerger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentMerger.h; sourceTree = ""; }; - A9FB269711FD95CD004C4295 /* SegmentReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentReader.cpp; sourceTree = ""; }; - A9FB269811FD95CD004C4295 /* SegmentTermDocs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermDocs.cpp; sourceTree = ""; }; - A9FB269911FD95CD004C4295 /* SegmentTermEnum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermEnum.cpp; sourceTree = ""; }; - A9FB269A11FD95CD004C4295 /* SegmentTermEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentTermEnum.h; sourceTree = ""; }; - A9FB269B11FD95CD004C4295 /* SegmentTermPositions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermPositions.cpp; sourceTree = ""; }; - A9FB269C11FD95CD004C4295 /* SegmentTermVector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermVector.cpp; sourceTree = ""; }; - A9FB269D11FD95CD004C4295 /* Term.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Term.cpp; sourceTree = ""; }; - A9FB269E11FD95CD004C4295 /* Term.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Term.h; sourceTree = ""; }; - A9FB269F11FD95CD004C4295 /* TermInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermInfo.cpp; sourceTree = ""; }; - A9FB26A011FD95CD004C4295 /* TermInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermInfo.h; sourceTree = ""; }; - A9FB26A111FD95CD004C4295 /* TermInfosReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermInfosReader.cpp; sourceTree = ""; }; - A9FB26A211FD95CD004C4295 /* TermInfosReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermInfosReader.h; sourceTree = ""; }; - A9FB26A311FD95CD004C4295 /* TermInfosWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermInfosWriter.cpp; sourceTree = ""; }; - A9FB26A411FD95CD004C4295 /* TermInfosWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermInfosWriter.h; sourceTree = ""; }; - A9FB26A511FD95CD004C4295 /* Terms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Terms.h; sourceTree = ""; }; - A9FB26A611FD95CD004C4295 /* TermVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermVector.h; sourceTree = ""; }; - A9FB26A711FD95CD004C4295 /* TermVectorReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermVectorReader.cpp; sourceTree = ""; }; - A9FB26A811FD95CD004C4295 /* TermVectorWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermVectorWriter.cpp; sourceTree = ""; }; - A9FB26A911FD95CD004C4295 /* LuceneThreads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuceneThreads.h; sourceTree = ""; }; - A9FB26AB11FD95CD004C4295 /* Lexer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lexer.cpp; sourceTree = ""; }; - A9FB26AC11FD95CD004C4295 /* Lexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lexer.h; sourceTree = ""; }; - A9FB26AD11FD95CD004C4295 /* MultiFieldQueryParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiFieldQueryParser.cpp; sourceTree = ""; }; - A9FB26AE11FD95CD004C4295 /* MultiFieldQueryParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiFieldQueryParser.h; sourceTree = ""; }; - A9FB26AF11FD95CD004C4295 /* QueryParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryParser.cpp; sourceTree = ""; }; - A9FB26B011FD95CD004C4295 /* QueryParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryParser.h; sourceTree = ""; }; - A9FB26B111FD95CD004C4295 /* QueryParserBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryParserBase.cpp; sourceTree = ""; }; - A9FB26B211FD95CD004C4295 /* QueryParserBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryParserBase.h; sourceTree = ""; }; - A9FB26B311FD95CD004C4295 /* QueryToken.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryToken.cpp; sourceTree = ""; }; - A9FB26B411FD95CD004C4295 /* QueryToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryToken.h; sourceTree = ""; }; - A9FB26B511FD95CD004C4295 /* TokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TokenList.cpp; sourceTree = ""; }; - A9FB26B611FD95CD004C4295 /* TokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TokenList.h; sourceTree = ""; }; - A9FB26B811FD95CD004C4295 /* BooleanClause.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BooleanClause.h; sourceTree = ""; }; - A9FB26B911FD95CD004C4295 /* BooleanQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BooleanQuery.cpp; sourceTree = ""; }; - A9FB26BA11FD95CD004C4295 /* BooleanQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BooleanQuery.h; sourceTree = ""; }; - A9FB26BB11FD95CD004C4295 /* BooleanScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BooleanScorer.cpp; sourceTree = ""; }; - A9FB26BC11FD95CD004C4295 /* BooleanScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BooleanScorer.h; sourceTree = ""; }; - A9FB26BD11FD95CD004C4295 /* CachingWrapperFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachingWrapperFilter.cpp; sourceTree = ""; }; - A9FB26BE11FD95CD004C4295 /* CachingWrapperFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachingWrapperFilter.h; sourceTree = ""; }; - A9FB26BF11FD95CD004C4295 /* ChainedFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChainedFilter.cpp; sourceTree = ""; }; - A9FB26C011FD95CD004C4295 /* ChainedFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChainedFilter.h; sourceTree = ""; }; - A9FB26C111FD95CD004C4295 /* Compare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Compare.h; sourceTree = ""; }; - A9FB26C211FD95CD004C4295 /* ConjunctionScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConjunctionScorer.cpp; sourceTree = ""; }; - A9FB26C311FD95CD004C4295 /* ConjunctionScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConjunctionScorer.h; sourceTree = ""; }; - A9FB26C411FD95CD004C4295 /* DateFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateFilter.cpp; sourceTree = ""; }; - A9FB26C511FD95CD004C4295 /* DateFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateFilter.h; sourceTree = ""; }; - A9FB26C611FD95CD004C4295 /* ExactPhraseScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExactPhraseScorer.cpp; sourceTree = ""; }; - A9FB26C711FD95CD004C4295 /* ExactPhraseScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExactPhraseScorer.h; sourceTree = ""; }; - A9FB26C811FD95CD004C4295 /* Explanation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Explanation.cpp; sourceTree = ""; }; - A9FB26C911FD95CD004C4295 /* Explanation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Explanation.h; sourceTree = ""; }; - A9FB26CA11FD95CD004C4295 /* FieldCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldCache.cpp; sourceTree = ""; }; - A9FB26CB11FD95CD004C4295 /* FieldCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldCache.h; sourceTree = ""; }; - A9FB26CC11FD95CD004C4295 /* FieldCacheImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldCacheImpl.cpp; sourceTree = ""; }; - A9FB26CD11FD95CD004C4295 /* FieldCacheImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldCacheImpl.h; sourceTree = ""; }; - A9FB26CE11FD95CD004C4295 /* FieldDoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldDoc.h; sourceTree = ""; }; - A9FB26CF11FD95CD004C4295 /* FieldDocSortedHitQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldDocSortedHitQueue.cpp; sourceTree = ""; }; - A9FB26D011FD95CD004C4295 /* FieldDocSortedHitQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldDocSortedHitQueue.h; sourceTree = ""; }; - A9FB26D111FD95CD004C4295 /* FieldSortedHitQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldSortedHitQueue.cpp; sourceTree = ""; }; - A9FB26D211FD95CD004C4295 /* FieldSortedHitQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldSortedHitQueue.h; sourceTree = ""; }; - A9FB26D311FD95CD004C4295 /* Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Filter.h; sourceTree = ""; }; - A9FB26D411FD95CD004C4295 /* FilteredTermEnum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilteredTermEnum.cpp; sourceTree = ""; }; - A9FB26D511FD95CD004C4295 /* FilteredTermEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilteredTermEnum.h; sourceTree = ""; }; - A9FB26D611FD95CD004C4295 /* FuzzyQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FuzzyQuery.cpp; sourceTree = ""; }; - A9FB26D711FD95CD004C4295 /* FuzzyQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FuzzyQuery.h; sourceTree = ""; }; - A9FB26D811FD95CD004C4295 /* HitQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HitQueue.cpp; sourceTree = ""; }; - A9FB26D911FD95CD004C4295 /* HitQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HitQueue.h; sourceTree = ""; }; - A9FB26DA11FD95CD004C4295 /* Hits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Hits.cpp; sourceTree = ""; }; - A9FB26DB11FD95CD004C4295 /* IndexSearcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexSearcher.cpp; sourceTree = ""; }; - A9FB26DC11FD95CD004C4295 /* IndexSearcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexSearcher.h; sourceTree = ""; }; - A9FB26DD11FD95CD004C4295 /* MultiSearcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiSearcher.cpp; sourceTree = ""; }; - A9FB26DE11FD95CD004C4295 /* MultiSearcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiSearcher.h; sourceTree = ""; }; - A9FB26DF11FD95CD004C4295 /* MultiTermQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiTermQuery.cpp; sourceTree = ""; }; - A9FB26E011FD95CD004C4295 /* MultiTermQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiTermQuery.h; sourceTree = ""; }; - A9FB26E111FD95CD004C4295 /* PhrasePositions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhrasePositions.cpp; sourceTree = ""; }; - A9FB26E211FD95CD004C4295 /* PhrasePositions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhrasePositions.h; sourceTree = ""; }; - A9FB26E311FD95CD004C4295 /* PhraseQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhraseQuery.cpp; sourceTree = ""; }; - A9FB26E411FD95CD004C4295 /* PhraseQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhraseQuery.h; sourceTree = ""; }; - A9FB26E511FD95CD004C4295 /* PhraseQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhraseQueue.h; sourceTree = ""; }; - A9FB26E611FD95CD004C4295 /* PhraseScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhraseScorer.cpp; sourceTree = ""; }; - A9FB26E711FD95CD004C4295 /* PhraseScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhraseScorer.h; sourceTree = ""; }; - A9FB26E811FD95CD004C4295 /* PrefixQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrefixQuery.cpp; sourceTree = ""; }; - A9FB26E911FD95CD004C4295 /* PrefixQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefixQuery.h; sourceTree = ""; }; - A9FB26EA11FD95CD004C4295 /* QueryFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryFilter.cpp; sourceTree = ""; }; - A9FB26EB11FD95CD004C4295 /* QueryFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryFilter.h; sourceTree = ""; }; - A9FB26EC11FD95CD004C4295 /* RangeFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RangeFilter.cpp; sourceTree = ""; }; - A9FB26ED11FD95CD004C4295 /* RangeFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RangeFilter.h; sourceTree = ""; }; - A9FB26EE11FD95CD004C4295 /* RangeQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RangeQuery.cpp; sourceTree = ""; }; - A9FB26EF11FD95CD004C4295 /* RangeQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RangeQuery.h; sourceTree = ""; }; - A9FB26F011FD95CD004C4295 /* Scorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scorer.h; sourceTree = ""; }; - A9FB26F111FD95CD004C4295 /* SearchHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SearchHeader.cpp; sourceTree = ""; }; - A9FB26F211FD95CD004C4295 /* SearchHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchHeader.h; sourceTree = ""; }; - A9FB26F311FD95CD004C4295 /* Similarity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Similarity.cpp; sourceTree = ""; }; - A9FB26F411FD95CD004C4295 /* Similarity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Similarity.h; sourceTree = ""; }; - A9FB26F511FD95CD004C4295 /* SloppyPhraseScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SloppyPhraseScorer.cpp; sourceTree = ""; }; - A9FB26F611FD95CD004C4295 /* SloppyPhraseScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SloppyPhraseScorer.h; sourceTree = ""; }; - A9FB26F711FD95CD004C4295 /* Sort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sort.cpp; sourceTree = ""; }; - A9FB26F811FD95CD004C4295 /* Sort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sort.h; sourceTree = ""; }; - A9FB26F911FD95CD004C4295 /* TermQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermQuery.cpp; sourceTree = ""; }; - A9FB26FA11FD95CD004C4295 /* TermQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermQuery.h; sourceTree = ""; }; - A9FB26FB11FD95CD004C4295 /* TermScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermScorer.cpp; sourceTree = ""; }; - A9FB26FC11FD95CD004C4295 /* TermScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermScorer.h; sourceTree = ""; }; - A9FB26FD11FD95CD004C4295 /* WildcardQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WildcardQuery.cpp; sourceTree = ""; }; - A9FB26FE11FD95CD004C4295 /* WildcardQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WildcardQuery.h; sourceTree = ""; }; - A9FB26FF11FD95CD004C4295 /* WildcardTermEnum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WildcardTermEnum.cpp; sourceTree = ""; }; - A9FB270011FD95CD004C4295 /* WildcardTermEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WildcardTermEnum.h; sourceTree = ""; }; - A9FB270111FD95CD004C4295 /* StdHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StdHeader.cpp; sourceTree = ""; }; - A9FB270211FD95CD004C4295 /* StdHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StdHeader.h; sourceTree = ""; }; - A9FB270411FD95CD004C4295 /* Directory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Directory.h; sourceTree = ""; }; - A9FB270511FD95CD004C4295 /* FSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FSDirectory.cpp; sourceTree = ""; }; - A9FB270611FD95CD004C4295 /* FSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSDirectory.h; sourceTree = ""; }; - A9FB270711FD95CD004C4295 /* IndexInput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexInput.cpp; sourceTree = ""; }; - A9FB270811FD95CD004C4295 /* IndexInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexInput.h; sourceTree = ""; }; - A9FB270911FD95CD004C4295 /* IndexOutput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexOutput.cpp; sourceTree = ""; }; - A9FB270A11FD95CD004C4295 /* IndexOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexOutput.h; sourceTree = ""; }; - A9FB270B11FD95CD004C4295 /* InputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputStream.h; sourceTree = ""; }; - A9FB270C11FD95CD004C4295 /* Lock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lock.cpp; sourceTree = ""; }; - A9FB270D11FD95CD004C4295 /* Lock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lock.h; sourceTree = ""; }; - A9FB270E11FD95CD004C4295 /* MMapInput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MMapInput.cpp; sourceTree = ""; }; - A9FB270F11FD95CD004C4295 /* OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputStream.h; sourceTree = ""; }; - A9FB271011FD95CD004C4295 /* RAMDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RAMDirectory.cpp; sourceTree = ""; }; - A9FB271111FD95CD004C4295 /* RAMDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAMDirectory.h; sourceTree = ""; }; - A9FB271211FD95CD004C4295 /* TransactionalRAMDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransactionalRAMDirectory.cpp; sourceTree = ""; }; - A9FB271311FD95CD004C4295 /* TransactionalRAMDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransactionalRAMDirectory.h; sourceTree = ""; }; - A9FB271511FD95CD004C4295 /* Arrays.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Arrays.h; sourceTree = ""; }; - A9FB271611FD95CD004C4295 /* BitSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitSet.cpp; sourceTree = ""; }; - A9FB271711FD95CD004C4295 /* BitSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitSet.h; sourceTree = ""; }; - A9FB271811FD95CD004C4295 /* bufferedstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bufferedstream.h; sourceTree = ""; }; - A9FB271911FD95CD004C4295 /* dirent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dirent.cpp; sourceTree = ""; }; - A9FB271A11FD95CD004C4295 /* dirent2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dirent2.h; sourceTree = ""; }; - A9FB271B11FD95CD004C4295 /* Equators.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Equators.cpp; sourceTree = ""; }; - A9FB271C11FD95CD004C4295 /* Equators.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Equators.h; sourceTree = ""; }; - A9FB271D11FD95CD004C4295 /* FastCharStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FastCharStream.cpp; sourceTree = ""; }; - A9FB271E11FD95CD004C4295 /* FastCharStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastCharStream.h; sourceTree = ""; }; - A9FB271F11FD95CD004C4295 /* fileinputstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fileinputstream.cpp; sourceTree = ""; }; - A9FB272011FD95CD004C4295 /* fileinputstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fileinputstream.h; sourceTree = ""; }; - A9FB272111FD95CD004C4295 /* googlesparsemap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = googlesparsemap.h; sourceTree = ""; }; - A9FB272211FD95CD004C4295 /* inputstreambuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inputstreambuffer.h; sourceTree = ""; }; - A9FB272311FD95CD004C4295 /* jstreamsconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jstreamsconfig.h; sourceTree = ""; }; - A9FB272411FD95CD004C4295 /* MD5Digester.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MD5Digester.cpp; sourceTree = ""; }; - A9FB272511FD95CD004C4295 /* MD5Digester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MD5Digester.h; sourceTree = ""; }; - A9FB272611FD95CD004C4295 /* Misc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Misc.cpp; sourceTree = ""; }; - A9FB272711FD95CD004C4295 /* Misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Misc.h; sourceTree = ""; }; - A9FB272811FD95CD004C4295 /* PriorityQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriorityQueue.h; sourceTree = ""; }; - A9FB272911FD95CD004C4295 /* Reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Reader.cpp; sourceTree = ""; }; - A9FB272A11FD95CD004C4295 /* Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reader.h; sourceTree = ""; }; - A9FB272B11FD95CD004C4295 /* streambase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = streambase.h; sourceTree = ""; }; - A9FB272C11FD95CD004C4295 /* StringBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringBuffer.cpp; sourceTree = ""; }; - A9FB272D11FD95CD004C4295 /* StringBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringBuffer.h; sourceTree = ""; }; - A9FB272E11FD95CD004C4295 /* StringIntern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringIntern.cpp; sourceTree = ""; }; - A9FB272F11FD95CD004C4295 /* StringIntern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringIntern.h; sourceTree = ""; }; - A9FB273011FD95CD004C4295 /* stringreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringreader.h; sourceTree = ""; }; - A9FB273111FD95CD004C4295 /* subinputstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = subinputstream.h; sourceTree = ""; }; - A9FB273211FD95CD004C4295 /* ThreadLocal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadLocal.cpp; sourceTree = ""; }; - A9FB273311FD95CD004C4295 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = ""; }; - A9FB273411FD95CD004C4295 /* VoidList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoidList.h; sourceTree = ""; }; - A9FB273511FD95CD004C4295 /* VoidMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoidMap.h; sourceTree = ""; }; - A9FB273611FD95CD004C4295 /* CLucene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLucene.h; sourceTree = ""; }; - A9FB282311FD95E4004C4295 /* femain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = femain.cpp; sourceTree = ""; }; - A9FB282511FD95E4004C4295 /* hebrewmcim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hebrewmcim.cpp; sourceTree = ""; }; - A9FB282611FD95E4004C4295 /* nullim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nullim.cpp; sourceTree = ""; }; - A9FB282711FD95E4004C4295 /* swinputmeth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swinputmeth.cpp; sourceTree = ""; }; - A9FB282811FD95E4004C4295 /* swdisp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swdisp.cpp; sourceTree = ""; }; - A9FB282911FD95E4004C4295 /* swlog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swlog.cpp; sourceTree = ""; }; - A9FB282D11FD95E4004C4295 /* genarray.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = genarray.c; sourceTree = ""; }; - A9FB282E11FD95E4004C4295 /* listkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = listkey.cpp; sourceTree = ""; }; - A9FB282F11FD95E4004C4295 /* nt.bks */ = {isa = PBXFileReference; lastKnownFileType = file; path = nt.bks; sourceTree = ""; }; - A9FB283011FD95E4004C4295 /* nt.cps */ = {isa = PBXFileReference; lastKnownFileType = file; path = nt.cps; sourceTree = ""; }; - A9FB283111FD95E4004C4295 /* ot.bks */ = {isa = PBXFileReference; lastKnownFileType = file; path = ot.bks; sourceTree = ""; }; - A9FB283211FD95E4004C4295 /* ot.cps */ = {isa = PBXFileReference; lastKnownFileType = file; path = ot.cps; sourceTree = ""; }; - A9FB283311FD95E4004C4295 /* strkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strkey.cpp; sourceTree = ""; }; - A9FB283411FD95E4004C4295 /* swkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swkey.cpp; sourceTree = ""; }; - A9FB283511FD95E4004C4295 /* treekey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = treekey.cpp; sourceTree = ""; }; - A9FB283611FD95E4004C4295 /* treekeyidx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = treekeyidx.cpp; sourceTree = ""; }; - A9FB283711FD95E4004C4295 /* versekey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versekey.cpp; sourceTree = ""; }; - A9FB283811FD95E4004C4295 /* versetreekey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versetreekey.cpp; sourceTree = ""; }; - A9FB283A11FD95E4004C4295 /* curlftpt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = curlftpt.cpp; sourceTree = ""; }; - A9FB283B11FD95E4004C4295 /* curlhttpt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = curlhttpt.cpp; sourceTree = ""; }; - A9FB283C11FD95E4004C4295 /* encfiltmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encfiltmgr.cpp; sourceTree = ""; }; - A9FB283D11FD95E4004C4295 /* filemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filemgr.cpp; sourceTree = ""; }; - A9FB283E11FD95E4004C4295 /* ftplibftpt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ftplibftpt.cpp; sourceTree = ""; }; - A9FB283F11FD95E4004C4295 /* ftptrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ftptrans.cpp; sourceTree = ""; }; - A9FB284011FD95E4004C4295 /* installmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = installmgr.cpp; sourceTree = ""; }; - A9FB284111FD95E4004C4295 /* localemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = localemgr.cpp; sourceTree = ""; }; - A9FB284211FD95E4004C4295 /* markupfiltmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = markupfiltmgr.cpp; sourceTree = ""; }; - A9FB284311FD95E4004C4295 /* stringmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stringmgr.cpp; sourceTree = ""; }; - A9FB284411FD95E4004C4295 /* swcacher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcacher.cpp; sourceTree = ""; }; - A9FB284511FD95E4004C4295 /* swconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swconfig.cpp; sourceTree = ""; }; - A9FB284611FD95E4004C4295 /* swfiltermgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swfiltermgr.cpp; sourceTree = ""; }; - A9FB284711FD95E4004C4295 /* swlocale.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swlocale.cpp; sourceTree = ""; }; - A9FB284811FD95E4004C4295 /* swmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swmgr.cpp; sourceTree = ""; }; - A9FB284911FD95E4004C4295 /* swsearchable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swsearchable.cpp; sourceTree = ""; }; - A9FB284A11FD95E4004C4295 /* versemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versemgr.cpp; sourceTree = ""; }; - A9FB284E11FD95E4004C4295 /* hrefcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hrefcom.cpp; sourceTree = ""; }; - A9FB285011FD95E4004C4295 /* rawcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawcom.cpp; sourceTree = ""; }; - A9FB285211FD95E4004C4295 /* rawcom4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawcom4.cpp; sourceTree = ""; }; - A9FB285411FD95E4004C4295 /* rawfiles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawfiles.cpp; sourceTree = ""; }; - A9FB285511FD95E4004C4295 /* swcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcom.cpp; sourceTree = ""; }; - A9FB285711FD95E4004C4295 /* zcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zcom.cpp; sourceTree = ""; }; - A9FB285911FD95E4004C4295 /* compress.cpp.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = compress.cpp.txt; sourceTree = ""; }; - A9FB285A11FD95E4004C4295 /* entriesblk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entriesblk.cpp; sourceTree = ""; }; - A9FB285B11FD95E4004C4295 /* lzsscomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lzsscomprs.cpp; sourceTree = ""; }; - A9FB285C11FD95E4004C4295 /* rawstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawstr.cpp; sourceTree = ""; }; - A9FB285D11FD95E4004C4295 /* rawstr4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawstr4.cpp; sourceTree = ""; }; - A9FB285E11FD95E4004C4295 /* rawverse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawverse.cpp; sourceTree = ""; }; - A9FB285F11FD95E4004C4295 /* rawverse4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawverse4.cpp; sourceTree = ""; }; - A9FB286011FD95E4004C4295 /* sapphire.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sapphire.cpp; sourceTree = ""; }; - A9FB286111FD95E4004C4295 /* swcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcipher.cpp; sourceTree = ""; }; - A9FB286211FD95E4004C4295 /* swcomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcomprs.cpp; sourceTree = ""; }; - A9FB286311FD95E4004C4295 /* swcomprs.doc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = swcomprs.doc; sourceTree = ""; }; - A9FB286411FD95E4004C4295 /* zipcomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zipcomprs.cpp; sourceTree = ""; }; - A9FB286511FD95E4004C4295 /* zstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zstr.cpp; sourceTree = ""; }; - A9FB286611FD95E4004C4295 /* zverse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zverse.cpp; sourceTree = ""; }; - A9FB286811FD95E4004C4295 /* cipherfil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cipherfil.cpp; sourceTree = ""; }; - A9FB286911FD95E4004C4295 /* gbffootnotes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbffootnotes.cpp; sourceTree = ""; }; - A9FB286A11FD95E4004C4295 /* gbfheadings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfheadings.cpp; sourceTree = ""; }; - A9FB286B11FD95E4004C4295 /* gbfhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfhtml.cpp; sourceTree = ""; }; - A9FB286C11FD95E4004C4295 /* gbfhtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfhtmlhref.cpp; sourceTree = ""; }; - A9FB286D11FD95E4004C4295 /* gbfmorph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfmorph.cpp; sourceTree = ""; }; - A9FB286E11FD95E4004C4295 /* gbfosis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfosis.cpp; sourceTree = ""; }; - A9FB286F11FD95E4004C4295 /* gbfplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfplain.cpp; sourceTree = ""; }; - A9FB287011FD95E4004C4295 /* gbfredletterwords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfredletterwords.cpp; sourceTree = ""; }; - A9FB287111FD95E4004C4295 /* gbfrtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfrtf.cpp; sourceTree = ""; }; - A9FB287211FD95E4004C4295 /* gbfstrongs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfstrongs.cpp; sourceTree = ""; }; - A9FB287311FD95E4004C4295 /* gbfthml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfthml.cpp; sourceTree = ""; }; - A9FB287411FD95E4004C4295 /* gbfwebif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfwebif.cpp; sourceTree = ""; }; - A9FB287511FD95E4004C4295 /* gbfwordjs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfwordjs.cpp; sourceTree = ""; }; - A9FB287611FD95E4004C4295 /* greeklexattribs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = greeklexattribs.cpp; sourceTree = ""; }; - A9FB287711FD95E4004C4295 /* latin1utf16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latin1utf16.cpp; sourceTree = ""; }; - A9FB287811FD95E4004C4295 /* latin1utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latin1utf8.cpp; sourceTree = ""; }; - A9FB287911FD95E4004C4295 /* osisfootnotes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisfootnotes.cpp; sourceTree = ""; }; - A9FB287A11FD95E4004C4295 /* osisheadings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisheadings.cpp; sourceTree = ""; }; - A9FB287B11FD95E4004C4295 /* osishtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osishtmlhref.cpp; sourceTree = ""; }; - A9FB287C11FD95E4004C4295 /* osislemma.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osislemma.cpp; sourceTree = ""; }; - A9FB287D11FD95E4004C4295 /* osismorph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osismorph.cpp; sourceTree = ""; }; - A9FB287E11FD95E4004C4295 /* osismorphsegmentation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osismorphsegmentation.cpp; sourceTree = ""; }; - A9FB287F11FD95E4004C4295 /* osisosis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisosis.cpp; sourceTree = ""; }; - A9FB288011FD95E4004C4295 /* osisplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisplain.cpp; sourceTree = ""; }; - A9FB288111FD95E4004C4295 /* osisredletterwords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisredletterwords.cpp; sourceTree = ""; }; - A9FB288211FD95E4004C4295 /* osisrtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisrtf.cpp; sourceTree = ""; }; - A9FB288311FD95E4004C4295 /* osisruby.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisruby.cpp; sourceTree = ""; }; - A9FB288411FD95E4004C4295 /* osisscripref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisscripref.cpp; sourceTree = ""; }; - A9FB288511FD95E4004C4295 /* osisstrongs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisstrongs.cpp; sourceTree = ""; }; - A9FB288611FD95E4004C4295 /* osisvariants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisvariants.cpp; sourceTree = ""; }; - A9FB288711FD95E4004C4295 /* osiswebif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osiswebif.cpp; sourceTree = ""; }; - A9FB288811FD95E4004C4295 /* osiswordjs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osiswordjs.cpp; sourceTree = ""; }; - A9FB288911FD95E4004C4295 /* papyriplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = papyriplain.cpp; sourceTree = ""; }; - A9FB288A11FD95E4004C4295 /* plainfootnotes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = plainfootnotes.cpp; sourceTree = ""; }; - A9FB288B11FD95E4004C4295 /* plainhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = plainhtml.cpp; sourceTree = ""; }; - A9FB288C11FD95E4004C4295 /* rtfhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rtfhtml.cpp; sourceTree = ""; }; - A9FB288D11FD95E4004C4295 /* swbasicfilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swbasicfilter.cpp; sourceTree = ""; }; - A9FB288E11FD95E4004C4295 /* swoptfilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swoptfilter.cpp; sourceTree = ""; }; - A9FB288F11FD95E4004C4295 /* teihtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teihtmlhref.cpp; sourceTree = ""; }; - A9FB289011FD95E4004C4295 /* teiplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teiplain.cpp; sourceTree = ""; }; - A9FB289111FD95E4004C4295 /* teirtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teirtf.cpp; sourceTree = ""; }; - A9FB289211FD95E4004C4295 /* thmlfootnotes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlfootnotes.cpp; sourceTree = ""; }; - A9FB289311FD95E4004C4295 /* thmlgbf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlgbf.cpp; sourceTree = ""; }; - A9FB289411FD95E4004C4295 /* thmlheadings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlheadings.cpp; sourceTree = ""; }; - A9FB289511FD95E4004C4295 /* thmlhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlhtml.cpp; sourceTree = ""; }; - A9FB289611FD95E4004C4295 /* thmlhtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlhtmlhref.cpp; sourceTree = ""; }; - A9FB289711FD95E4004C4295 /* thmllemma.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmllemma.cpp; sourceTree = ""; }; - A9FB289811FD95E4004C4295 /* thmlmorph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlmorph.cpp; sourceTree = ""; }; - A9FB289911FD95E4004C4295 /* thmlosis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlosis.cpp; sourceTree = ""; }; - A9FB289A11FD95E4004C4295 /* thmlplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlplain.cpp; sourceTree = ""; }; - A9FB289B11FD95E4004C4295 /* thmlrtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlrtf.cpp; sourceTree = ""; }; - A9FB289C11FD95E4004C4295 /* thmlscripref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlscripref.cpp; sourceTree = ""; }; - A9FB289D11FD95E4004C4295 /* thmlstrongs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlstrongs.cpp; sourceTree = ""; }; - A9FB289E11FD95E4004C4295 /* thmlvariants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlvariants.cpp; sourceTree = ""; }; - A9FB289F11FD95E4004C4295 /* thmlwebif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlwebif.cpp; sourceTree = ""; }; - A9FB28A011FD95E4004C4295 /* thmlwordjs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlwordjs.cpp; sourceTree = ""; }; - A9FB28A111FD95E4004C4295 /* unicodertf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unicodertf.cpp; sourceTree = ""; }; - A9FB28A211FD95E4004C4295 /* utf16utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf16utf8.cpp; sourceTree = ""; }; - A9FB28A311FD95E4004C4295 /* utf8arabicpoints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8arabicpoints.cpp; sourceTree = ""; }; - A9FB28A411FD95E4004C4295 /* utf8arshaping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8arshaping.cpp; sourceTree = ""; }; - A9FB28A511FD95E4004C4295 /* utf8bidireorder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8bidireorder.cpp; sourceTree = ""; }; - A9FB28A611FD95E4004C4295 /* utf8cantillation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8cantillation.cpp; sourceTree = ""; }; - A9FB28A711FD95E4004C4295 /* utf8greekaccents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8greekaccents.cpp; sourceTree = ""; }; - A9FB28A811FD95E4004C4295 /* utf8hebrewpoints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8hebrewpoints.cpp; sourceTree = ""; }; - A9FB28A911FD95E4004C4295 /* utf8html.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8html.cpp; sourceTree = ""; }; - A9FB28AA11FD95E4004C4295 /* utf8latin1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8latin1.cpp; sourceTree = ""; }; - A9FB28AB11FD95E4004C4295 /* utf8nfc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8nfc.cpp; sourceTree = ""; }; - A9FB28AC11FD95E4004C4295 /* utf8nfkd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8nfkd.cpp; sourceTree = ""; }; - A9FB28AD11FD95E4004C4295 /* utf8transliterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8transliterator.cpp; sourceTree = ""; }; - A9FB28AE11FD95E4004C4295 /* utf8utf16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8utf16.cpp; sourceTree = ""; }; - A9FB28B111FD95E4004C4295 /* rawgenbook.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawgenbook.cpp; sourceTree = ""; }; - A9FB28B211FD95E4004C4295 /* swgenbook.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swgenbook.cpp; sourceTree = ""; }; - A9FB28B511FD95E4004C4295 /* rawld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawld.cpp; sourceTree = ""; }; - A9FB28B711FD95E4004C4295 /* rawld4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawld4.cpp; sourceTree = ""; }; - A9FB28B811FD95E4004C4295 /* swld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swld.cpp; sourceTree = ""; }; - A9FB28BA11FD95E4004C4295 /* zld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zld.cpp; sourceTree = ""; }; - A9FB28BB11FD95E4004C4295 /* readme */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = readme; sourceTree = ""; }; - A9FB28BC11FD95E4004C4295 /* swmodule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swmodule.cpp; sourceTree = ""; }; - A9FB28BE11FD95E4004C4295 /* echomod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = echomod.cpp; sourceTree = ""; }; - A9FB28C111FD95E4004C4295 /* rawtext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawtext.cpp; sourceTree = ""; }; - A9FB28C311FD95E4004C4295 /* rawtext4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawtext4.cpp; sourceTree = ""; }; - A9FB28C411FD95E4004C4295 /* swtext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swtext.cpp; sourceTree = ""; }; - A9FB28C611FD95E4004C4295 /* ztext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ztext.cpp; sourceTree = ""; }; - A9FB28C911FD95E4004C4295 /* adler32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = ""; }; - A9FB28CA11FD95E4004C4295 /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = ""; }; - A9FB28CB11FD95E4004C4295 /* crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crc32.c; sourceTree = ""; }; - A9FB28CC11FD95E4004C4295 /* deflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = deflate.c; sourceTree = ""; }; - A9FB28CD11FD95E4004C4295 /* deflate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deflate.h; sourceTree = ""; }; - A9FB28CE11FD95E4004C4295 /* gzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzio.c; sourceTree = ""; }; - A9FB28CF11FD95E4004C4295 /* infblock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = infblock.c; sourceTree = ""; }; - A9FB28D011FD95E4004C4295 /* infblock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = infblock.h; sourceTree = ""; }; - A9FB28D111FD95E4004C4295 /* infcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = infcodes.c; sourceTree = ""; }; - A9FB28D211FD95E4004C4295 /* infcodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = infcodes.h; sourceTree = ""; }; - A9FB28D311FD95E4004C4295 /* inffast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inffast.c; sourceTree = ""; }; - A9FB28D411FD95E4004C4295 /* inffast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inffast.h; sourceTree = ""; }; - A9FB28D511FD95E4004C4295 /* inffixed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inffixed.h; sourceTree = ""; }; - A9FB28D611FD95E4004C4295 /* inflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inflate.c; sourceTree = ""; }; - A9FB28D711FD95E4004C4295 /* inftrees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inftrees.c; sourceTree = ""; }; - A9FB28D811FD95E4004C4295 /* inftrees.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inftrees.h; sourceTree = ""; }; - A9FB28D911FD95E4004C4295 /* infutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = infutil.c; sourceTree = ""; }; - A9FB28DA11FD95E4004C4295 /* infutil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = infutil.h; sourceTree = ""; }; - A9FB28DB11FD95E4004C4295 /* maketree.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = maketree.c; sourceTree = ""; }; - A9FB28DC11FD95E4004C4295 /* trees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = trees.c; sourceTree = ""; }; - A9FB28DD11FD95E4004C4295 /* trees.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = trees.h; sourceTree = ""; }; - A9FB28DE11FD95E4004C4295 /* uncompr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = ""; }; - A9FB28DF11FD95E4004C4295 /* untgz.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = untgz.c; sourceTree = ""; }; - A9FB28E011FD95E4004C4295 /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = ""; }; - A9FB28E111FD95E4004C4295 /* zutil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zutil.h; sourceTree = ""; }; - A9FB28E211FD95E4004C4295 /* ftplib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftplib.c; sourceTree = ""; }; - A9FB28E311FD95E4004C4295 /* ftpparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftpparse.c; sourceTree = ""; }; - A9FB28E411FD95E4004C4295 /* regex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = regex.c; sourceTree = ""; }; - A9FB28E511FD95E4004C4295 /* roman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = roman.cpp; sourceTree = ""; }; - A9FB28E611FD95E4004C4295 /* swbuf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swbuf.cpp; sourceTree = ""; }; - A9FB28E711FD95E4004C4295 /* swobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swobject.cpp; sourceTree = ""; }; - A9FB28E811FD95E4004C4295 /* swunicod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swunicod.cpp; sourceTree = ""; }; - A9FB28E911FD95E4004C4295 /* swversion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swversion.cpp; sourceTree = ""; }; - A9FB28EA11FD95E4004C4295 /* url.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url.cpp; sourceTree = ""; }; - A9FB28EB11FD95E4004C4295 /* utilstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utilstr.cpp; sourceTree = ""; }; - A9FB28EC11FD95E4004C4295 /* utilxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utilxml.cpp; sourceTree = ""; }; D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; /* End PBXFileReference section */ @@ -1114,19 +1195,19 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A956324411FD90CE007DC7AD /* libclucene-ub.a in Frameworks */, - A956316611FD8C5B007DC7AD /* libsword-ub.a in Frameworks */, + A954ACDD13EEA6780094E3FE /* libsword.dylib in Frameworks */, 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - A9013D3611E316C700E1CCCA /* Frameworks */ = { + A954ABC013EE9AB00094E3FE /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A9013D3811E316C700E1CCCA /* Cocoa.framework in Frameworks */, - A9921A1A11FD9CA8002DAA72 /* libSword.dylib in Frameworks */, - A9EF13B31205952C0078A27C /* libSword.dylib in Frameworks */, + A954AC3713EE9FA10094E3FE /* libicucore.dylib in Frameworks */, + A954AC3813EE9FA10094E3FE /* libstdc++.dylib in Frameworks */, + A954AC3913EE9FA10094E3FE /* libz.dylib in Frameworks */, + A954AC3313EE9F620094E3FE /* libcurl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1134,6 +1215,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A9A7EEAF14D5D4C300B76B6A /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9A7EEB114D5D61700B76B6A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9A7EEBF14D5D65900B76B6A /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1146,19 +1236,125 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - A9C2819311C43C4900803CB5 /* Frameworks */ = { + A9BFB09E13EDF51000032679 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9BFB0BF13EDF5D500032679 /* ObjCSword.framework in Frameworks */, + A9BFB0A513EDF51100032679 /* SenTestingKit.framework in Frameworks */, + A9BFB0A713EDF51100032679 /* Cocoa.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2714914D717D800DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2714A14D717D800DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2715614D717FD00DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2715714D717FD00DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2716314D7181200DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2716414D7181200DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2717014D7182300DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2717114D7182300DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2717D14D7183B00DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2717E14D7183B00DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2718A14D7185800DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2718B14D7185800DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2719714D7186A00DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2719814D7186A00DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271A414D7187E00DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271A514D7187E00DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271B114D7189300DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271B214D7189300DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271BE14D718A400DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271BF14D718A400DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271CB14D718B800DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271CC14D718B800DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271D814D718C800DA8926 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271D914D718C800DA8926 /* libsword.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271E514D718DF00DA8926 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A964658F11C6654300640FAC /* SenTestingKit.framework in Frameworks */, - A964657C11C662CF00640FAC /* ObjCSword.framework in Frameworks */, + A9D271E614D718DF00DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - A9FB25DE11FD939E004C4295 /* Frameworks */ = { + A9D271F214D718F500DA8926 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A9D271F314D718F500DA8926 /* libsword.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1169,12 +1365,26 @@ isa = PBXGroup; children = ( 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */, - A9C2819611C43C4900803CB5 /* Tests.octest */, A975EED911C792B9007C1532 /* mod2osis */, - A9013D3E11E316C700E1CCCA /* ObjCSword_iOS.framework */, A9921A1911FD9CA8002DAA72 /* libSword.dylib */, - A9EF13B21205952C0078A27C /* libSword.dylib */, A9BDFA6B1207F9870067ED5B /* Tests.octest */, + A9BFB0A213EDF51000032679 /* Tests.octest */, + A954ABC313EE9AB00094E3FE /* libsword.dylib */, + A9A7EEB414D5D61700B76B6A /* osis2mod */, + A9D2714E14D717D800DA8926 /* imp2gbs */, + A9D2715B14D717FD00DA8926 /* imp2ld */, + A9D2716814D7181200DA8926 /* imp2vs */, + A9D2717514D7182300DA8926 /* installmgr */, + A9D2718214D7183B00DA8926 /* mod2imp */, + A9D2718F14D7185800DA8926 /* mod2vpl */, + A9D2719C14D7186A00DA8926 /* mod2zmod */, + A9D271A914D7187E00DA8926 /* step2vpl */, + A9D271B614D7189300DA8926 /* stepdump */, + A9D271C314D718A400DA8926 /* tei2mod */, + A9D271D014D718B800DA8926 /* vpl2mod */, + A9D271DD14D718C800DA8926 /* vs2osisref */, + A9D271EA14D718DF00DA8926 /* vs2osisreftxt */, + A9D271F714D718F500DA8926 /* xml2gbs */, ); name = Products; sourceTree = ""; @@ -1182,17 +1392,16 @@ 0867D691FE84028FC02AAC07 /* ObjCSword */ = { isa = PBXGroup; children = ( + A954A7EB13EE96FC0094E3FE /* Sword */, A975ECD211C7925B007C1532 /* Utilities */, - A9C2857911C4486400803CB5 /* Tests */, - A94EAC5B117B2E7B0018B06F /* Dependencies */, A94EAE72117B32AF0018B06F /* Services */, 08FB77AEFE84172EC02AAC07 /* SwordWrapper */, 32C88DFF0371C24200C91783 /* Other Sources */, 089C1665FE841158C02AAC07 /* Resources */, 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, + A9BFB0AC13EDF51100032679 /* Tests */, + A9BFB0A313EDF51000032679 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, - A9C2819711C43C4900803CB5 /* Tests-Info.plist */, - A9BDFA6E1207F9870067ED5B /* Tests-Info copy.plist */, ); name = ObjCSword; sourceTree = ""; @@ -1212,7 +1421,6 @@ A9D437CE11C52947007AFE83 /* locales.d */, 8DC2EF5A0486A6940098B216 /* Info.plist */, 089C1666FE841158C02AAC07 /* InfoPlist.strings */, - A9013D3F11E316C700E1CCCA /* Info copy.plist */, ); name = Resources; sourceTree = ""; @@ -1220,6 +1428,12 @@ 08FB77AEFE84172EC02AAC07 /* SwordWrapper */ = { isa = PBXGroup; children = ( + A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */, + A929619716B1BA240094E5BE /* SwordKey.h */, + A929619816B1BA240094E5BE /* SwordKey.mm */, + A929619916B1BA240094E5BE /* SwordListKey.h */, + A929619A16B1BA240094E5BE /* SwordListKey.mm */, + A929619B16B1BA240094E5BE /* SwordVerseKey.h */, A9EF1414120595650078A27C /* SwordLocaleManager.h */, A9EF1415120595650078A27C /* SwordLocaleManager.mm */, A94EABF9117B28920018B06F /* SwordManager.h */, @@ -1245,29 +1459,26 @@ A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */, A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */, A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */, - A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */, - A94EABF5117B28920018B06F /* SwordKey.h */, - A94EABF6117B28920018B06F /* SwordKey.mm */, - A94EABF7117B28920018B06F /* SwordListKey.h */, - A94EABF8117B28920018B06F /* SwordListKey.mm */, A94EABE7117B28920018B06F /* SwordBibleChapter.h */, A94EABE8117B28920018B06F /* SwordBibleChapter.m */, A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */, - A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */, - A94EABF5117B28920018B06F /* SwordKey.h */, - A94EABF6117B28920018B06F /* SwordKey.mm */, - A94EABF7117B28920018B06F /* SwordListKey.h */, - A94EABF8117B28920018B06F /* SwordListKey.mm */, - A94EAC05117B28920018B06F /* SwordVerseKey.h */, A94EAC06117B28920018B06F /* SwordVerseKey.mm */, A94EAC09117B28920018B06F /* VerseEnumerator.h */, A94EAC0A117B28920018B06F /* VerseEnumerator.mm */, A94EABF1117B28920018B06F /* SwordInstallSource.h */, A94EABF2117B28920018B06F /* SwordInstallSource.mm */, - A94EABF3117B28920018B06F /* SwordInstallSourceController.h */, - A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */, + A94EABF3117B28920018B06F /* SwordInstallSourceManager.h */, + A94EABF4117B28920018B06F /* SwordInstallSourceManager.mm */, A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */, A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */, + 8C92C291C40A77060C12A21B /* SwordUtil.m */, + 8C92C7B2EB245D47FEB5E3B0 /* SwordUtil.h */, + 8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */, + 8C92C72ADACB017A434CD268 /* FilterProviderFactory.h */, + 8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */, + 8C92C980D4DE32C7AB93159D /* DefaultFilterProvider.h */, + 8C92CC111DC521DE0C054C60 /* SwordFilter.mm */, + 8C92C02A5C86E1C75ED1CEF4 /* SwordFilter.h */, ); name = SwordWrapper; sourceTree = ""; @@ -1275,9 +1486,11 @@ 1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( + A954AC3413EE9FA10094E3FE /* libicucore.dylib */, + A954AC3513EE9FA10094E3FE /* libstdc++.dylib */, + A954AC3613EE9FA10094E3FE /* libz.dylib */, + A954AC3213EE9F620094E3FE /* libcurl.dylib */, 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */, - A956316411FD8C55007DC7AD /* libsword-ub.a */, - A956324211FD90C9007DC7AD /* libclucene-ub.a */, ); name = "Linked Frameworks"; sourceTree = ""; @@ -1303,1008 +1516,793 @@ name = "Other Sources"; sourceTree = ""; }; - A94EAC5B117B2E7B0018B06F /* Dependencies */ = { + A94EAE72117B32AF0018B06F /* Services */ = { isa = PBXGroup; children = ( - A9FB264111FD95CD004C4295 /* clucene */, - A94EAC5C117B2E8F0018B06F /* sword */, + A9C2856D11C446B700803CB5 /* Configuration.h */, + A9C2858211C44A0A00803CB5 /* Configuration.m */, + A9C2857111C4471400803CB5 /* OSXConfiguration.h */, + A9C2857211C4471400803CB5 /* OSXConfiguration.m */, ); - name = Dependencies; + name = Services; sourceTree = ""; }; - A94EAC5C117B2E8F0018B06F /* sword */ = { + A954A7EB13EE96FC0094E3FE /* Sword */ = { isa = PBXGroup; children = ( - A9FB282011FD95E4004C4295 /* src */, - A9D4399D11C52E9B007AFE83 /* include */, + A954A7F313EE98570094E3FE /* Deps */, + A954A7F513EE98B30094E3FE /* src */, ); - name = sword; + name = Sword; sourceTree = ""; }; - A94EAE72117B32AF0018B06F /* Services */ = { + A954A7F313EE98570094E3FE /* Deps */ = { isa = PBXGroup; children = ( - A9C2856D11C446B700803CB5 /* Configuration.h */, - A9C2858211C44A0A00803CB5 /* Configuration.m */, - A9C2857111C4471400803CB5 /* OSXConfiguration.h */, - A9C2857211C4471400803CB5 /* OSXConfiguration.m */, + A954A9E013EE9A2B0094E3FE /* clucene */, ); - name = Services; + name = Deps; sourceTree = ""; }; - A975ECD211C7925B007C1532 /* Utilities */ = { + A954A7F513EE98B30094E3FE /* src */ = { isa = PBXGroup; children = ( - A975ED9811C7925C007C1532 /* imp2gbs.cpp */, - A975ED9911C7925C007C1532 /* imp2ld.cpp */, - A975ED9A11C7925C007C1532 /* imp2vs.cpp */, - A975ED9B11C7925C007C1532 /* installmgr.cpp */, - A975EDAB11C7925C007C1532 /* mod2imp.cpp */, - A975EDAC11C7925C007C1532 /* mod2osis.cpp */, - A975EDAD11C7925C007C1532 /* mod2vpl.cpp */, - A975EDAE11C7925C007C1532 /* mod2zmod.cpp */, - A975EDB111C7925C007C1532 /* osis2mod.cpp */, - A975EDB811C7925C007C1532 /* step2vpl.cpp */, - A975EDB911C7925C007C1532 /* stepdump.cpp */, - A975EDBB11C7925C007C1532 /* tei2mod.cpp */, - A975EDD811C7925C007C1532 /* vpl2mod.cpp */, - A975EDD911C7925C007C1532 /* vs2osisref.cpp */, - A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */, - A975EDDB11C7925C007C1532 /* xml2gbs.cpp */, - ); - name = Utilities; - path = ../../utilities; - sourceTree = SOURCE_ROOT; - }; - A9C2857911C4486400803CB5 /* Tests */ = { - isa = PBXGroup; - children = ( - A964658011C663E200640FAC /* SwordManagerTest.h */, - A964658111C663E200640FAC /* SwordManagerTest.m */, - A918B8E211C6697400024D84 /* SwordModuleTest.h */, - A918B8E311C6697400024D84 /* SwordModuleTest.m */, - A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */, - A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */, - A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */, - A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */, - A9BDFA841207FC8C0067ED5B /* ImageModuleTest.h */, - A9BDFA851207FC8C0067ED5B /* ImageModuleTest.m */, - ); - name = Tests; - sourceTree = ""; - }; - A9D4399D11C52E9B007AFE83 /* include */ = { - isa = PBXGroup; - children = ( - A9D4399E11C52E9B007AFE83 /* canon.h */, - A9D4399F11C52E9B007AFE83 /* canon_abbrevs.h */, - A9D439A011C52E9B007AFE83 /* canon_german.h */, - A9D439A111C52E9B007AFE83 /* canon_kjva.h */, - A9D439A211C52E9B007AFE83 /* canon_leningrad.h */, - A9D439A311C52E9B007AFE83 /* canon_luther.h */, - A9D439A411C52E9B007AFE83 /* canon_mt.h */, - A9D439A511C52E9B007AFE83 /* canon_nrsv.h */, - A9D439A611C52E9B007AFE83 /* canon_nrsva.h */, - A9D439A711C52E9B007AFE83 /* canon_null.h */, - A9D439A811C52E9B007AFE83 /* canon_synodal.h */, - A9D439A911C52E9B007AFE83 /* canon_vulg.h */, - A9D439AA11C52E9B007AFE83 /* cipherfil.h */, - A9D439AB11C52E9B007AFE83 /* config.h */, - A9D439AD11C52E9B007AFE83 /* curlftpt.h */, - A9D439AE11C52E9B007AFE83 /* curlhttpt.h */, - A9D439AF11C52E9B007AFE83 /* defs.h */, - A9D439B011C52E9B007AFE83 /* echomod.h */, - A9D439B111C52E9B007AFE83 /* encfiltmgr.h */, - A9D439B211C52E9B007AFE83 /* entriesblk.h */, - A9D439B311C52E9B007AFE83 /* femain.h */, - A9D439B411C52E9B007AFE83 /* filemgr.h */, - A9D439B511C52E9B007AFE83 /* flatapi.h */, - A9D439B611C52E9B007AFE83 /* ftplib.h */, - A9D439B711C52E9B007AFE83 /* ftplibftpt.h */, - A9D439B811C52E9B007AFE83 /* ftpparse.h */, - A9D439B911C52E9B007AFE83 /* ftptrans.h */, - A9D439BA11C52E9B007AFE83 /* gbffootnotes.h */, - A9D439BB11C52E9B007AFE83 /* gbfheadings.h */, - A9D439BC11C52E9B007AFE83 /* gbfhtml.h */, - A9D439BD11C52E9B007AFE83 /* gbfhtmlhref.h */, - A9D439BE11C52E9B007AFE83 /* gbfmorph.h */, - A9D439BF11C52E9B007AFE83 /* gbfosis.h */, - A9D439C011C52E9B007AFE83 /* gbfplain.h */, - A9D439C111C52E9B007AFE83 /* gbfredletterwords.h */, - A9D439C211C52E9B007AFE83 /* gbfrtf.h */, - A9D439C311C52E9B007AFE83 /* gbfstrongs.h */, - A9D439C411C52E9B007AFE83 /* gbfthml.h */, - A9D439C511C52E9B007AFE83 /* gbfwebif.h */, - A9D439C611C52E9B007AFE83 /* gbfwordjs.h */, - A9D439C711C52E9B007AFE83 /* Greek2Greek.h */, - A9D439C811C52E9B007AFE83 /* GreekChars.h */, - A9D439C911C52E9B007AFE83 /* greeklexattribs.h */, - A9D439CA11C52E9B007AFE83 /* hebrewmcim.h */, - A9D439CB11C52E9B007AFE83 /* hrefcom.h */, - A9D439CC11C52E9B007AFE83 /* installmgr.h */, - A9D439CD11C52E9B007AFE83 /* internal */, - A9D439D011C52E9B007AFE83 /* latin1utf16.h */, - A9D439D111C52E9B007AFE83 /* latin1utf8.h */, - A9D439D211C52E9B007AFE83 /* listkey.h */, - A9D439D311C52E9B007AFE83 /* localemgr.h */, - A9D439D411C52E9B007AFE83 /* lzsscomprs.h */, - A9D439D711C52E9B007AFE83 /* markupfiltmgr.h */, - A9D439D811C52E9B007AFE83 /* multimapwdef.h */, - A9D439D911C52E9B007AFE83 /* nullim.h */, - A9D439DA11C52E9B007AFE83 /* osisfootnotes.h */, - A9D439DB11C52E9B007AFE83 /* osisheadings.h */, - A9D439DC11C52E9B007AFE83 /* osishtmlhref.h */, - A9D439DD11C52E9B007AFE83 /* osislemma.h */, - A9D439DE11C52E9B007AFE83 /* osismorph.h */, - A9D439DF11C52E9B007AFE83 /* osismorphsegmentation.h */, - A9D439E011C52E9B007AFE83 /* osisosis.h */, - A9D439E111C52E9B007AFE83 /* osisplain.h */, - A9D439E211C52E9B007AFE83 /* osisredletterwords.h */, - A9D439E311C52E9B007AFE83 /* osisrtf.h */, - A9D439E411C52E9B007AFE83 /* osisruby.h */, - A9D439E511C52E9B007AFE83 /* osisscripref.h */, - A9D439E611C52E9B007AFE83 /* osisstrongs.h */, - A9D439E711C52E9B007AFE83 /* osisvariants.h */, - A9D439E811C52E9B007AFE83 /* osiswebif.h */, - A9D439E911C52E9B007AFE83 /* osiswordjs.h */, - A9D439EA11C52E9B007AFE83 /* papyriplain.h */, - A9D439EB11C52E9B007AFE83 /* plainfootnotes.h */, - A9D439EC11C52E9B007AFE83 /* plainhtml.h */, - A9D439ED11C52E9B007AFE83 /* rawcom.h */, - A9D439EE11C52E9B007AFE83 /* rawcom4.h */, - A9D439EF11C52E9B007AFE83 /* rawfiles.h */, - A9D439F011C52E9B007AFE83 /* rawgenbook.h */, - A9D439F111C52E9B007AFE83 /* rawld.h */, - A9D439F211C52E9B007AFE83 /* rawld4.h */, - A9D439F311C52E9B007AFE83 /* rawstr.h */, - A9D439F411C52E9B007AFE83 /* rawstr4.h */, - A9D439F511C52E9B007AFE83 /* rawtext.h */, - A9D439F611C52E9B007AFE83 /* rawtext4.h */, - A9D439F711C52E9B007AFE83 /* rawverse.h */, - A9D439F811C52E9B007AFE83 /* rawverse4.h */, - A9D439F911C52E9B007AFE83 /* roman.h */, - A9D439FA11C52E9B007AFE83 /* rtfhtml.h */, - A9D439FB11C52E9B007AFE83 /* sapphire.h */, - A9D439FD11C52E9B007AFE83 /* stringmgr.h */, - A9D439FE11C52E9B007AFE83 /* strkey.h */, - A9D439FF11C52E9B007AFE83 /* swbasicfilter.h */, - A9D43A0011C52E9B007AFE83 /* swbuf.h */, - A9D43A0111C52E9B007AFE83 /* swcacher.h */, - A9D43A0211C52E9B007AFE83 /* swcipher.h */, - A9D43A0311C52E9B007AFE83 /* swcom.h */, - A9D43A0411C52E9B007AFE83 /* swcomprs.h */, - A9D43A0511C52E9B007AFE83 /* swconfig.h */, - A9D43A0611C52E9B007AFE83 /* swdisp.h */, - A9D43A0711C52E9B007AFE83 /* swfilter.h */, - A9D43A0811C52E9B007AFE83 /* swfiltermgr.h */, - A9D43A0911C52E9B007AFE83 /* swgenbook.h */, - A9D43A0A11C52E9B007AFE83 /* swinputmeth.h */, - A9D43A0B11C52E9B007AFE83 /* swkey.h */, - A9D43A0C11C52E9B007AFE83 /* swld.h */, - A9D43A0D11C52E9B007AFE83 /* swlocale.h */, - A9D43A0E11C52E9B007AFE83 /* swlog.h */, - A9D43A0F11C52E9B007AFE83 /* swmacs.h */, - A9D43A1011C52E9B007AFE83 /* swmgr.h */, - A9D43A1111C52E9B007AFE83 /* swmodule.h */, - A9D43A1211C52E9B007AFE83 /* swobject.h */, - A9D43A1311C52E9B007AFE83 /* swoptfilter.h */, - A9D43A1511C52E9B007AFE83 /* swsearchable.h */, - A9D43A1611C52E9B007AFE83 /* swtext.h */, - A9D43A1711C52E9B007AFE83 /* swunicod.h */, - A9D43A1811C52E9B007AFE83 /* swversion.h */, - A9D43A1911C52E9B007AFE83 /* sysdata.h */, - A9D43A1A11C52E9B007AFE83 /* teihtmlhref.h */, - A9D43A1B11C52E9B007AFE83 /* teiplain.h */, - A9D43A1C11C52E9B007AFE83 /* teirtf.h */, - A9D43A1D11C52E9B007AFE83 /* thmlfootnotes.h */, - A9D43A1E11C52E9B007AFE83 /* thmlgbf.h */, - A9D43A1F11C52E9B007AFE83 /* thmlheadings.h */, - A9D43A2011C52E9B007AFE83 /* thmlhtml.h */, - A9D43A2111C52E9B007AFE83 /* thmlhtmlhref.h */, - A9D43A2211C52E9B007AFE83 /* thmllemma.h */, - A9D43A2311C52E9B007AFE83 /* thmlmorph.h */, - A9D43A2411C52E9B007AFE83 /* thmlosis.h */, - A9D43A2511C52E9B007AFE83 /* thmlplain.h */, - A9D43A2611C52E9B007AFE83 /* thmlrtf.h */, - A9D43A2711C52E9B007AFE83 /* thmlscripref.h */, - A9D43A2811C52E9B007AFE83 /* thmlstrongs.h */, - A9D43A2911C52E9B007AFE83 /* thmlvariants.h */, - A9D43A2A11C52E9B007AFE83 /* thmlwebif.h */, - A9D43A2B11C52E9B007AFE83 /* thmlwordjs.h */, - A9D43A2C11C52E9B007AFE83 /* treekey.h */, - A9D43A2D11C52E9B007AFE83 /* treekeyidx.h */, - A9D43A2E11C52E9B007AFE83 /* unicodertf.h */, - A9D43A2F11C52E9B007AFE83 /* untgz.h */, - A9D43A3011C52E9B007AFE83 /* url.h */, - A9D43A3111C52E9B007AFE83 /* utf16utf8.h */, - A9D43A3211C52E9B007AFE83 /* utf8arabicpoints.h */, - A9D43A3311C52E9B007AFE83 /* utf8arshaping.h */, - A9D43A3411C52E9B007AFE83 /* utf8bidireorder.h */, - A9D43A3511C52E9B007AFE83 /* utf8cantillation.h */, - A9D43A3611C52E9B007AFE83 /* utf8greekaccents.h */, - A9D43A3711C52E9B007AFE83 /* utf8hebrewpoints.h */, - A9D43A3811C52E9B007AFE83 /* utf8html.h */, - A9D43A3911C52E9B007AFE83 /* utf8latin1.h */, - A9D43A3A11C52E9B007AFE83 /* utf8nfc.h */, - A9D43A3B11C52E9B007AFE83 /* utf8nfkd.h */, - A9D43A3C11C52E9B007AFE83 /* utf8transliterator.h */, - A9D43A3D11C52E9B007AFE83 /* utf8utf16.h */, - A9D43A3E11C52E9B007AFE83 /* utilstr.h */, - A9D43A3F11C52E9B007AFE83 /* utilxml.h */, - A9D43A4011C52E9B007AFE83 /* versekey.h */, - A9D43A4111C52E9B007AFE83 /* versemgr.h */, - A9D43A4211C52E9B007AFE83 /* versetreekey.h */, - A9D43A4311C52E9B007AFE83 /* zcom.h */, - A9D43A4411C52E9B007AFE83 /* zconf.h */, - A9D43A4511C52E9B007AFE83 /* zipcomprs.h */, - A9D43A4611C52E9B007AFE83 /* zld.h */, - A9D43A4711C52E9B007AFE83 /* zlib.h */, - A9D43A4811C52E9B007AFE83 /* zstr.h */, - A9D43A4911C52E9B007AFE83 /* ztext.h */, - A9D43A4A11C52E9B007AFE83 /* zverse.h */, - ); - name = include; - path = ../../include; - sourceTree = SOURCE_ROOT; - }; - A9D439CD11C52E9B007AFE83 /* internal */ = { - isa = PBXGroup; - children = ( - A9D439CE11C52E9B007AFE83 /* regex */, + A954A7F613EE98B30094E3FE /* frontend */, + A954A80713EE98B30094E3FE /* keys */, + A954A81713EE98B30094E3FE /* mgr */, + A954A82B13EE98B30094E3FE /* modules */, + A954A8CF13EE98B30094E3FE /* utilfuns */, ); - path = internal; - sourceTree = ""; - }; - A9D439CE11C52E9B007AFE83 /* regex */ = { - isa = PBXGroup; - children = ( - A9D439CF11C52E9B007AFE83 /* regex.h */, - ); - path = regex; + name = src; + path = ../../src; sourceTree = ""; }; - A9FB264111FD95CD004C4295 /* clucene */ = { + A954A7F613EE98B30094E3FE /* frontend */ = { isa = PBXGroup; children = ( - A9FB264311FD95CD004C4295 /* CLucene */, - A9FB273611FD95CD004C4295 /* CLucene.h */, + A954A80113EE98B30094E3FE /* swdisp.cpp */, + A954A80213EE98B30094E3FE /* swlog.cpp */, ); - name = clucene; - path = dependencies/clucene; + path = frontend; sourceTree = ""; }; - A9FB264311FD95CD004C4295 /* CLucene */ = { + A954A80713EE98B30094E3FE /* keys */ = { isa = PBXGroup; children = ( - A9FB264411FD95CD004C4295 /* analysis */, - A9FB265111FD95CD004C4295 /* CLBackwards.h */, - A9FB265211FD95CD004C4295 /* CLConfig.h */, - A9FB265311FD95CD004C4295 /* clucene-config.h */, - A9FB265411FD95CD004C4295 /* config */, - A9FB266B11FD95CD004C4295 /* debug */, - A9FB267311FD95CD004C4295 /* document */, - A9FB267A11FD95CD004C4295 /* index */, - A9FB26A911FD95CD004C4295 /* LuceneThreads.h */, - A9FB26AA11FD95CD004C4295 /* queryParser */, - A9FB26B711FD95CD004C4295 /* search */, - A9FB270111FD95CD004C4295 /* StdHeader.cpp */, - A9FB270211FD95CD004C4295 /* StdHeader.h */, - A9FB270311FD95CD004C4295 /* store */, - A9FB271411FD95CD004C4295 /* util */, + A954A80913EE98B30094E3FE /* listkey.cpp */, + A954A81013EE98B30094E3FE /* strkey.cpp */, + A954A81113EE98B30094E3FE /* swkey.cpp */, + A954A81213EE98B30094E3FE /* treekey.cpp */, + A954A81313EE98B30094E3FE /* treekeyidx.cpp */, + A954A81413EE98B30094E3FE /* versekey.cpp */, + A954A81513EE98B30094E3FE /* versetreekey.cpp */, ); - path = CLucene; + path = keys; sourceTree = ""; }; - A9FB264411FD95CD004C4295 /* analysis */ = { + A954A81713EE98B30094E3FE /* mgr */ = { isa = PBXGroup; children = ( - A9FB264511FD95CD004C4295 /* AnalysisHeader.cpp */, - A9FB264611FD95CD004C4295 /* AnalysisHeader.h */, - A9FB264711FD95CD004C4295 /* Analyzers.cpp */, - A9FB264811FD95CD004C4295 /* Analyzers.h */, - A9FB264911FD95CD004C4295 /* standard */, + A96C2351176AF188008D714B /* remotetrans.cpp */, + A91C8B66175233F3008702B9 /* versificationmgr.cpp */, + A954A81813EE98B30094E3FE /* curlftpt.cpp */, + A954A81913EE98B30094E3FE /* curlhttpt.cpp */, + A954A81A13EE98B30094E3FE /* encfiltmgr.cpp */, + A954A81B13EE98B30094E3FE /* filemgr.cpp */, + A954A81C13EE98B30094E3FE /* ftplibftpt.cpp */, + A954A81E13EE98B30094E3FE /* installmgr.cpp */, + A954A81F13EE98B30094E3FE /* localemgr.cpp */, + A954A82213EE98B30094E3FE /* markupfiltmgr.cpp */, + A954A82313EE98B30094E3FE /* stringmgr.cpp */, + A954A82413EE98B30094E3FE /* swcacher.cpp */, + A954A82513EE98B30094E3FE /* swconfig.cpp */, + A954A82613EE98B30094E3FE /* swfiltermgr.cpp */, + A954A82713EE98B30094E3FE /* swlocale.cpp */, + A954A82813EE98B30094E3FE /* swmgr.cpp */, + A954A82913EE98B30094E3FE /* swsearchable.cpp */, ); - path = analysis; + path = mgr; sourceTree = ""; }; - A9FB264911FD95CD004C4295 /* standard */ = { + A954A82B13EE98B30094E3FE /* modules */ = { isa = PBXGroup; children = ( - A9FB264A11FD95CD004C4295 /* StandardAnalyzer.cpp */, - A9FB264B11FD95CD004C4295 /* StandardAnalyzer.h */, - A9FB264C11FD95CD004C4295 /* StandardFilter.cpp */, - A9FB264D11FD95CD004C4295 /* StandardFilter.h */, - A9FB264E11FD95CD004C4295 /* StandardTokenizer.cpp */, - A9FB264F11FD95CD004C4295 /* StandardTokenizer.h */, - A9FB265011FD95CD004C4295 /* StandardTokenizerConstants.h */, + A954A82C13EE98B30094E3FE /* comments */, + A954A84313EE98B30094E3FE /* common */, + A954A85413EE98B30094E3FE /* filters */, + A954A8A113EE98B30094E3FE /* genbook */, + A954A8A913EE98B30094E3FE /* lexdict */, + A954A8BC13EE98B30094E3FE /* swmodule.cpp */, + A954A8BD13EE98B30094E3FE /* tests */, + A954A8C013EE98B30094E3FE /* texts */, ); - path = standard; + path = modules; sourceTree = ""; }; - A9FB265411FD95CD004C4295 /* config */ = { + A954A82C13EE98B30094E3FE /* comments */ = { isa = PBXGroup; children = ( - A9FB265511FD95CD004C4295 /* compiler.h */, - A9FB265611FD95CD004C4295 /* CompilerBcb.h */, - A9FB265711FD95CD004C4295 /* CompilerGcc.h */, - A9FB265811FD95CD004C4295 /* CompilerMsvc.h */, - A9FB265911FD95CD004C4295 /* define_std.h */, - A9FB265A11FD95CD004C4295 /* gunichartables.cpp */, - A9FB265B11FD95CD004C4295 /* gunichartables.h */, - A9FB265C11FD95CD004C4295 /* PlatformMac.h */, - A9FB265D11FD95CD004C4295 /* PlatformUnix.h */, - A9FB265E11FD95CD004C4295 /* PlatformWin32.h */, - A9FB265F11FD95CD004C4295 /* repl_lltot.cpp */, - A9FB266011FD95CD004C4295 /* repl_tchar.h */, - A9FB266111FD95CD004C4295 /* repl_tcscasecmp.cpp */, - A9FB266211FD95CD004C4295 /* repl_tcslwr.cpp */, - A9FB266311FD95CD004C4295 /* repl_tcstod.cpp */, - A9FB266411FD95CD004C4295 /* repl_tcstoll.cpp */, - A9FB266511FD95CD004C4295 /* repl_tprintf.cpp */, - A9FB266611FD95CD004C4295 /* repl_wchar.h */, - A9FB266711FD95CD004C4295 /* threadCSection.h */, - A9FB266811FD95CD004C4295 /* threadPthread.h */, - A9FB266911FD95CD004C4295 /* threads.cpp */, - A9FB266A11FD95CD004C4295 /* utf8.cpp */, + A954A82D13EE98B30094E3FE /* hrefcom */, + A954A83313EE98B30094E3FE /* rawcom */, + A954A83713EE98B30094E3FE /* rawcom4 */, + A954A83A13EE98B30094E3FE /* rawfiles */, + A954A83E13EE98B30094E3FE /* swcom.cpp */, + A954A83F13EE98B30094E3FE /* zcom */, ); - path = config; + path = comments; sourceTree = ""; }; - A9FB266B11FD95CD004C4295 /* debug */ = { + A954A82D13EE98B30094E3FE /* hrefcom */ = { isa = PBXGroup; children = ( - A9FB266C11FD95CD004C4295 /* condition.cpp */, - A9FB266D11FD95CD004C4295 /* condition.h */, - A9FB266E11FD95CD004C4295 /* error.cpp */, - A9FB266F11FD95CD004C4295 /* error.h */, - A9FB267011FD95CD004C4295 /* lucenebase.h */, - A9FB267111FD95CD004C4295 /* mem.h */, - A9FB267211FD95CD004C4295 /* memtracking.cpp */, + A954A82E13EE98B30094E3FE /* hrefcom.cpp */, ); - path = debug; + path = hrefcom; sourceTree = ""; }; - A9FB267311FD95CD004C4295 /* document */ = { + A954A83313EE98B30094E3FE /* rawcom */ = { isa = PBXGroup; children = ( - A9FB267411FD95CD004C4295 /* DateField.cpp */, - A9FB267511FD95CD004C4295 /* DateField.h */, - A9FB267611FD95CD004C4295 /* Document.cpp */, - A9FB267711FD95CD004C4295 /* Document.h */, - A9FB267811FD95CD004C4295 /* Field.cpp */, - A9FB267911FD95CD004C4295 /* Field.h */, + A954A83613EE98B30094E3FE /* rawcom.cpp */, ); - path = document; + path = rawcom; sourceTree = ""; }; - A9FB267A11FD95CD004C4295 /* index */ = { + A954A83713EE98B30094E3FE /* rawcom4 */ = { isa = PBXGroup; children = ( - A9FB267B11FD95CD004C4295 /* CompoundFile.cpp */, - A9FB267C11FD95CD004C4295 /* CompoundFile.h */, - A9FB267D11FD95CD004C4295 /* DocumentWriter.cpp */, - A9FB267E11FD95CD004C4295 /* DocumentWriter.h */, - A9FB267F11FD95CD004C4295 /* FieldInfo.h */, - A9FB268011FD95CD004C4295 /* FieldInfos.cpp */, - A9FB268111FD95CD004C4295 /* FieldInfos.h */, - A9FB268211FD95CD004C4295 /* FieldsReader.cpp */, - A9FB268311FD95CD004C4295 /* FieldsReader.h */, - A9FB268411FD95CD004C4295 /* FieldsWriter.cpp */, - A9FB268511FD95CD004C4295 /* FieldsWriter.h */, - A9FB268611FD95CD004C4295 /* IndexModifier.cpp */, - A9FB268711FD95CD004C4295 /* IndexModifier.h */, - A9FB268811FD95CD004C4295 /* IndexReader.cpp */, - A9FB268911FD95CD004C4295 /* IndexReader.h */, - A9FB268A11FD95CD004C4295 /* IndexWriter.cpp */, - A9FB268B11FD95CD004C4295 /* IndexWriter.h */, - A9FB268C11FD95CD004C4295 /* MultiReader.cpp */, - A9FB268D11FD95CD004C4295 /* MultiReader.h */, - A9FB268E11FD95CD004C4295 /* SegmentHeader.h */, - A9FB268F11FD95CD004C4295 /* SegmentInfos.cpp */, - A9FB269011FD95CD004C4295 /* SegmentInfos.h */, - A9FB269111FD95CD004C4295 /* SegmentMergeInfo.cpp */, - A9FB269211FD95CD004C4295 /* SegmentMergeInfo.h */, - A9FB269311FD95CD004C4295 /* SegmentMergeQueue.cpp */, - A9FB269411FD95CD004C4295 /* SegmentMergeQueue.h */, - A9FB269511FD95CD004C4295 /* SegmentMerger.cpp */, - A9FB269611FD95CD004C4295 /* SegmentMerger.h */, - A9FB269711FD95CD004C4295 /* SegmentReader.cpp */, - A9FB269811FD95CD004C4295 /* SegmentTermDocs.cpp */, - A9FB269911FD95CD004C4295 /* SegmentTermEnum.cpp */, - A9FB269A11FD95CD004C4295 /* SegmentTermEnum.h */, - A9FB269B11FD95CD004C4295 /* SegmentTermPositions.cpp */, - A9FB269C11FD95CD004C4295 /* SegmentTermVector.cpp */, - A9FB269D11FD95CD004C4295 /* Term.cpp */, - A9FB269E11FD95CD004C4295 /* Term.h */, - A9FB269F11FD95CD004C4295 /* TermInfo.cpp */, - A9FB26A011FD95CD004C4295 /* TermInfo.h */, - A9FB26A111FD95CD004C4295 /* TermInfosReader.cpp */, - A9FB26A211FD95CD004C4295 /* TermInfosReader.h */, - A9FB26A311FD95CD004C4295 /* TermInfosWriter.cpp */, - A9FB26A411FD95CD004C4295 /* TermInfosWriter.h */, - A9FB26A511FD95CD004C4295 /* Terms.h */, - A9FB26A611FD95CD004C4295 /* TermVector.h */, - A9FB26A711FD95CD004C4295 /* TermVectorReader.cpp */, - A9FB26A811FD95CD004C4295 /* TermVectorWriter.cpp */, + A954A83913EE98B30094E3FE /* rawcom4.cpp */, ); - path = index; + path = rawcom4; sourceTree = ""; }; - A9FB26AA11FD95CD004C4295 /* queryParser */ = { + A954A83A13EE98B30094E3FE /* rawfiles */ = { isa = PBXGroup; children = ( - A9FB26AB11FD95CD004C4295 /* Lexer.cpp */, - A9FB26AC11FD95CD004C4295 /* Lexer.h */, - A9FB26AD11FD95CD004C4295 /* MultiFieldQueryParser.cpp */, - A9FB26AE11FD95CD004C4295 /* MultiFieldQueryParser.h */, - A9FB26AF11FD95CD004C4295 /* QueryParser.cpp */, - A9FB26B011FD95CD004C4295 /* QueryParser.h */, - A9FB26B111FD95CD004C4295 /* QueryParserBase.cpp */, - A9FB26B211FD95CD004C4295 /* QueryParserBase.h */, - A9FB26B311FD95CD004C4295 /* QueryToken.cpp */, - A9FB26B411FD95CD004C4295 /* QueryToken.h */, - A9FB26B511FD95CD004C4295 /* TokenList.cpp */, - A9FB26B611FD95CD004C4295 /* TokenList.h */, + A954A83D13EE98B30094E3FE /* rawfiles.cpp */, ); - path = queryParser; + path = rawfiles; sourceTree = ""; }; - A9FB26B711FD95CD004C4295 /* search */ = { + A954A83F13EE98B30094E3FE /* zcom */ = { isa = PBXGroup; children = ( - A9FB26B811FD95CD004C4295 /* BooleanClause.h */, - A9FB26B911FD95CD004C4295 /* BooleanQuery.cpp */, - A9FB26BA11FD95CD004C4295 /* BooleanQuery.h */, - A9FB26BB11FD95CD004C4295 /* BooleanScorer.cpp */, - A9FB26BC11FD95CD004C4295 /* BooleanScorer.h */, - A9FB26BD11FD95CD004C4295 /* CachingWrapperFilter.cpp */, - A9FB26BE11FD95CD004C4295 /* CachingWrapperFilter.h */, - A9FB26BF11FD95CD004C4295 /* ChainedFilter.cpp */, - A9FB26C011FD95CD004C4295 /* ChainedFilter.h */, - A9FB26C111FD95CD004C4295 /* Compare.h */, - A9FB26C211FD95CD004C4295 /* ConjunctionScorer.cpp */, - A9FB26C311FD95CD004C4295 /* ConjunctionScorer.h */, - A9FB26C411FD95CD004C4295 /* DateFilter.cpp */, - A9FB26C511FD95CD004C4295 /* DateFilter.h */, - A9FB26C611FD95CD004C4295 /* ExactPhraseScorer.cpp */, - A9FB26C711FD95CD004C4295 /* ExactPhraseScorer.h */, - A9FB26C811FD95CD004C4295 /* Explanation.cpp */, - A9FB26C911FD95CD004C4295 /* Explanation.h */, - A9FB26CA11FD95CD004C4295 /* FieldCache.cpp */, - A9FB26CB11FD95CD004C4295 /* FieldCache.h */, - A9FB26CC11FD95CD004C4295 /* FieldCacheImpl.cpp */, - A9FB26CD11FD95CD004C4295 /* FieldCacheImpl.h */, - A9FB26CE11FD95CD004C4295 /* FieldDoc.h */, - A9FB26CF11FD95CD004C4295 /* FieldDocSortedHitQueue.cpp */, - A9FB26D011FD95CD004C4295 /* FieldDocSortedHitQueue.h */, - A9FB26D111FD95CD004C4295 /* FieldSortedHitQueue.cpp */, - A9FB26D211FD95CD004C4295 /* FieldSortedHitQueue.h */, - A9FB26D311FD95CD004C4295 /* Filter.h */, - A9FB26D411FD95CD004C4295 /* FilteredTermEnum.cpp */, - A9FB26D511FD95CD004C4295 /* FilteredTermEnum.h */, - A9FB26D611FD95CD004C4295 /* FuzzyQuery.cpp */, - A9FB26D711FD95CD004C4295 /* FuzzyQuery.h */, - A9FB26D811FD95CD004C4295 /* HitQueue.cpp */, - A9FB26D911FD95CD004C4295 /* HitQueue.h */, - A9FB26DA11FD95CD004C4295 /* Hits.cpp */, - A9FB26DB11FD95CD004C4295 /* IndexSearcher.cpp */, - A9FB26DC11FD95CD004C4295 /* IndexSearcher.h */, - A9FB26DD11FD95CD004C4295 /* MultiSearcher.cpp */, - A9FB26DE11FD95CD004C4295 /* MultiSearcher.h */, - A9FB26DF11FD95CD004C4295 /* MultiTermQuery.cpp */, - A9FB26E011FD95CD004C4295 /* MultiTermQuery.h */, - A9FB26E111FD95CD004C4295 /* PhrasePositions.cpp */, - A9FB26E211FD95CD004C4295 /* PhrasePositions.h */, - A9FB26E311FD95CD004C4295 /* PhraseQuery.cpp */, - A9FB26E411FD95CD004C4295 /* PhraseQuery.h */, - A9FB26E511FD95CD004C4295 /* PhraseQueue.h */, - A9FB26E611FD95CD004C4295 /* PhraseScorer.cpp */, - A9FB26E711FD95CD004C4295 /* PhraseScorer.h */, - A9FB26E811FD95CD004C4295 /* PrefixQuery.cpp */, - A9FB26E911FD95CD004C4295 /* PrefixQuery.h */, - A9FB26EA11FD95CD004C4295 /* QueryFilter.cpp */, - A9FB26EB11FD95CD004C4295 /* QueryFilter.h */, - A9FB26EC11FD95CD004C4295 /* RangeFilter.cpp */, - A9FB26ED11FD95CD004C4295 /* RangeFilter.h */, - A9FB26EE11FD95CD004C4295 /* RangeQuery.cpp */, - A9FB26EF11FD95CD004C4295 /* RangeQuery.h */, - A9FB26F011FD95CD004C4295 /* Scorer.h */, - A9FB26F111FD95CD004C4295 /* SearchHeader.cpp */, - A9FB26F211FD95CD004C4295 /* SearchHeader.h */, - A9FB26F311FD95CD004C4295 /* Similarity.cpp */, - A9FB26F411FD95CD004C4295 /* Similarity.h */, - A9FB26F511FD95CD004C4295 /* SloppyPhraseScorer.cpp */, - A9FB26F611FD95CD004C4295 /* SloppyPhraseScorer.h */, - A9FB26F711FD95CD004C4295 /* Sort.cpp */, - A9FB26F811FD95CD004C4295 /* Sort.h */, - A9FB26F911FD95CD004C4295 /* TermQuery.cpp */, - A9FB26FA11FD95CD004C4295 /* TermQuery.h */, - A9FB26FB11FD95CD004C4295 /* TermScorer.cpp */, - A9FB26FC11FD95CD004C4295 /* TermScorer.h */, - A9FB26FD11FD95CD004C4295 /* WildcardQuery.cpp */, - A9FB26FE11FD95CD004C4295 /* WildcardQuery.h */, - A9FB26FF11FD95CD004C4295 /* WildcardTermEnum.cpp */, - A9FB270011FD95CD004C4295 /* WildcardTermEnum.h */, + A954A84013EE98B30094E3FE /* Makefile */, + A954A84113EE98B30094E3FE /* Makefile.am */, + A954A84213EE98B30094E3FE /* zcom.cpp */, ); - path = search; + path = zcom; sourceTree = ""; }; - A9FB270311FD95CD004C4295 /* store */ = { + A954A84313EE98B30094E3FE /* common */ = { isa = PBXGroup; children = ( - A9FB270411FD95CD004C4295 /* Directory.h */, - A9FB270511FD95CD004C4295 /* FSDirectory.cpp */, - A9FB270611FD95CD004C4295 /* FSDirectory.h */, - A9FB270711FD95CD004C4295 /* IndexInput.cpp */, - A9FB270811FD95CD004C4295 /* IndexInput.h */, - A9FB270911FD95CD004C4295 /* IndexOutput.cpp */, - A9FB270A11FD95CD004C4295 /* IndexOutput.h */, - A9FB270B11FD95CD004C4295 /* InputStream.h */, - A9FB270C11FD95CD004C4295 /* Lock.cpp */, - A9FB270D11FD95CD004C4295 /* Lock.h */, - A9FB270E11FD95CD004C4295 /* MMapInput.cpp */, - A9FB270F11FD95CD004C4295 /* OutputStream.h */, - A9FB271011FD95CD004C4295 /* RAMDirectory.cpp */, - A9FB271111FD95CD004C4295 /* RAMDirectory.h */, - A9FB271211FD95CD004C4295 /* TransactionalRAMDirectory.cpp */, - A9FB271311FD95CD004C4295 /* TransactionalRAMDirectory.h */, + A999FF3917951C8900E65919 /* bz2comprs.cpp */, + A999FF3A17951C8900E65919 /* xzcomprs.cpp */, + A954A84513EE98B30094E3FE /* entriesblk.cpp */, + A954A84613EE98B30094E3FE /* lzsscomprs.cpp */, + A954A84913EE98B30094E3FE /* rawstr.cpp */, + A954A84A13EE98B30094E3FE /* rawstr4.cpp */, + A954A84B13EE98B30094E3FE /* rawverse.cpp */, + A954A84C13EE98B30094E3FE /* rawverse4.cpp */, + A954A84D13EE98B30094E3FE /* sapphire.cpp */, + A954A84E13EE98B30094E3FE /* swcipher.cpp */, + A954A84F13EE98B30094E3FE /* swcomprs.cpp */, + A954A85113EE98B30094E3FE /* zipcomprs.cpp */, + A954A85213EE98B30094E3FE /* zstr.cpp */, + A954A85313EE98B30094E3FE /* zverse.cpp */, ); - path = store; + path = common; sourceTree = ""; }; - A9FB271411FD95CD004C4295 /* util */ = { + A954A85413EE98B30094E3FE /* filters */ = { isa = PBXGroup; children = ( - A9FB271511FD95CD004C4295 /* Arrays.h */, - A9FB271611FD95CD004C4295 /* BitSet.cpp */, - A9FB271711FD95CD004C4295 /* BitSet.h */, - A9FB271811FD95CD004C4295 /* bufferedstream.h */, - A9FB271911FD95CD004C4295 /* dirent.cpp */, - A9FB271A11FD95CD004C4295 /* dirent2.h */, - A9FB271B11FD95CD004C4295 /* Equators.cpp */, - A9FB271C11FD95CD004C4295 /* Equators.h */, - A9FB271D11FD95CD004C4295 /* FastCharStream.cpp */, - A9FB271E11FD95CD004C4295 /* FastCharStream.h */, - A9FB271F11FD95CD004C4295 /* fileinputstream.cpp */, - A9FB272011FD95CD004C4295 /* fileinputstream.h */, - A9FB272111FD95CD004C4295 /* googlesparsemap.h */, - A9FB272211FD95CD004C4295 /* inputstreambuffer.h */, - A9FB272311FD95CD004C4295 /* jstreamsconfig.h */, - A9FB272411FD95CD004C4295 /* MD5Digester.cpp */, - A9FB272511FD95CD004C4295 /* MD5Digester.h */, - A9FB272611FD95CD004C4295 /* Misc.cpp */, - A9FB272711FD95CD004C4295 /* Misc.h */, - A9FB272811FD95CD004C4295 /* PriorityQueue.h */, - A9FB272911FD95CD004C4295 /* Reader.cpp */, - A9FB272A11FD95CD004C4295 /* Reader.h */, - A9FB272B11FD95CD004C4295 /* streambase.h */, - A9FB272C11FD95CD004C4295 /* StringBuffer.cpp */, - A9FB272D11FD95CD004C4295 /* StringBuffer.h */, - A9FB272E11FD95CD004C4295 /* StringIntern.cpp */, - A9FB272F11FD95CD004C4295 /* StringIntern.h */, - A9FB273011FD95CD004C4295 /* stringreader.h */, - A9FB273111FD95CD004C4295 /* subinputstream.h */, - A9FB273211FD95CD004C4295 /* ThreadLocal.cpp */, - A9FB273311FD95CD004C4295 /* ThreadLocal.h */, - A9FB273411FD95CD004C4295 /* VoidList.h */, - A9FB273511FD95CD004C4295 /* VoidMap.h */, + A999FF3D17951CA000E65919 /* scsuutf8.cpp */, + A96C2353176AF19C008D714B /* osisenum.cpp */, + A96C2354176AF19C008D714B /* osisglosses.cpp */, + A96C2355176AF19C008D714B /* osisxlit.cpp */, + A96C2355176AF19C008D714B /* osisreferencelinks.cpp */, + A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */, + A954A85513EE98B30094E3FE /* cipherfil.cpp */, + A954A85613EE98B30094E3FE /* gbffootnotes.cpp */, + A954A85713EE98B30094E3FE /* gbfheadings.cpp */, + A954A85813EE98B30094E3FE /* gbfhtml.cpp */, + A954A85913EE98B30094E3FE /* gbfhtmlhref.cpp */, + A954A85A13EE98B30094E3FE /* gbfmorph.cpp */, + A954A85B13EE98B30094E3FE /* gbfosis.cpp */, + A954A85C13EE98B30094E3FE /* gbfplain.cpp */, + A954A85D13EE98B30094E3FE /* gbfredletterwords.cpp */, + A954A85E13EE98B30094E3FE /* gbfrtf.cpp */, + A954A85F13EE98B30094E3FE /* gbfstrongs.cpp */, + A954A86013EE98B30094E3FE /* gbfthml.cpp */, + A954A86113EE98B30094E3FE /* gbfwebif.cpp */, + A954A86213EE98B30094E3FE /* gbfwordjs.cpp */, + A954A86313EE98B30094E3FE /* gbfxhtml.cpp */, + A954A86413EE98B30094E3FE /* greeklexattribs.cpp */, + A954A86513EE98B30094E3FE /* latin1utf16.cpp */, + A954A86613EE98B30094E3FE /* latin1utf8.cpp */, + A954A86913EE98B30094E3FE /* osisfootnotes.cpp */, + A954A86A13EE98B30094E3FE /* osisheadings.cpp */, + A954A86B13EE98B30094E3FE /* osishtmlhref.cpp */, + A954A86C13EE98B30094E3FE /* osislemma.cpp */, + A954A86D13EE98B30094E3FE /* osismorph.cpp */, + A954A86E13EE98B30094E3FE /* osismorphsegmentation.cpp */, + A954A86F13EE98B30094E3FE /* osisosis.cpp */, + A954A87013EE98B30094E3FE /* osisplain.cpp */, + A954A87113EE98B30094E3FE /* osisredletterwords.cpp */, + A954A87213EE98B30094E3FE /* osisrtf.cpp */, + A954A87413EE98B30094E3FE /* osisscripref.cpp */, + A954A87513EE98B30094E3FE /* osisstrongs.cpp */, + A954A87613EE98B30094E3FE /* osisvariants.cpp */, + A954A87713EE98B30094E3FE /* osiswebif.cpp */, + A954A87813EE98B30094E3FE /* osiswordjs.cpp */, + A954A87913EE98B30094E3FE /* osisxhtml.cpp */, + A954A87A13EE98B30094E3FE /* papyriplain.cpp */, + A954A87D13EE98B30094E3FE /* rtfhtml.cpp */, + A954A87E13EE98B30094E3FE /* swbasicfilter.cpp */, + A954A87F13EE98B30094E3FE /* swoptfilter.cpp */, + A954A88013EE98B30094E3FE /* teihtmlhref.cpp */, + A954A88113EE98B30094E3FE /* teiplain.cpp */, + A954A88213EE98B30094E3FE /* teirtf.cpp */, + A954A88313EE98B30094E3FE /* thmlfootnotes.cpp */, + A954A88413EE98B30094E3FE /* thmlgbf.cpp */, + A954A88513EE98B30094E3FE /* thmlheadings.cpp */, + A954A88613EE98B30094E3FE /* thmlhtml.cpp */, + A954A88713EE98B30094E3FE /* thmlhtmlhref.cpp */, + A954A88813EE98B30094E3FE /* thmllemma.cpp */, + A954A88913EE98B30094E3FE /* thmlmorph.cpp */, + A954A88A13EE98B30094E3FE /* thmlosis.cpp */, + A954A88B13EE98B30094E3FE /* thmlplain.cpp */, + A954A88C13EE98B30094E3FE /* thmlrtf.cpp */, + A954A88D13EE98B30094E3FE /* thmlscripref.cpp */, + A954A88E13EE98B30094E3FE /* thmlstrongs.cpp */, + A954A88F13EE98B30094E3FE /* thmlvariants.cpp */, + A954A89013EE98B30094E3FE /* thmlwebif.cpp */, + A954A89113EE98B30094E3FE /* thmlwordjs.cpp */, + A954A89213EE98B30094E3FE /* thmlxhtml.cpp */, + A954A89313EE98B30094E3FE /* unicodertf.cpp */, + A954A89413EE98B30094E3FE /* utf16utf8.cpp */, + A954A89513EE98B30094E3FE /* utf8arabicpoints.cpp */, + A954A89613EE98B30094E3FE /* utf8arshaping.cpp */, + A954A89713EE98B30094E3FE /* utf8bidireorder.cpp */, + A954A89813EE98B30094E3FE /* utf8cantillation.cpp */, + A954A89913EE98B30094E3FE /* utf8greekaccents.cpp */, + A954A89A13EE98B30094E3FE /* utf8hebrewpoints.cpp */, + A954A89B13EE98B30094E3FE /* utf8html.cpp */, + A954A89C13EE98B30094E3FE /* utf8latin1.cpp */, + A954A89D13EE98B30094E3FE /* utf8nfc.cpp */, + A954A89E13EE98B30094E3FE /* utf8nfkd.cpp */, + A954A89F13EE98B30094E3FE /* utf8transliterator.cpp */, + A954A8A013EE98B30094E3FE /* utf8utf16.cpp */, ); - path = util; + path = filters; sourceTree = ""; }; - A9FB282011FD95E4004C4295 /* src */ = { - isa = PBXGroup; - children = ( - A9FB282111FD95E4004C4295 /* frontend */, - A9FB282C11FD95E4004C4295 /* keys */, - A9FB283911FD95E4004C4295 /* mgr */, - A9FB284B11FD95E4004C4295 /* modules */, - A9FB28C711FD95E4004C4295 /* utilfuns */, - ); - name = src; - path = "../../../../macsword/macsword-bzr/trunk/sword_src/sword-trunk/src"; - sourceTree = SOURCE_ROOT; - }; - A9FB282111FD95E4004C4295 /* frontend */ = { + A954A8A113EE98B30094E3FE /* genbook */ = { isa = PBXGroup; children = ( - A9FB282211FD95E4004C4295 /* framework */, - A9FB282411FD95E4004C4295 /* im */, - A9FB282811FD95E4004C4295 /* swdisp.cpp */, - A9FB282911FD95E4004C4295 /* swlog.cpp */, - A9FB282A11FD95E4004C4295 /* windoze */, - A9FB282B11FD95E4004C4295 /* X11 */, + A954A8A413EE98B30094E3FE /* rawgenbook */, + A954A8A813EE98B30094E3FE /* swgenbook.cpp */, ); - path = frontend; + path = genbook; sourceTree = ""; }; - A9FB282211FD95E4004C4295 /* framework */ = { + A954A8A413EE98B30094E3FE /* rawgenbook */ = { isa = PBXGroup; children = ( - A9FB282311FD95E4004C4295 /* femain.cpp */, + A954A8A713EE98B30094E3FE /* rawgenbook.cpp */, ); - path = framework; + path = rawgenbook; sourceTree = ""; }; - A9FB282411FD95E4004C4295 /* im */ = { + A954A8A913EE98B30094E3FE /* lexdict */ = { isa = PBXGroup; children = ( - A9FB282511FD95E4004C4295 /* hebrewmcim.cpp */, - A9FB282611FD95E4004C4295 /* nullim.cpp */, - A9FB282711FD95E4004C4295 /* swinputmeth.cpp */, + A954A8AC13EE98B30094E3FE /* rawld */, + A954A8B013EE98B30094E3FE /* rawld4 */, + A954A8B413EE98B30094E3FE /* swld.cpp */, + A954A8B513EE98B30094E3FE /* zld */, ); - path = im; + path = lexdict; sourceTree = ""; }; - A9FB282A11FD95E4004C4295 /* windoze */ = { + A954A8AC13EE98B30094E3FE /* rawld */ = { isa = PBXGroup; children = ( + A954A8AF13EE98B30094E3FE /* rawld.cpp */, ); - path = windoze; + path = rawld; sourceTree = ""; }; - A9FB282B11FD95E4004C4295 /* X11 */ = { + A954A8B013EE98B30094E3FE /* rawld4 */ = { isa = PBXGroup; children = ( + A954A8B313EE98B30094E3FE /* rawld4.cpp */, ); - path = X11; + path = rawld4; sourceTree = ""; }; - A9FB282C11FD95E4004C4295 /* keys */ = { + A954A8B513EE98B30094E3FE /* zld */ = { isa = PBXGroup; children = ( - A9FB282D11FD95E4004C4295 /* genarray.c */, - A9FB282E11FD95E4004C4295 /* listkey.cpp */, - A9FB282F11FD95E4004C4295 /* nt.bks */, - A9FB283011FD95E4004C4295 /* nt.cps */, - A9FB283111FD95E4004C4295 /* ot.bks */, - A9FB283211FD95E4004C4295 /* ot.cps */, - A9FB283311FD95E4004C4295 /* strkey.cpp */, - A9FB283411FD95E4004C4295 /* swkey.cpp */, - A9FB283511FD95E4004C4295 /* treekey.cpp */, - A9FB283611FD95E4004C4295 /* treekeyidx.cpp */, - A9FB283711FD95E4004C4295 /* versekey.cpp */, - A9FB283811FD95E4004C4295 /* versetreekey.cpp */, + A954A8B813EE98B30094E3FE /* zld.cpp */, ); - path = keys; + path = zld; sourceTree = ""; }; - A9FB283911FD95E4004C4295 /* mgr */ = { + A954A8BD13EE98B30094E3FE /* tests */ = { isa = PBXGroup; children = ( - A9FB283A11FD95E4004C4295 /* curlftpt.cpp */, - A9FB283B11FD95E4004C4295 /* curlhttpt.cpp */, - A9FB283C11FD95E4004C4295 /* encfiltmgr.cpp */, - A9FB283D11FD95E4004C4295 /* filemgr.cpp */, - A9FB283E11FD95E4004C4295 /* ftplibftpt.cpp */, - A9FB283F11FD95E4004C4295 /* ftptrans.cpp */, - A9FB284011FD95E4004C4295 /* installmgr.cpp */, - A9FB284111FD95E4004C4295 /* localemgr.cpp */, - A9FB284211FD95E4004C4295 /* markupfiltmgr.cpp */, - A9FB284311FD95E4004C4295 /* stringmgr.cpp */, - A9FB284411FD95E4004C4295 /* swcacher.cpp */, - A9FB284511FD95E4004C4295 /* swconfig.cpp */, - A9FB284611FD95E4004C4295 /* swfiltermgr.cpp */, - A9FB284711FD95E4004C4295 /* swlocale.cpp */, - A9FB284811FD95E4004C4295 /* swmgr.cpp */, - A9FB284911FD95E4004C4295 /* swsearchable.cpp */, - A9FB284A11FD95E4004C4295 /* versemgr.cpp */, + A954A8BE13EE98B30094E3FE /* echomod.cpp */, ); - path = mgr; + path = tests; sourceTree = ""; }; - A9FB284B11FD95E4004C4295 /* modules */ = { + A954A8C013EE98B30094E3FE /* texts */ = { isa = PBXGroup; children = ( - A9FB284C11FD95E4004C4295 /* comments */, - A9FB285811FD95E4004C4295 /* common */, - A9FB286711FD95E4004C4295 /* filters */, - A9FB28AF11FD95E4004C4295 /* genbook */, - A9FB28B311FD95E4004C4295 /* lexdict */, - A9FB28BB11FD95E4004C4295 /* readme */, - A9FB28BC11FD95E4004C4295 /* swmodule.cpp */, - A9FB28BD11FD95E4004C4295 /* tests */, - A9FB28BF11FD95E4004C4295 /* texts */, + A954A8C313EE98B30094E3FE /* rawtext */, + A954A8C713EE98B30094E3FE /* rawtext4 */, + A954A8CA13EE98B30094E3FE /* swtext.cpp */, + A954A8CB13EE98B30094E3FE /* ztext */, ); - path = modules; + path = texts; sourceTree = ""; }; - A9FB284C11FD95E4004C4295 /* comments */ = { + A954A8C313EE98B30094E3FE /* rawtext */ = { isa = PBXGroup; children = ( - A9FB284D11FD95E4004C4295 /* hrefcom */, - A9FB284F11FD95E4004C4295 /* rawcom */, - A9FB285111FD95E4004C4295 /* rawcom4 */, - A9FB285311FD95E4004C4295 /* rawfiles */, - A9FB285511FD95E4004C4295 /* swcom.cpp */, - A9FB285611FD95E4004C4295 /* zcom */, + A954A8C613EE98B30094E3FE /* rawtext.cpp */, ); - path = comments; + path = rawtext; sourceTree = ""; }; - A9FB284D11FD95E4004C4295 /* hrefcom */ = { + A954A8C713EE98B30094E3FE /* rawtext4 */ = { isa = PBXGroup; children = ( - A9FB284E11FD95E4004C4295 /* hrefcom.cpp */, + A954A8C913EE98B30094E3FE /* rawtext4.cpp */, ); - path = hrefcom; + path = rawtext4; sourceTree = ""; }; - A9FB284F11FD95E4004C4295 /* rawcom */ = { + A954A8CB13EE98B30094E3FE /* ztext */ = { isa = PBXGroup; children = ( - A9FB285011FD95E4004C4295 /* rawcom.cpp */, + A954A8CE13EE98B30094E3FE /* ztext.cpp */, ); - path = rawcom; + path = ztext; sourceTree = ""; }; - A9FB285111FD95E4004C4295 /* rawcom4 */ = { + A954A8CF13EE98B30094E3FE /* utilfuns */ = { isa = PBXGroup; children = ( - A9FB285211FD95E4004C4295 /* rawcom4.cpp */, + A954A8D013EE98B30094E3FE /* ftplib.c */, + A954A8D113EE98B30094E3FE /* ftpparse.c */, + A954A8D413EE98B30094E3FE /* regex.c */, + A954A8D513EE98B30094E3FE /* roman.cpp */, + A954A8D613EE98B30094E3FE /* swbuf.cpp */, + A954A8D713EE98B30094E3FE /* swobject.cpp */, + A954A8D913EE98B30094E3FE /* swversion.cpp */, + A954A8DA13EE98B30094E3FE /* url.cpp */, + A954A8DB13EE98B30094E3FE /* utilstr.cpp */, + A954A8DC13EE98B30094E3FE /* utilxml.cpp */, + A954A8E013EE98B30094E3FE /* zlib */, ); - path = rawcom4; + path = utilfuns; sourceTree = ""; }; - A9FB285311FD95E4004C4295 /* rawfiles */ = { + A954A8E013EE98B30094E3FE /* zlib */ = { isa = PBXGroup; children = ( - A9FB285411FD95E4004C4295 /* rawfiles.cpp */, + A96C233E176AF139008D714B /* gzclose.c */, + A96C2340176AF139008D714B /* gzlib.c */, + A96C2341176AF139008D714B /* gzread.c */, + A96C2342176AF139008D714B /* gzwrite.c */, + A96C2343176AF139008D714B /* infback.c */, + A954A8E113EE98B30094E3FE /* adler32.c */, + A954A8E213EE98B30094E3FE /* compress.c */, + A954A8E313EE98B30094E3FE /* crc32.c */, + A954A8E413EE98B30094E3FE /* deflate.c */, + A954A8EB13EE98B30094E3FE /* inffast.c */, + A954A8EE13EE98B30094E3FE /* inflate.c */, + A954A8EF13EE98B30094E3FE /* inftrees.c */, + A954A8F413EE98B30094E3FE /* trees.c */, + A954A8F613EE98B30094E3FE /* uncompr.c */, + A954A8F713EE98B30094E3FE /* untgz.c */, + A954A8F813EE98B30094E3FE /* zutil.c */, ); - path = rawfiles; + path = zlib; sourceTree = ""; }; - A9FB285611FD95E4004C4295 /* zcom */ = { + A954A9E013EE9A2B0094E3FE /* clucene */ = { isa = PBXGroup; children = ( - A9FB285711FD95E4004C4295 /* zcom.cpp */, + A954A9E213EE9A2B0094E3FE /* CLucene */, + A954AAD513EE9A2B0094E3FE /* CLucene.h */, ); - path = zcom; + name = clucene; + path = dependencies/clucene; sourceTree = ""; }; - A9FB285811FD95E4004C4295 /* common */ = { + A954A9E213EE9A2B0094E3FE /* CLucene */ = { isa = PBXGroup; children = ( - A9FB285911FD95E4004C4295 /* compress.cpp.txt */, - A9FB285A11FD95E4004C4295 /* entriesblk.cpp */, - A9FB285B11FD95E4004C4295 /* lzsscomprs.cpp */, - A9FB285C11FD95E4004C4295 /* rawstr.cpp */, - A9FB285D11FD95E4004C4295 /* rawstr4.cpp */, - A9FB285E11FD95E4004C4295 /* rawverse.cpp */, - A9FB285F11FD95E4004C4295 /* rawverse4.cpp */, - A9FB286011FD95E4004C4295 /* sapphire.cpp */, - A9FB286111FD95E4004C4295 /* swcipher.cpp */, - A9FB286211FD95E4004C4295 /* swcomprs.cpp */, - A9FB286311FD95E4004C4295 /* swcomprs.doc */, - A9FB286411FD95E4004C4295 /* zipcomprs.cpp */, - A9FB286511FD95E4004C4295 /* zstr.cpp */, - A9FB286611FD95E4004C4295 /* zverse.cpp */, + A954A9E313EE9A2B0094E3FE /* analysis */, + A954A9F013EE9A2B0094E3FE /* CLBackwards.h */, + A954A9F113EE9A2B0094E3FE /* CLConfig.h */, + A954A9F213EE9A2B0094E3FE /* clucene-config.h */, + A954A9F313EE9A2B0094E3FE /* config */, + A954AA0A13EE9A2B0094E3FE /* debug */, + A954AA1213EE9A2B0094E3FE /* document */, + A954AA1913EE9A2B0094E3FE /* index */, + A954AA4813EE9A2B0094E3FE /* LuceneThreads.h */, + A954AA4913EE9A2B0094E3FE /* queryParser */, + A954AA5613EE9A2B0094E3FE /* search */, + A954AAA013EE9A2B0094E3FE /* StdHeader.cpp */, + A954AAA113EE9A2B0094E3FE /* StdHeader.h */, + A954AAA213EE9A2B0094E3FE /* store */, + A954AAB313EE9A2B0094E3FE /* util */, ); - path = common; + path = CLucene; sourceTree = ""; }; - A9FB286711FD95E4004C4295 /* filters */ = { + A954A9E313EE9A2B0094E3FE /* analysis */ = { isa = PBXGroup; children = ( - A9FB286811FD95E4004C4295 /* cipherfil.cpp */, - A9FB286911FD95E4004C4295 /* gbffootnotes.cpp */, - A9FB286A11FD95E4004C4295 /* gbfheadings.cpp */, - A9FB286B11FD95E4004C4295 /* gbfhtml.cpp */, - A9FB286C11FD95E4004C4295 /* gbfhtmlhref.cpp */, - A9FB286D11FD95E4004C4295 /* gbfmorph.cpp */, - A9FB286E11FD95E4004C4295 /* gbfosis.cpp */, - A9FB286F11FD95E4004C4295 /* gbfplain.cpp */, - A9FB287011FD95E4004C4295 /* gbfredletterwords.cpp */, - A9FB287111FD95E4004C4295 /* gbfrtf.cpp */, - A9FB287211FD95E4004C4295 /* gbfstrongs.cpp */, - A9FB287311FD95E4004C4295 /* gbfthml.cpp */, - A9FB287411FD95E4004C4295 /* gbfwebif.cpp */, - A9FB287511FD95E4004C4295 /* gbfwordjs.cpp */, - A9FB287611FD95E4004C4295 /* greeklexattribs.cpp */, - A9FB287711FD95E4004C4295 /* latin1utf16.cpp */, - A9FB287811FD95E4004C4295 /* latin1utf8.cpp */, - A9FB287911FD95E4004C4295 /* osisfootnotes.cpp */, - A9FB287A11FD95E4004C4295 /* osisheadings.cpp */, - A9FB287B11FD95E4004C4295 /* osishtmlhref.cpp */, - A9FB287C11FD95E4004C4295 /* osislemma.cpp */, - A9FB287D11FD95E4004C4295 /* osismorph.cpp */, - A9FB287E11FD95E4004C4295 /* osismorphsegmentation.cpp */, - A9FB287F11FD95E4004C4295 /* osisosis.cpp */, - A9FB288011FD95E4004C4295 /* osisplain.cpp */, - A9FB288111FD95E4004C4295 /* osisredletterwords.cpp */, - A9FB288211FD95E4004C4295 /* osisrtf.cpp */, - A9FB288311FD95E4004C4295 /* osisruby.cpp */, - A9FB288411FD95E4004C4295 /* osisscripref.cpp */, - A9FB288511FD95E4004C4295 /* osisstrongs.cpp */, - A9FB288611FD95E4004C4295 /* osisvariants.cpp */, - A9FB288711FD95E4004C4295 /* osiswebif.cpp */, - A9FB288811FD95E4004C4295 /* osiswordjs.cpp */, - A9FB288911FD95E4004C4295 /* papyriplain.cpp */, - A9FB288A11FD95E4004C4295 /* plainfootnotes.cpp */, - A9FB288B11FD95E4004C4295 /* plainhtml.cpp */, - A9FB288C11FD95E4004C4295 /* rtfhtml.cpp */, - A9FB288D11FD95E4004C4295 /* swbasicfilter.cpp */, - A9FB288E11FD95E4004C4295 /* swoptfilter.cpp */, - A9FB288F11FD95E4004C4295 /* teihtmlhref.cpp */, - A9FB289011FD95E4004C4295 /* teiplain.cpp */, - A9FB289111FD95E4004C4295 /* teirtf.cpp */, - A9FB289211FD95E4004C4295 /* thmlfootnotes.cpp */, - A9FB289311FD95E4004C4295 /* thmlgbf.cpp */, - A9FB289411FD95E4004C4295 /* thmlheadings.cpp */, - A9FB289511FD95E4004C4295 /* thmlhtml.cpp */, - A9FB289611FD95E4004C4295 /* thmlhtmlhref.cpp */, - A9FB289711FD95E4004C4295 /* thmllemma.cpp */, - A9FB289811FD95E4004C4295 /* thmlmorph.cpp */, - A9FB289911FD95E4004C4295 /* thmlosis.cpp */, - A9FB289A11FD95E4004C4295 /* thmlplain.cpp */, - A9FB289B11FD95E4004C4295 /* thmlrtf.cpp */, - A9FB289C11FD95E4004C4295 /* thmlscripref.cpp */, - A9FB289D11FD95E4004C4295 /* thmlstrongs.cpp */, - A9FB289E11FD95E4004C4295 /* thmlvariants.cpp */, - A9FB289F11FD95E4004C4295 /* thmlwebif.cpp */, - A9FB28A011FD95E4004C4295 /* thmlwordjs.cpp */, - A9FB28A111FD95E4004C4295 /* unicodertf.cpp */, - A9FB28A211FD95E4004C4295 /* utf16utf8.cpp */, - A9FB28A311FD95E4004C4295 /* utf8arabicpoints.cpp */, - A9FB28A411FD95E4004C4295 /* utf8arshaping.cpp */, - A9FB28A511FD95E4004C4295 /* utf8bidireorder.cpp */, - A9FB28A611FD95E4004C4295 /* utf8cantillation.cpp */, - A9FB28A711FD95E4004C4295 /* utf8greekaccents.cpp */, - A9FB28A811FD95E4004C4295 /* utf8hebrewpoints.cpp */, - A9FB28A911FD95E4004C4295 /* utf8html.cpp */, - A9FB28AA11FD95E4004C4295 /* utf8latin1.cpp */, - A9FB28AB11FD95E4004C4295 /* utf8nfc.cpp */, - A9FB28AC11FD95E4004C4295 /* utf8nfkd.cpp */, - A9FB28AD11FD95E4004C4295 /* utf8transliterator.cpp */, - A9FB28AE11FD95E4004C4295 /* utf8utf16.cpp */, + A954A9E413EE9A2B0094E3FE /* AnalysisHeader.cpp */, + A954A9E513EE9A2B0094E3FE /* AnalysisHeader.h */, + A954A9E613EE9A2B0094E3FE /* Analyzers.cpp */, + A954A9E713EE9A2B0094E3FE /* Analyzers.h */, + A954A9E813EE9A2B0094E3FE /* standard */, ); - path = filters; + path = analysis; sourceTree = ""; }; - A9FB28AF11FD95E4004C4295 /* genbook */ = { + A954A9E813EE9A2B0094E3FE /* standard */ = { isa = PBXGroup; children = ( - A9FB28B011FD95E4004C4295 /* rawgenbook */, - A9FB28B211FD95E4004C4295 /* swgenbook.cpp */, + A954A9E913EE9A2B0094E3FE /* StandardAnalyzer.cpp */, + A954A9EA13EE9A2B0094E3FE /* StandardAnalyzer.h */, + A954A9EB13EE9A2B0094E3FE /* StandardFilter.cpp */, + A954A9EC13EE9A2B0094E3FE /* StandardFilter.h */, + A954A9ED13EE9A2B0094E3FE /* StandardTokenizer.cpp */, + A954A9EE13EE9A2B0094E3FE /* StandardTokenizer.h */, + A954A9EF13EE9A2B0094E3FE /* StandardTokenizerConstants.h */, ); - path = genbook; + path = standard; sourceTree = ""; }; - A9FB28B011FD95E4004C4295 /* rawgenbook */ = { + A954A9F313EE9A2B0094E3FE /* config */ = { isa = PBXGroup; children = ( - A9FB28B111FD95E4004C4295 /* rawgenbook.cpp */, + A954A9F413EE9A2B0094E3FE /* compiler.h */, + A954A9F513EE9A2B0094E3FE /* CompilerBcb.h */, + A954A9F613EE9A2B0094E3FE /* CompilerGcc.h */, + A954A9F713EE9A2B0094E3FE /* CompilerMsvc.h */, + A954A9F813EE9A2B0094E3FE /* define_std.h */, + A954A9F913EE9A2B0094E3FE /* gunichartables.cpp */, + A954A9FA13EE9A2B0094E3FE /* gunichartables.h */, + A954A9FB13EE9A2B0094E3FE /* PlatformMac.h */, + A954A9FC13EE9A2B0094E3FE /* PlatformUnix.h */, + A954A9FD13EE9A2B0094E3FE /* PlatformWin32.h */, + A954A9FE13EE9A2B0094E3FE /* repl_lltot.cpp */, + A954A9FF13EE9A2B0094E3FE /* repl_tchar.h */, + A954AA0013EE9A2B0094E3FE /* repl_tcscasecmp.cpp */, + A954AA0113EE9A2B0094E3FE /* repl_tcslwr.cpp */, + A954AA0213EE9A2B0094E3FE /* repl_tcstod.cpp */, + A954AA0313EE9A2B0094E3FE /* repl_tcstoll.cpp */, + A954AA0413EE9A2B0094E3FE /* repl_tprintf.cpp */, + A954AA0513EE9A2B0094E3FE /* repl_wchar.h */, + A954AA0613EE9A2B0094E3FE /* threadCSection.h */, + A954AA0713EE9A2B0094E3FE /* threadPthread.h */, + A954AA0813EE9A2B0094E3FE /* threads.cpp */, + A954AA0913EE9A2B0094E3FE /* utf8.cpp */, ); - path = rawgenbook; + path = config; sourceTree = ""; }; - A9FB28B311FD95E4004C4295 /* lexdict */ = { + A954AA0A13EE9A2B0094E3FE /* debug */ = { isa = PBXGroup; children = ( - A9FB28B411FD95E4004C4295 /* rawld */, - A9FB28B611FD95E4004C4295 /* rawld4 */, - A9FB28B811FD95E4004C4295 /* swld.cpp */, - A9FB28B911FD95E4004C4295 /* zld */, + A954AA0B13EE9A2B0094E3FE /* condition.cpp */, + A954AA0C13EE9A2B0094E3FE /* condition.h */, + A954AA0D13EE9A2B0094E3FE /* error.cpp */, + A954AA0E13EE9A2B0094E3FE /* error.h */, + A954AA0F13EE9A2B0094E3FE /* lucenebase.h */, + A954AA1013EE9A2B0094E3FE /* mem.h */, + A954AA1113EE9A2B0094E3FE /* memtracking.cpp */, ); - path = lexdict; + path = debug; sourceTree = ""; }; - A9FB28B411FD95E4004C4295 /* rawld */ = { + A954AA1213EE9A2B0094E3FE /* document */ = { isa = PBXGroup; children = ( - A9FB28B511FD95E4004C4295 /* rawld.cpp */, + A954AA1313EE9A2B0094E3FE /* DateField.cpp */, + A954AA1413EE9A2B0094E3FE /* DateField.h */, + A954AA1513EE9A2B0094E3FE /* Document.cpp */, + A954AA1613EE9A2B0094E3FE /* Document.h */, + A954AA1713EE9A2B0094E3FE /* Field.cpp */, + A954AA1813EE9A2B0094E3FE /* Field.h */, ); - path = rawld; + path = document; sourceTree = ""; }; - A9FB28B611FD95E4004C4295 /* rawld4 */ = { + A954AA1913EE9A2B0094E3FE /* index */ = { isa = PBXGroup; children = ( - A9FB28B711FD95E4004C4295 /* rawld4.cpp */, + A954AA1A13EE9A2B0094E3FE /* CompoundFile.cpp */, + A954AA1B13EE9A2B0094E3FE /* CompoundFile.h */, + A954AA1C13EE9A2B0094E3FE /* DocumentWriter.cpp */, + A954AA1D13EE9A2B0094E3FE /* DocumentWriter.h */, + A954AA1E13EE9A2B0094E3FE /* FieldInfo.h */, + A954AA1F13EE9A2B0094E3FE /* FieldInfos.cpp */, + A954AA2013EE9A2B0094E3FE /* FieldInfos.h */, + A954AA2113EE9A2B0094E3FE /* FieldsReader.cpp */, + A954AA2213EE9A2B0094E3FE /* FieldsReader.h */, + A954AA2313EE9A2B0094E3FE /* FieldsWriter.cpp */, + A954AA2413EE9A2B0094E3FE /* FieldsWriter.h */, + A954AA2513EE9A2B0094E3FE /* IndexModifier.cpp */, + A954AA2613EE9A2B0094E3FE /* IndexModifier.h */, + A954AA2713EE9A2B0094E3FE /* IndexReader.cpp */, + A954AA2813EE9A2B0094E3FE /* IndexReader.h */, + A954AA2913EE9A2B0094E3FE /* IndexWriter.cpp */, + A954AA2A13EE9A2B0094E3FE /* IndexWriter.h */, + A954AA2B13EE9A2B0094E3FE /* MultiReader.cpp */, + A954AA2C13EE9A2B0094E3FE /* MultiReader.h */, + A954AA2D13EE9A2B0094E3FE /* SegmentHeader.h */, + A954AA2E13EE9A2B0094E3FE /* SegmentInfos.cpp */, + A954AA2F13EE9A2B0094E3FE /* SegmentInfos.h */, + A954AA3013EE9A2B0094E3FE /* SegmentMergeInfo.cpp */, + A954AA3113EE9A2B0094E3FE /* SegmentMergeInfo.h */, + A954AA3213EE9A2B0094E3FE /* SegmentMergeQueue.cpp */, + A954AA3313EE9A2B0094E3FE /* SegmentMergeQueue.h */, + A954AA3413EE9A2B0094E3FE /* SegmentMerger.cpp */, + A954AA3513EE9A2B0094E3FE /* SegmentMerger.h */, + A954AA3613EE9A2B0094E3FE /* SegmentReader.cpp */, + A954AA3713EE9A2B0094E3FE /* SegmentTermDocs.cpp */, + A954AA3813EE9A2B0094E3FE /* SegmentTermEnum.cpp */, + A954AA3913EE9A2B0094E3FE /* SegmentTermEnum.h */, + A954AA3A13EE9A2B0094E3FE /* SegmentTermPositions.cpp */, + A954AA3B13EE9A2B0094E3FE /* SegmentTermVector.cpp */, + A954AA3C13EE9A2B0094E3FE /* Term.cpp */, + A954AA3D13EE9A2B0094E3FE /* Term.h */, + A954AA3E13EE9A2B0094E3FE /* TermInfo.cpp */, + A954AA3F13EE9A2B0094E3FE /* TermInfo.h */, + A954AA4013EE9A2B0094E3FE /* TermInfosReader.cpp */, + A954AA4113EE9A2B0094E3FE /* TermInfosReader.h */, + A954AA4213EE9A2B0094E3FE /* TermInfosWriter.cpp */, + A954AA4313EE9A2B0094E3FE /* TermInfosWriter.h */, + A954AA4413EE9A2B0094E3FE /* Terms.h */, + A954AA4513EE9A2B0094E3FE /* TermVector.h */, + A954AA4613EE9A2B0094E3FE /* TermVectorReader.cpp */, + A954AA4713EE9A2B0094E3FE /* TermVectorWriter.cpp */, ); - path = rawld4; + path = index; sourceTree = ""; }; - A9FB28B911FD95E4004C4295 /* zld */ = { + A954AA4913EE9A2B0094E3FE /* queryParser */ = { isa = PBXGroup; children = ( - A9FB28BA11FD95E4004C4295 /* zld.cpp */, + A954AA4A13EE9A2B0094E3FE /* Lexer.cpp */, + A954AA4B13EE9A2B0094E3FE /* Lexer.h */, + A954AA4C13EE9A2B0094E3FE /* MultiFieldQueryParser.cpp */, + A954AA4D13EE9A2B0094E3FE /* MultiFieldQueryParser.h */, + A954AA4E13EE9A2B0094E3FE /* QueryParser.cpp */, + A954AA4F13EE9A2B0094E3FE /* QueryParser.h */, + A954AA5013EE9A2B0094E3FE /* QueryParserBase.cpp */, + A954AA5113EE9A2B0094E3FE /* QueryParserBase.h */, + A954AA5213EE9A2B0094E3FE /* QueryToken.cpp */, + A954AA5313EE9A2B0094E3FE /* QueryToken.h */, + A954AA5413EE9A2B0094E3FE /* TokenList.cpp */, + A954AA5513EE9A2B0094E3FE /* TokenList.h */, ); - path = zld; + path = queryParser; sourceTree = ""; }; - A9FB28BD11FD95E4004C4295 /* tests */ = { + A954AA5613EE9A2B0094E3FE /* search */ = { isa = PBXGroup; children = ( - A9FB28BE11FD95E4004C4295 /* echomod.cpp */, + A954AA5713EE9A2B0094E3FE /* BooleanClause.h */, + A954AA5813EE9A2B0094E3FE /* BooleanQuery.cpp */, + A954AA5913EE9A2B0094E3FE /* BooleanQuery.h */, + A954AA5A13EE9A2B0094E3FE /* BooleanScorer.cpp */, + A954AA5B13EE9A2B0094E3FE /* BooleanScorer.h */, + A954AA5C13EE9A2B0094E3FE /* CachingWrapperFilter.cpp */, + A954AA5D13EE9A2B0094E3FE /* CachingWrapperFilter.h */, + A954AA5E13EE9A2B0094E3FE /* ChainedFilter.cpp */, + A954AA5F13EE9A2B0094E3FE /* ChainedFilter.h */, + A954AA6013EE9A2B0094E3FE /* Compare.h */, + A954AA6113EE9A2B0094E3FE /* ConjunctionScorer.cpp */, + A954AA6213EE9A2B0094E3FE /* ConjunctionScorer.h */, + A954AA6313EE9A2B0094E3FE /* DateFilter.cpp */, + A954AA6413EE9A2B0094E3FE /* DateFilter.h */, + A954AA6513EE9A2B0094E3FE /* ExactPhraseScorer.cpp */, + A954AA6613EE9A2B0094E3FE /* ExactPhraseScorer.h */, + A954AA6713EE9A2B0094E3FE /* Explanation.cpp */, + A954AA6813EE9A2B0094E3FE /* Explanation.h */, + A954AA6913EE9A2B0094E3FE /* FieldCache.cpp */, + A954AA6A13EE9A2B0094E3FE /* FieldCache.h */, + A954AA6B13EE9A2B0094E3FE /* FieldCacheImpl.cpp */, + A954AA6C13EE9A2B0094E3FE /* FieldCacheImpl.h */, + A954AA6D13EE9A2B0094E3FE /* FieldDoc.h */, + A954AA6E13EE9A2B0094E3FE /* FieldDocSortedHitQueue.cpp */, + A954AA6F13EE9A2B0094E3FE /* FieldDocSortedHitQueue.h */, + A954AA7013EE9A2B0094E3FE /* FieldSortedHitQueue.cpp */, + A954AA7113EE9A2B0094E3FE /* FieldSortedHitQueue.h */, + A954AA7213EE9A2B0094E3FE /* Filter.h */, + A954AA7313EE9A2B0094E3FE /* FilteredTermEnum.cpp */, + A954AA7413EE9A2B0094E3FE /* FilteredTermEnum.h */, + A954AA7513EE9A2B0094E3FE /* FuzzyQuery.cpp */, + A954AA7613EE9A2B0094E3FE /* FuzzyQuery.h */, + A954AA7713EE9A2B0094E3FE /* HitQueue.cpp */, + A954AA7813EE9A2B0094E3FE /* HitQueue.h */, + A954AA7913EE9A2B0094E3FE /* Hits.cpp */, + A954AA7A13EE9A2B0094E3FE /* IndexSearcher.cpp */, + A954AA7B13EE9A2B0094E3FE /* IndexSearcher.h */, + A954AA7C13EE9A2B0094E3FE /* MultiSearcher.cpp */, + A954AA7D13EE9A2B0094E3FE /* MultiSearcher.h */, + A954AA7E13EE9A2B0094E3FE /* MultiTermQuery.cpp */, + A954AA7F13EE9A2B0094E3FE /* MultiTermQuery.h */, + A954AA8013EE9A2B0094E3FE /* PhrasePositions.cpp */, + A954AA8113EE9A2B0094E3FE /* PhrasePositions.h */, + A954AA8213EE9A2B0094E3FE /* PhraseQuery.cpp */, + A954AA8313EE9A2B0094E3FE /* PhraseQuery.h */, + A954AA8413EE9A2B0094E3FE /* PhraseQueue.h */, + A954AA8513EE9A2B0094E3FE /* PhraseScorer.cpp */, + A954AA8613EE9A2B0094E3FE /* PhraseScorer.h */, + A954AA8713EE9A2B0094E3FE /* PrefixQuery.cpp */, + A954AA8813EE9A2B0094E3FE /* PrefixQuery.h */, + A954AA8913EE9A2B0094E3FE /* QueryFilter.cpp */, + A954AA8A13EE9A2B0094E3FE /* QueryFilter.h */, + A954AA8B13EE9A2B0094E3FE /* RangeFilter.cpp */, + A954AA8C13EE9A2B0094E3FE /* RangeFilter.h */, + A954AA8D13EE9A2B0094E3FE /* RangeQuery.cpp */, + A954AA8E13EE9A2B0094E3FE /* RangeQuery.h */, + A954AA8F13EE9A2B0094E3FE /* Scorer.h */, + A954AA9013EE9A2B0094E3FE /* SearchHeader.cpp */, + A954AA9113EE9A2B0094E3FE /* SearchHeader.h */, + A954AA9213EE9A2B0094E3FE /* Similarity.cpp */, + A954AA9313EE9A2B0094E3FE /* Similarity.h */, + A954AA9413EE9A2B0094E3FE /* SloppyPhraseScorer.cpp */, + A954AA9513EE9A2B0094E3FE /* SloppyPhraseScorer.h */, + A954AA9613EE9A2B0094E3FE /* Sort.cpp */, + A954AA9713EE9A2B0094E3FE /* Sort.h */, + A954AA9813EE9A2B0094E3FE /* TermQuery.cpp */, + A954AA9913EE9A2B0094E3FE /* TermQuery.h */, + A954AA9A13EE9A2B0094E3FE /* TermScorer.cpp */, + A954AA9B13EE9A2B0094E3FE /* TermScorer.h */, + A954AA9C13EE9A2B0094E3FE /* WildcardQuery.cpp */, + A954AA9D13EE9A2B0094E3FE /* WildcardQuery.h */, + A954AA9E13EE9A2B0094E3FE /* WildcardTermEnum.cpp */, + A954AA9F13EE9A2B0094E3FE /* WildcardTermEnum.h */, ); - path = tests; + path = search; sourceTree = ""; }; - A9FB28BF11FD95E4004C4295 /* texts */ = { + A954AAA213EE9A2B0094E3FE /* store */ = { isa = PBXGroup; children = ( - A9FB28C011FD95E4004C4295 /* rawtext */, - A9FB28C211FD95E4004C4295 /* rawtext4 */, - A9FB28C411FD95E4004C4295 /* swtext.cpp */, - A9FB28C511FD95E4004C4295 /* ztext */, + A954AAA313EE9A2B0094E3FE /* Directory.h */, + A954AAA413EE9A2B0094E3FE /* FSDirectory.cpp */, + A954AAA513EE9A2B0094E3FE /* FSDirectory.h */, + A954AAA613EE9A2B0094E3FE /* IndexInput.cpp */, + A954AAA713EE9A2B0094E3FE /* IndexInput.h */, + A954AAA813EE9A2B0094E3FE /* IndexOutput.cpp */, + A954AAA913EE9A2B0094E3FE /* IndexOutput.h */, + A954AAAA13EE9A2B0094E3FE /* InputStream.h */, + A954AAAB13EE9A2B0094E3FE /* Lock.cpp */, + A954AAAC13EE9A2B0094E3FE /* Lock.h */, + A954AAAD13EE9A2B0094E3FE /* MMapInput.cpp */, + A954AAAE13EE9A2B0094E3FE /* OutputStream.h */, + A954AAAF13EE9A2B0094E3FE /* RAMDirectory.cpp */, + A954AAB013EE9A2B0094E3FE /* RAMDirectory.h */, + A954AAB113EE9A2B0094E3FE /* TransactionalRAMDirectory.cpp */, + A954AAB213EE9A2B0094E3FE /* TransactionalRAMDirectory.h */, ); - path = texts; + path = store; sourceTree = ""; }; - A9FB28C011FD95E4004C4295 /* rawtext */ = { + A954AAB313EE9A2B0094E3FE /* util */ = { isa = PBXGroup; children = ( - A9FB28C111FD95E4004C4295 /* rawtext.cpp */, + A954AAB413EE9A2B0094E3FE /* Arrays.h */, + A954AAB513EE9A2B0094E3FE /* BitSet.cpp */, + A954AAB613EE9A2B0094E3FE /* BitSet.h */, + A954AAB713EE9A2B0094E3FE /* bufferedstream.h */, + A954AAB813EE9A2B0094E3FE /* dirent.cpp */, + A954AAB913EE9A2B0094E3FE /* dirent2.h */, + A954AABA13EE9A2B0094E3FE /* Equators.cpp */, + A954AABB13EE9A2B0094E3FE /* Equators.h */, + A954AABC13EE9A2B0094E3FE /* FastCharStream.cpp */, + A954AABD13EE9A2B0094E3FE /* FastCharStream.h */, + A954AABE13EE9A2B0094E3FE /* fileinputstream.cpp */, + A954AABF13EE9A2B0094E3FE /* fileinputstream.h */, + A954AAC013EE9A2B0094E3FE /* googlesparsemap.h */, + A954AAC113EE9A2B0094E3FE /* inputstreambuffer.h */, + A954AAC213EE9A2B0094E3FE /* jstreamsconfig.h */, + A954AAC313EE9A2B0094E3FE /* MD5Digester.cpp */, + A954AAC413EE9A2B0094E3FE /* MD5Digester.h */, + A954AAC513EE9A2B0094E3FE /* Misc.cpp */, + A954AAC613EE9A2B0094E3FE /* Misc.h */, + A954AAC713EE9A2B0094E3FE /* PriorityQueue.h */, + A954AAC813EE9A2B0094E3FE /* Reader.cpp */, + A954AAC913EE9A2B0094E3FE /* Reader.h */, + A954AACA13EE9A2B0094E3FE /* streambase.h */, + A954AACB13EE9A2B0094E3FE /* StringBuffer.cpp */, + A954AACC13EE9A2B0094E3FE /* StringBuffer.h */, + A954AACD13EE9A2B0094E3FE /* StringIntern.cpp */, + A954AACE13EE9A2B0094E3FE /* StringIntern.h */, + A954AACF13EE9A2B0094E3FE /* stringreader.h */, + A954AAD013EE9A2B0094E3FE /* subinputstream.h */, + A954AAD113EE9A2B0094E3FE /* ThreadLocal.cpp */, + A954AAD213EE9A2B0094E3FE /* ThreadLocal.h */, + A954AAD313EE9A2B0094E3FE /* VoidList.h */, + A954AAD413EE9A2B0094E3FE /* VoidMap.h */, ); - path = rawtext; + path = util; sourceTree = ""; }; - A9FB28C211FD95E4004C4295 /* rawtext4 */ = { + A975ECD211C7925B007C1532 /* Utilities */ = { isa = PBXGroup; children = ( - A9FB28C311FD95E4004C4295 /* rawtext4.cpp */, + A975ED9811C7925C007C1532 /* imp2gbs.cpp */, + A975ED9911C7925C007C1532 /* imp2ld.cpp */, + A975ED9A11C7925C007C1532 /* imp2vs.cpp */, + A975ED9B11C7925C007C1532 /* installmgr.cpp */, + A975EDAB11C7925C007C1532 /* mod2imp.cpp */, + A975EDAC11C7925C007C1532 /* mod2osis.cpp */, + A975EDAD11C7925C007C1532 /* mod2vpl.cpp */, + A975EDAE11C7925C007C1532 /* mod2zmod.cpp */, + A975EDB111C7925C007C1532 /* osis2mod.cpp */, + A975EDB811C7925C007C1532 /* step2vpl.cpp */, + A975EDB911C7925C007C1532 /* stepdump.cpp */, + A975EDBB11C7925C007C1532 /* tei2mod.cpp */, + A975EDD811C7925C007C1532 /* vpl2mod.cpp */, + A975EDD911C7925C007C1532 /* vs2osisref.cpp */, + A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */, + A975EDDB11C7925C007C1532 /* xml2gbs.cpp */, ); - path = rawtext4; - sourceTree = ""; + name = Utilities; + path = ../../utilities; + sourceTree = SOURCE_ROOT; }; - A9FB28C511FD95E4004C4295 /* ztext */ = { + A9BFB0A313EDF51000032679 /* Frameworks */ = { isa = PBXGroup; children = ( - A9FB28C611FD95E4004C4295 /* ztext.cpp */, + A9BFB0A413EDF51000032679 /* SenTestingKit.framework */, + A9BFB0A613EDF51100032679 /* Cocoa.framework */, + A9BFB0A813EDF51100032679 /* Other Frameworks */, ); - path = ztext; + name = Frameworks; sourceTree = ""; }; - A9FB28C711FD95E4004C4295 /* utilfuns */ = { + A9BFB0A813EDF51100032679 /* Other Frameworks */ = { isa = PBXGroup; children = ( - A9FB28C811FD95E4004C4295 /* zlib */, - A9FB28E211FD95E4004C4295 /* ftplib.c */, - A9FB28E311FD95E4004C4295 /* ftpparse.c */, - A9FB28E411FD95E4004C4295 /* regex.c */, - A9FB28E511FD95E4004C4295 /* roman.cpp */, - A9FB28E611FD95E4004C4295 /* swbuf.cpp */, - A9FB28E711FD95E4004C4295 /* swobject.cpp */, - A9FB28E811FD95E4004C4295 /* swunicod.cpp */, - A9FB28E911FD95E4004C4295 /* swversion.cpp */, - A9FB28EA11FD95E4004C4295 /* url.cpp */, - A9FB28EB11FD95E4004C4295 /* utilstr.cpp */, - A9FB28EC11FD95E4004C4295 /* utilxml.cpp */, + A9BFB0A913EDF51100032679 /* AppKit.framework */, + A9BFB0AA13EDF51100032679 /* CoreData.framework */, + A9BFB0AB13EDF51100032679 /* Foundation.framework */, ); - path = utilfuns; + name = "Other Frameworks"; sourceTree = ""; }; - A9FB28C811FD95E4004C4295 /* zlib */ = { + A9BFB0AC13EDF51100032679 /* Tests */ = { isa = PBXGroup; children = ( - A9FB28C911FD95E4004C4295 /* adler32.c */, - A9FB28CA11FD95E4004C4295 /* compress.c */, - A9FB28CB11FD95E4004C4295 /* crc32.c */, - A9FB28CC11FD95E4004C4295 /* deflate.c */, - A9FB28CD11FD95E4004C4295 /* deflate.h */, - A9FB28CE11FD95E4004C4295 /* gzio.c */, - A9FB28CF11FD95E4004C4295 /* infblock.c */, - A9FB28D011FD95E4004C4295 /* infblock.h */, - A9FB28D111FD95E4004C4295 /* infcodes.c */, - A9FB28D211FD95E4004C4295 /* infcodes.h */, - A9FB28D311FD95E4004C4295 /* inffast.c */, - A9FB28D411FD95E4004C4295 /* inffast.h */, - A9FB28D511FD95E4004C4295 /* inffixed.h */, - A9FB28D611FD95E4004C4295 /* inflate.c */, - A9FB28D711FD95E4004C4295 /* inftrees.c */, - A9FB28D811FD95E4004C4295 /* inftrees.h */, - A9FB28D911FD95E4004C4295 /* infutil.c */, - A9FB28DA11FD95E4004C4295 /* infutil.h */, - A9FB28DB11FD95E4004C4295 /* maketree.c */, - A9FB28DC11FD95E4004C4295 /* trees.c */, - A9FB28DD11FD95E4004C4295 /* trees.h */, - A9FB28DE11FD95E4004C4295 /* uncompr.c */, - A9FB28DF11FD95E4004C4295 /* untgz.c */, - A9FB28E011FD95E4004C4295 /* zutil.c */, - A9FB28E111FD95E4004C4295 /* zutil.h */, + A917AF2516B1BE38006367FC /* Tests-Info.plist */, + A964658011C663E200640FAC /* SwordManagerTest.h */, + A964658111C663E200640FAC /* SwordManagerTest.m */, + A918B8E211C6697400024D84 /* SwordModuleTest.h */, + A918B8E311C6697400024D84 /* SwordModuleTest.m */, + A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */, + A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */, + A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */, + A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */, ); - path = zlib; + name = Tests; + path = test; sourceTree = ""; }; /* End PBXGroup section */ @@ -2323,14 +2321,11 @@ A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */, A94EAC17117B28920018B06F /* SwordDictionary.h in Headers */, A94EAC19117B28920018B06F /* SwordInstallSource.h in Headers */, - A94EAC1B117B28920018B06F /* SwordInstallSourceController.h in Headers */, - A94EAC1D117B28920018B06F /* SwordKey.h in Headers */, - A94EAC1F117B28920018B06F /* SwordListKey.h in Headers */, + A94EAC1B117B28920018B06F /* SwordInstallSourceManager.h in Headers */, A94EAC21117B28920018B06F /* SwordManager.h in Headers */, A94EAC25117B28920018B06F /* SwordModule.h in Headers */, A94EAC27117B28920018B06F /* SwordModuleTextEntry.h in Headers */, A94EAC29117B28920018B06F /* SwordModuleTreeEntry.h in Headers */, - A94EAC2D117B28920018B06F /* SwordVerseKey.h in Headers */, A94EAC2F117B28920018B06F /* SwordVerseManager.h in Headers */, A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */, A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */, @@ -2338,37 +2333,16 @@ A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */, A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */, A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */, + A929619D16B1BA240094E5BE /* SwordKey.h in Headers */, + A929619F16B1BA240094E5BE /* SwordListKey.h in Headers */, + A92961A116B1BA240094E5BE /* SwordVerseKey.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - A9013CFC11E316C700E1CCCA /* Headers */ = { + A954ABC113EE9AB00094E3FE /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - A9013CFD11E316C700E1CCCA /* ObjCSword.h in Headers */, - A9013CFE11E316C700E1CCCA /* SwordBible.h in Headers */, - A9013CFF11E316C700E1CCCA /* SwordBibleBook.h in Headers */, - A9013D0011E316C700E1CCCA /* SwordBibleChapter.h in Headers */, - A9013D0111E316C700E1CCCA /* SwordBibleTextEntry.h in Headers */, - A9013D0211E316C700E1CCCA /* SwordBook.h in Headers */, - A9013D0311E316C700E1CCCA /* SwordCommentary.h in Headers */, - A9013D0411E316C700E1CCCA /* SwordDictionary.h in Headers */, - A9013D0511E316C700E1CCCA /* SwordInstallSource.h in Headers */, - A9013D0611E316C700E1CCCA /* SwordInstallSourceController.h in Headers */, - A9013D0711E316C700E1CCCA /* SwordKey.h in Headers */, - A9013D0811E316C700E1CCCA /* SwordListKey.h in Headers */, - A9013D0911E316C700E1CCCA /* SwordManager.h in Headers */, - A9013D0B11E316C700E1CCCA /* SwordModule.h in Headers */, - A9013D0C11E316C700E1CCCA /* SwordModuleTextEntry.h in Headers */, - A9013D0D11E316C700E1CCCA /* SwordModuleTreeEntry.h in Headers */, - A9013D0E11E316C700E1CCCA /* SwordVerseKey.h in Headers */, - A9013D0F11E316C700E1CCCA /* SwordVerseManager.h in Headers */, - A9013D1011E316C700E1CCCA /* VerseEnumerator.h in Headers */, - A9013D1111E316C700E1CCCA /* Notifications.h in Headers */, - A9013D1211E316C700E1CCCA /* Configuration.h in Headers */, - A9013D1311E316C700E1CCCA /* OSXConfiguration.h in Headers */, - A9013D1411E316C700E1CCCA /* SwordModule+Index.h in Headers */, - A9EF1418120595650078A27C /* SwordLocaleManager.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2382,24 +2356,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - A9C281B611C43DB800803CB5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - A96465AD11C6658200640FAC /* SwordManagerTest.h in Headers */, - A918B8E411C6697400024D84 /* SwordModuleTest.h in Headers */, - A9BDFA781207F9F00067ED5B /* SwordListKeyTest.h in Headers */, - A9BDFA861207FC8C0067ED5B /* ImageModuleTest.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9FB25DC11FD939E004C4295 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -2416,6 +2372,7 @@ buildRules = ( ); dependencies = ( + A954ABCA13EE9D0F0094E3FE /* PBXTargetDependency */, ); name = ObjCSword; productInstallPath = "$(HOME)/Library/Frameworks"; @@ -2423,26 +2380,22 @@ productReference = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; productType = "com.apple.product-type.framework"; }; - A9013CF911E316C700E1CCCA /* ObjCSword_iOS */ = { + A954ABC213EE9AB00094E3FE /* sword */ = { isa = PBXNativeTarget; - buildConfigurationList = A9013D3B11E316C700E1CCCA /* Build configuration list for PBXNativeTarget "ObjCSword_iOS" */; + buildConfigurationList = A954ABC413EE9AB00094E3FE /* Build configuration list for PBXNativeTarget "sword" */; buildPhases = ( - A9013CFC11E316C700E1CCCA /* Headers */, - A9013D1511E316C700E1CCCA /* Resources */, - A9013D1F11E316C700E1CCCA /* Sources */, - A9013D3611E316C700E1CCCA /* Frameworks */, - A9013D3911E316C700E1CCCA /* CopyFiles */, + A954ABBF13EE9AB00094E3FE /* Sources */, + A954ABC013EE9AB00094E3FE /* Frameworks */, + A954ABC113EE9AB00094E3FE /* Headers */, ); buildRules = ( ); dependencies = ( - A9FB29A111FD965B004C4295 /* PBXTargetDependency */, ); - name = ObjCSword_iOS; - productInstallPath = "$(HOME)/Library/Frameworks"; - productName = ObjCSword; - productReference = A9013D3E11E316C700E1CCCA /* ObjCSword_iOS.framework */; - productType = "com.apple.product-type.framework"; + name = sword; + productName = libsword; + productReference = A954ABC313EE9AB00094E3FE /* libsword.dylib */; + productType = "com.apple.product-type.library.dynamic"; }; A975EED811C792B9007C1532 /* mod2osis */ = { isa = PBXNativeTarget; @@ -2454,12 +2407,30 @@ buildRules = ( ); dependencies = ( + A9A7EEAE14D5D4BB00B76B6A /* PBXTargetDependency */, ); name = mod2osis; productName = mod2osis; productReference = A975EED911C792B9007C1532 /* mod2osis */; productType = "com.apple.product-type.tool"; }; + A9A7EEB314D5D61700B76B6A /* osis2mod */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9A7EEBB14D5D61700B76B6A /* Build configuration list for PBXNativeTarget "osis2mod" */; + buildPhases = ( + A9A7EEB014D5D61700B76B6A /* Sources */, + A9A7EEB114D5D61700B76B6A /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9A7EEC114D5D66400B76B6A /* PBXTargetDependency */, + ); + name = osis2mod; + productName = osis2mod; + productReference = A9A7EEB414D5D61700B76B6A /* osis2mod */; + productType = "com.apple.product-type.tool"; + }; A9BDFA5A1207F9870067ED5B /* LongRunningTests */ = { isa = PBXNativeTarget; buildConfigurationList = A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */; @@ -2480,119 +2451,357 @@ productReference = A9BDFA6B1207F9870067ED5B /* Tests.octest */; productType = "com.apple.product-type.bundle"; }; - A9C2819511C43C4900803CB5 /* Tests */ = { + A9BFB0A113EDF51000032679 /* Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = A9C2819A11C43C4900803CB5 /* Build configuration list for PBXNativeTarget "Tests" */; + buildConfigurationList = A9BFB0B713EDF51100032679 /* Build configuration list for PBXNativeTarget "Tests" */; buildPhases = ( - A9C2819111C43C4900803CB5 /* Resources */, - A9C2819211C43C4900803CB5 /* Sources */, - A9C2819311C43C4900803CB5 /* Frameworks */, - A9C2819411C43C4900803CB5 /* ShellScript */, - A9C281B611C43DB800803CB5 /* Headers */, + A9BFB09D13EDF51000032679 /* Sources */, + A9BFB09E13EDF51000032679 /* Frameworks */, + A9BFB09F13EDF51000032679 /* Resources */, + A9BFB0A013EDF51000032679 /* ShellScript */, ); buildRules = ( ); dependencies = ( - A964657B11C662CA00640FAC /* PBXTargetDependency */, + A9BFB0BB13EDF5B600032679 /* PBXTargetDependency */, ); name = Tests; - productName = Tests; - productReference = A9C2819611C43C4900803CB5 /* Tests.octest */; + productName = "Tests-new"; + productReference = A9BFB0A213EDF51000032679 /* Tests.octest */; productType = "com.apple.product-type.bundle"; }; - A9FB25DF11FD939E004C4295 /* Sword_iOS */ = { + A9D2714414D717D800DA8926 /* imp2gbs */ = { isa = PBXNativeTarget; - buildConfigurationList = A9FB25E411FD93B2004C4295 /* Build configuration list for PBXNativeTarget "Sword_iOS" */; + buildConfigurationList = A9D2714B14D717D800DA8926 /* Build configuration list for PBXNativeTarget "imp2gbs" */; buildPhases = ( - A9FB25DC11FD939E004C4295 /* Headers */, - A9FB25DD11FD939E004C4295 /* Sources */, - A9FB25DE11FD939E004C4295 /* Frameworks */, + A9D2714714D717D800DA8926 /* Sources */, + A9D2714914D717D800DA8926 /* Frameworks */, ); buildRules = ( ); dependencies = ( + A9D2714514D717D800DA8926 /* PBXTargetDependency */, ); - name = Sword_iOS; - productName = Sword; - productReference = A9EF13B21205952C0078A27C /* libSword.dylib */; - productType = "com.apple.product-type.library.dynamic"; + name = imp2gbs; + productName = mod2osis; + productReference = A9D2714E14D717D800DA8926 /* imp2gbs */; + productType = "com.apple.product-type.tool"; }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 0867D690FE84028FC02AAC07 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */; - compatibilityVersion = "Xcode 3.1"; - hasScannedForEncodings = 1; - mainGroup = 0867D691FE84028FC02AAC07 /* ObjCSword */; - productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8DC2EF4F0486A6940098B216 /* ObjCSword */, - A9013CF911E316C700E1CCCA /* ObjCSword_iOS */, - A9C2819511C43C4900803CB5 /* Tests */, - A9BDFA5A1207F9870067ED5B /* LongRunningTests */, - A975EED811C792B9007C1532 /* mod2osis */, - A9FB25DF11FD939E004C4295 /* Sword_iOS */, + A9D2715114D717FD00DA8926 /* imp2ld */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D2715814D717FD00DA8926 /* Build configuration list for PBXNativeTarget "imp2ld" */; + buildPhases = ( + A9D2715414D717FD00DA8926 /* Sources */, + A9D2715614D717FD00DA8926 /* Frameworks */, ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8DC2EF520486A6940098B216 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */, - A9D4382311C52947007AFE83 /* locales.d in Resources */, + buildRules = ( ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9013D1511E316C700E1CCCA /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A9013D1611E316C700E1CCCA /* InfoPlist.strings in Resources */, - A9013D1E11E316C700E1CCCA /* locales.d in Resources */, + dependencies = ( + A9D2715214D717FD00DA8926 /* PBXTargetDependency */, ); - runOnlyForDeploymentPostprocessing = 0; + name = imp2ld; + productName = mod2osis; + productReference = A9D2715B14D717FD00DA8926 /* imp2ld */; + productType = "com.apple.product-type.tool"; }; - A9BDFA5D1207F9870067ED5B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( + A9D2715E14D7181200DA8926 /* imp2vs */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D2716514D7181200DA8926 /* Build configuration list for PBXNativeTarget "imp2vs" */; + buildPhases = ( + A9D2716114D7181200DA8926 /* Sources */, + A9D2716314D7181200DA8926 /* Frameworks */, ); - runOnlyForDeploymentPostprocessing = 0; - }; - A9C2819111C43C4900803CB5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( + buildRules = ( ); - runOnlyForDeploymentPostprocessing = 0; + dependencies = ( + A9D2715F14D7181200DA8926 /* PBXTargetDependency */, + ); + name = imp2vs; + productName = mod2osis; + productReference = A9D2716814D7181200DA8926 /* imp2vs */; + productType = "com.apple.product-type.tool"; }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - A9BDFA641207F9870067ED5B /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( + A9D2716B14D7182300DA8926 /* installmgr */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D2717214D7182300DA8926 /* Build configuration list for PBXNativeTarget "installmgr" */; + buildPhases = ( + A9D2716E14D7182300DA8926 /* Sources */, + A9D2717014D7182300DA8926 /* Frameworks */, ); - inputPaths = ( + buildRules = ( ); - outputPaths = ( + dependencies = ( + A9D2716C14D7182300DA8926 /* PBXTargetDependency */, ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; + name = installmgr; + productName = mod2osis; + productReference = A9D2717514D7182300DA8926 /* installmgr */; + productType = "com.apple.product-type.tool"; }; - A9C2819411C43C4900803CB5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( + A9D2717814D7183B00DA8926 /* mod2imp */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D2717F14D7183B00DA8926 /* Build configuration list for PBXNativeTarget "mod2imp" */; + buildPhases = ( + A9D2717B14D7183B00DA8926 /* Sources */, + A9D2717D14D7183B00DA8926 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9D2717914D7183B00DA8926 /* PBXTargetDependency */, + ); + name = mod2imp; + productName = mod2osis; + productReference = A9D2718214D7183B00DA8926 /* mod2imp */; + productType = "com.apple.product-type.tool"; + }; + A9D2718514D7185800DA8926 /* mod2vpl */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D2718C14D7185800DA8926 /* Build configuration list for PBXNativeTarget "mod2vpl" */; + buildPhases = ( + A9D2718814D7185800DA8926 /* Sources */, + A9D2718A14D7185800DA8926 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9D2718614D7185800DA8926 /* PBXTargetDependency */, + ); + name = mod2vpl; + productName = mod2osis; + productReference = A9D2718F14D7185800DA8926 /* mod2vpl */; + productType = "com.apple.product-type.tool"; + }; + A9D2719214D7186A00DA8926 /* mod2zmod */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D2719914D7186A00DA8926 /* Build configuration list for PBXNativeTarget "mod2zmod" */; + buildPhases = ( + A9D2719514D7186A00DA8926 /* Sources */, + A9D2719714D7186A00DA8926 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9D2719314D7186A00DA8926 /* PBXTargetDependency */, + ); + name = mod2zmod; + productName = mod2osis; + productReference = A9D2719C14D7186A00DA8926 /* mod2zmod */; + productType = "com.apple.product-type.tool"; + }; + A9D2719F14D7187E00DA8926 /* step2vpl */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D271A614D7187E00DA8926 /* Build configuration list for PBXNativeTarget "step2vpl" */; + buildPhases = ( + A9D271A214D7187E00DA8926 /* Sources */, + A9D271A414D7187E00DA8926 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9D271A014D7187E00DA8926 /* PBXTargetDependency */, + ); + name = step2vpl; + productName = osis2mod; + productReference = A9D271A914D7187E00DA8926 /* step2vpl */; + productType = "com.apple.product-type.tool"; + }; + A9D271AC14D7189300DA8926 /* stepdump */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D271B314D7189300DA8926 /* Build configuration list for PBXNativeTarget "stepdump" */; + buildPhases = ( + A9D271AF14D7189300DA8926 /* Sources */, + A9D271B114D7189300DA8926 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9D271AD14D7189300DA8926 /* PBXTargetDependency */, + ); + name = stepdump; + productName = osis2mod; + productReference = A9D271B614D7189300DA8926 /* stepdump */; + productType = "com.apple.product-type.tool"; + }; + A9D271B914D718A400DA8926 /* tei2mod */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D271C014D718A400DA8926 /* Build configuration list for PBXNativeTarget "tei2mod" */; + buildPhases = ( + A9D271BC14D718A400DA8926 /* Sources */, + A9D271BE14D718A400DA8926 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9D271BA14D718A400DA8926 /* PBXTargetDependency */, + ); + name = tei2mod; + productName = osis2mod; + productReference = A9D271C314D718A400DA8926 /* tei2mod */; + productType = "com.apple.product-type.tool"; + }; + A9D271C614D718B800DA8926 /* vpl2mod */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D271CD14D718B800DA8926 /* Build configuration list for PBXNativeTarget "vpl2mod" */; + buildPhases = ( + A9D271C914D718B800DA8926 /* Sources */, + A9D271CB14D718B800DA8926 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9D271C714D718B800DA8926 /* PBXTargetDependency */, + ); + name = vpl2mod; + productName = osis2mod; + productReference = A9D271D014D718B800DA8926 /* vpl2mod */; + productType = "com.apple.product-type.tool"; + }; + A9D271D314D718C800DA8926 /* vs2osisref */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D271DA14D718C800DA8926 /* Build configuration list for PBXNativeTarget "vs2osisref" */; + buildPhases = ( + A9D271D614D718C800DA8926 /* Sources */, + A9D271D814D718C800DA8926 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9D271D414D718C800DA8926 /* PBXTargetDependency */, + ); + name = vs2osisref; + productName = osis2mod; + productReference = A9D271DD14D718C800DA8926 /* vs2osisref */; + productType = "com.apple.product-type.tool"; + }; + A9D271E014D718DF00DA8926 /* vs2osisreftxt */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D271E714D718DF00DA8926 /* Build configuration list for PBXNativeTarget "vs2osisreftxt" */; + buildPhases = ( + A9D271E314D718DF00DA8926 /* Sources */, + A9D271E514D718DF00DA8926 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9D271E114D718DF00DA8926 /* PBXTargetDependency */, + ); + name = vs2osisreftxt; + productName = osis2mod; + productReference = A9D271EA14D718DF00DA8926 /* vs2osisreftxt */; + productType = "com.apple.product-type.tool"; + }; + A9D271ED14D718F500DA8926 /* xml2gbs */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9D271F414D718F500DA8926 /* Build configuration list for PBXNativeTarget "xml2gbs" */; + buildPhases = ( + A9D271F014D718F500DA8926 /* Sources */, + A9D271F214D718F500DA8926 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + A9D271EE14D718F500DA8926 /* PBXTargetDependency */, + ); + name = xml2gbs; + productName = osis2mod; + productReference = A9D271F714D718F500DA8926 /* xml2gbs */; + productType = "com.apple.product-type.tool"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 0867D690FE84028FC02AAC07 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0460; + }; + buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + en, + ); + mainGroup = 0867D691FE84028FC02AAC07 /* ObjCSword */; + productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8DC2EF4F0486A6940098B216 /* ObjCSword */, + A9BDFA5A1207F9870067ED5B /* LongRunningTests */, + A9BFB0A113EDF51000032679 /* Tests */, + A954ABC213EE9AB00094E3FE /* sword */, + A9D2714414D717D800DA8926 /* imp2gbs */, + A9D2715114D717FD00DA8926 /* imp2ld */, + A9D2715E14D7181200DA8926 /* imp2vs */, + A9D2716B14D7182300DA8926 /* installmgr */, + A9D2717814D7183B00DA8926 /* mod2imp */, + A975EED811C792B9007C1532 /* mod2osis */, + A9D2718514D7185800DA8926 /* mod2vpl */, + A9D2719214D7186A00DA8926 /* mod2zmod */, + A9A7EEB314D5D61700B76B6A /* osis2mod */, + A9D2719F14D7187E00DA8926 /* step2vpl */, + A9D271AC14D7189300DA8926 /* stepdump */, + A9D271B914D718A400DA8926 /* tei2mod */, + A9D271C614D718B800DA8926 /* vpl2mod */, + A9D271D314D718C800DA8926 /* vs2osisref */, + A9D271E014D718DF00DA8926 /* vs2osisreftxt */, + A9D271ED14D718F500DA8926 /* xml2gbs */, + A9D271FA14D7193300DA8926 /* Utilities */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8DC2EF520486A6940098B216 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */, + A9D4382311C52947007AFE83 /* locales.d in Resources */, + A917AF2616B1BE38006367FC /* Tests-Info.plist in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9BDFA5D1207F9870067ED5B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9BFB09F13EDF51000032679 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + A9BDFA641207F9870067ED5B /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; + }; + A9BFB0A013EDF51000032679 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( ); inputPaths = ( ); @@ -2612,14 +2821,11 @@ A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */, A94EAC0E117B28920018B06F /* SwordBibleBook.mm in Sources */, A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */, - A94EAC12117B28920018B06F /* SwordBibleTextEntry.m in Sources */, A94EAC14117B28920018B06F /* SwordBook.mm in Sources */, A94EAC16117B28920018B06F /* SwordCommentary.mm in Sources */, A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */, A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */, - A94EAC1C117B28920018B06F /* SwordInstallSourceController.mm in Sources */, - A94EAC1E117B28920018B06F /* SwordKey.mm in Sources */, - A94EAC20117B28920018B06F /* SwordListKey.mm in Sources */, + A94EAC1C117B28920018B06F /* SwordInstallSourceManager.mm in Sources */, A94EAC22117B28920018B06F /* SwordManager.mm in Sources */, A94EAC26117B28920018B06F /* SwordModule.mm in Sources */, A94EAC28117B28920018B06F /* SwordModuleTextEntry.m in Sources */, @@ -2631,35 +2837,282 @@ A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */, A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */, A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */, + 8C92CE39E231FF9CAAB5308B /* SwordUtil.m in Sources */, + 8C92CE0B19FBB659FB8F8B71 /* FilterProviderFactory.mm in Sources */, + 8C92CC7B68FDCDFFFB8B4A31 /* DefaultFilterProvider.mm in Sources */, + 8C92C31DC92DF0671FCEB5B3 /* SwordFilter.mm in Sources */, + A929619C16B1BA240094E5BE /* SwordBibleTextEntry.m in Sources */, + A929619E16B1BA240094E5BE /* SwordKey.mm in Sources */, + A92961A016B1BA240094E5BE /* SwordListKey.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - A9013D1F11E316C700E1CCCA /* Sources */ = { + A954ABBF13EE9AB00094E3FE /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A9013D2011E316C700E1CCCA /* SwordBible.mm in Sources */, - A9013D2111E316C700E1CCCA /* SwordBibleBook.mm in Sources */, - A9013D2211E316C700E1CCCA /* SwordBibleChapter.m in Sources */, - A9013D2311E316C700E1CCCA /* SwordBibleTextEntry.m in Sources */, - A9013D2411E316C700E1CCCA /* SwordBook.mm in Sources */, - A9013D2511E316C700E1CCCA /* SwordCommentary.mm in Sources */, - A9013D2611E316C700E1CCCA /* SwordDictionary.mm in Sources */, - A9013D2711E316C700E1CCCA /* SwordInstallSource.mm in Sources */, - A9013D2811E316C700E1CCCA /* SwordInstallSourceController.mm in Sources */, - A9013D2911E316C700E1CCCA /* SwordKey.mm in Sources */, - A9013D2A11E316C700E1CCCA /* SwordListKey.mm in Sources */, - A9013D2B11E316C700E1CCCA /* SwordManager.mm in Sources */, - A9013D2D11E316C700E1CCCA /* SwordModule.mm in Sources */, - A9013D2E11E316C700E1CCCA /* SwordModuleTextEntry.m in Sources */, - A9013D2F11E316C700E1CCCA /* SwordModuleTreeEntry.m in Sources */, - A9013D3011E316C700E1CCCA /* SwordVerseKey.mm in Sources */, - A9013D3111E316C700E1CCCA /* SwordVerseManager.mm in Sources */, - A9013D3211E316C700E1CCCA /* VerseEnumerator.mm in Sources */, - A9013D3311E316C700E1CCCA /* OSXConfiguration.m in Sources */, - A9013D3411E316C700E1CCCA /* Configuration.m in Sources */, - A9013D3511E316C700E1CCCA /* SwordModule+Index.mm in Sources */, - A9EF1419120595650078A27C /* SwordLocaleManager.mm in Sources */, + A999FF3F17951CCE00E65919 /* bz2comprs.cpp in Sources */, + A999FF4017951CCE00E65919 /* xzcomprs.cpp in Sources */, + A999FF4117951CCE00E65919 /* scsuutf8.cpp in Sources */, + A96C2359176AFA3C008D714B /* remotetrans.cpp in Sources */, + A96C235A176AFA3C008D714B /* osisenum.cpp in Sources */, + A96C235B176AFA3C008D714B /* osisglosses.cpp in Sources */, + A96C235C176AFA3C008D714B /* osisxlit.cpp in Sources */, + A96C235C176AFA3C008D714B /* osisreferencelinks.cpp in Sources */, + A96C235D176AFA3C008D714B /* gzclose.c in Sources */, + A96C235E176AFA3C008D714B /* gzlib.c in Sources */, + A96C235F176AFA3C008D714B /* gzread.c in Sources */, + A96C2360176AFA3C008D714B /* gzwrite.c in Sources */, + A96C2361176AFA3C008D714B /* infback.c in Sources */, + A91C8B6817523609008702B9 /* versificationmgr.cpp in Sources */, + A967FB5616806B16004ED73C /* teixhtml.cpp in Sources */, + A954ACCA13EEA5340094E3FE /* ftplib.c in Sources */, + A954ACCB13EEA5340094E3FE /* ftpparse.c in Sources */, + A954ACCD13EEA5340094E3FE /* adler32.c in Sources */, + A954ACCE13EEA5340094E3FE /* compress.c in Sources */, + A954ACCF13EEA5340094E3FE /* crc32.c in Sources */, + A954ACD013EEA5340094E3FE /* deflate.c in Sources */, + A954ACD413EEA5340094E3FE /* inffast.c in Sources */, + A954ACD513EEA5340094E3FE /* inflate.c in Sources */, + A954ACD613EEA5340094E3FE /* inftrees.c in Sources */, + A954ACD913EEA5340094E3FE /* trees.c in Sources */, + A954ACDA13EEA5340094E3FE /* uncompr.c in Sources */, + A954ACDB13EEA5340094E3FE /* untgz.c in Sources */, + A954ACDC13EEA5340094E3FE /* zutil.c in Sources */, + A954AC3A13EEA0C10094E3FE /* swdisp.cpp in Sources */, + A954AC3B13EEA0C10094E3FE /* swlog.cpp in Sources */, + A954AC3C13EEA0C10094E3FE /* listkey.cpp in Sources */, + A954AC3D13EEA0C10094E3FE /* strkey.cpp in Sources */, + A954AC3E13EEA0C10094E3FE /* swkey.cpp in Sources */, + A954AC3F13EEA0C10094E3FE /* treekey.cpp in Sources */, + A954AC4013EEA0C10094E3FE /* treekeyidx.cpp in Sources */, + A954AC4113EEA0C10094E3FE /* versekey.cpp in Sources */, + A954AC4213EEA0C10094E3FE /* versetreekey.cpp in Sources */, + A954AC4313EEA0C10094E3FE /* curlftpt.cpp in Sources */, + A954AC4413EEA0C10094E3FE /* curlhttpt.cpp in Sources */, + A954AC4513EEA0C10094E3FE /* encfiltmgr.cpp in Sources */, + A954AC4613EEA0C10094E3FE /* filemgr.cpp in Sources */, + A954AC4713EEA0C10094E3FE /* ftplibftpt.cpp in Sources */, + A954AC4913EEA0C10094E3FE /* installmgr.cpp in Sources */, + A954AC4A13EEA0C10094E3FE /* localemgr.cpp in Sources */, + A954AC4B13EEA0C10094E3FE /* markupfiltmgr.cpp in Sources */, + A954AC4C13EEA0C10094E3FE /* stringmgr.cpp in Sources */, + A954AC4D13EEA0C10094E3FE /* swcacher.cpp in Sources */, + A954AC4E13EEA0C10094E3FE /* swconfig.cpp in Sources */, + A954AC4F13EEA0C10094E3FE /* swfiltermgr.cpp in Sources */, + A954AC5013EEA0C10094E3FE /* swlocale.cpp in Sources */, + A954AC5113EEA0C10094E3FE /* swmgr.cpp in Sources */, + A954AC5213EEA0C10094E3FE /* swsearchable.cpp in Sources */, + A954AC5413EEA0C10094E3FE /* hrefcom.cpp in Sources */, + A954AC5513EEA0C10094E3FE /* rawcom.cpp in Sources */, + A954AC5613EEA0C10094E3FE /* rawcom4.cpp in Sources */, + A954AC5713EEA0C10094E3FE /* rawfiles.cpp in Sources */, + A954AC5813EEA0C10094E3FE /* swcom.cpp in Sources */, + A954AC5913EEA0C10094E3FE /* zcom.cpp in Sources */, + A954AC5A13EEA0C10094E3FE /* entriesblk.cpp in Sources */, + A954AC5B13EEA0C10094E3FE /* lzsscomprs.cpp in Sources */, + A954AC5C13EEA0C10094E3FE /* rawstr.cpp in Sources */, + A954AC5D13EEA0C10094E3FE /* rawstr4.cpp in Sources */, + A954AC5E13EEA0C10094E3FE /* rawverse.cpp in Sources */, + A954AC5F13EEA0C10094E3FE /* rawverse4.cpp in Sources */, + A954AC6013EEA0C10094E3FE /* sapphire.cpp in Sources */, + A954AC6113EEA0C10094E3FE /* swcipher.cpp in Sources */, + A954AC6213EEA0C10094E3FE /* swcomprs.cpp in Sources */, + A954AC6313EEA0C10094E3FE /* zipcomprs.cpp in Sources */, + A954AC6413EEA0C10094E3FE /* zstr.cpp in Sources */, + A954AC6513EEA0C10094E3FE /* zverse.cpp in Sources */, + A954AC6613EEA0C10094E3FE /* cipherfil.cpp in Sources */, + A954AC6713EEA0C10094E3FE /* gbffootnotes.cpp in Sources */, + A954AC6813EEA0C10094E3FE /* gbfheadings.cpp in Sources */, + A954AC6913EEA0C10094E3FE /* gbfhtml.cpp in Sources */, + A954AC6A13EEA0C10094E3FE /* gbfhtmlhref.cpp in Sources */, + A954AC6B13EEA0C10094E3FE /* gbfmorph.cpp in Sources */, + A954AC6C13EEA0C10094E3FE /* gbfosis.cpp in Sources */, + A954AC6D13EEA0C10094E3FE /* gbfplain.cpp in Sources */, + A954AC6E13EEA0C10094E3FE /* gbfredletterwords.cpp in Sources */, + A954AC6F13EEA0C10094E3FE /* gbfrtf.cpp in Sources */, + A954AC7013EEA0C10094E3FE /* gbfstrongs.cpp in Sources */, + A954AC7113EEA0C10094E3FE /* gbfthml.cpp in Sources */, + A954AC7213EEA0C10094E3FE /* gbfwebif.cpp in Sources */, + A954AC7313EEA0C10094E3FE /* gbfwordjs.cpp in Sources */, + A954AC7413EEA0C10094E3FE /* gbfxhtml.cpp in Sources */, + A954AC7513EEA0C10094E3FE /* greeklexattribs.cpp in Sources */, + A954AC7613EEA0C10094E3FE /* latin1utf16.cpp in Sources */, + A954AC7713EEA0C10094E3FE /* latin1utf8.cpp in Sources */, + A954AC7813EEA0C10094E3FE /* osisfootnotes.cpp in Sources */, + A954AC7913EEA0C10094E3FE /* osisheadings.cpp in Sources */, + A954AC7A13EEA0C10094E3FE /* osishtmlhref.cpp in Sources */, + A954AC7B13EEA0C10094E3FE /* osislemma.cpp in Sources */, + A954AC7C13EEA0C10094E3FE /* osismorph.cpp in Sources */, + A954AC7D13EEA0C10094E3FE /* osismorphsegmentation.cpp in Sources */, + A954AC7E13EEA0C10094E3FE /* osisosis.cpp in Sources */, + A954AC7F13EEA0C10094E3FE /* osisplain.cpp in Sources */, + A954AC8013EEA0C10094E3FE /* osisredletterwords.cpp in Sources */, + A954AC8113EEA0C10094E3FE /* osisrtf.cpp in Sources */, + A954AC8313EEA0C10094E3FE /* osisscripref.cpp in Sources */, + A954AC8413EEA0C10094E3FE /* osisstrongs.cpp in Sources */, + A954AC8513EEA0C10094E3FE /* osisvariants.cpp in Sources */, + A954AC8613EEA0C10094E3FE /* osiswebif.cpp in Sources */, + A954AC8713EEA0C10094E3FE /* osiswordjs.cpp in Sources */, + A954AC8813EEA0C10094E3FE /* osisxhtml.cpp in Sources */, + A954AC8913EEA0C10094E3FE /* papyriplain.cpp in Sources */, + A954AC8C13EEA0C10094E3FE /* rtfhtml.cpp in Sources */, + A954AC8D13EEA0C10094E3FE /* swbasicfilter.cpp in Sources */, + A954AC8E13EEA0C10094E3FE /* swoptfilter.cpp in Sources */, + A954AC8F13EEA0C10094E3FE /* teihtmlhref.cpp in Sources */, + A954AC9013EEA0C10094E3FE /* teiplain.cpp in Sources */, + A954AC9113EEA0C10094E3FE /* teirtf.cpp in Sources */, + A954AC9213EEA0C10094E3FE /* thmlfootnotes.cpp in Sources */, + A954AC9313EEA0C10094E3FE /* thmlgbf.cpp in Sources */, + A954AC9413EEA0C10094E3FE /* thmlheadings.cpp in Sources */, + A954AC9513EEA0C10094E3FE /* thmlhtml.cpp in Sources */, + A954AC9613EEA0C10094E3FE /* thmlhtmlhref.cpp in Sources */, + A954AC9713EEA0C10094E3FE /* thmllemma.cpp in Sources */, + A954AC9813EEA0C10094E3FE /* thmlmorph.cpp in Sources */, + A954AC9913EEA0C10094E3FE /* thmlosis.cpp in Sources */, + A954AC9A13EEA0C10094E3FE /* thmlplain.cpp in Sources */, + A954AC9B13EEA0C10094E3FE /* thmlrtf.cpp in Sources */, + A954AC9C13EEA0C10094E3FE /* thmlscripref.cpp in Sources */, + A954AC9D13EEA0C10094E3FE /* thmlstrongs.cpp in Sources */, + A954AC9E13EEA0C10094E3FE /* thmlvariants.cpp in Sources */, + A954AC9F13EEA0C10094E3FE /* thmlwebif.cpp in Sources */, + A954ACA013EEA0C10094E3FE /* thmlwordjs.cpp in Sources */, + A954ACA113EEA0C10094E3FE /* thmlxhtml.cpp in Sources */, + A954ACA213EEA0C10094E3FE /* unicodertf.cpp in Sources */, + A954ACA313EEA0C10094E3FE /* utf16utf8.cpp in Sources */, + A954ACA413EEA0C10094E3FE /* utf8arabicpoints.cpp in Sources */, + A954ACA513EEA0C10094E3FE /* utf8arshaping.cpp in Sources */, + A954ACA613EEA0C10094E3FE /* utf8bidireorder.cpp in Sources */, + A954ACA713EEA0C10094E3FE /* utf8cantillation.cpp in Sources */, + A954ACA813EEA0C10094E3FE /* utf8greekaccents.cpp in Sources */, + A954ACA913EEA0C10094E3FE /* utf8hebrewpoints.cpp in Sources */, + A954ACAA13EEA0C10094E3FE /* utf8html.cpp in Sources */, + A954ACAB13EEA0C10094E3FE /* utf8latin1.cpp in Sources */, + A954ACAC13EEA0C10094E3FE /* utf8nfc.cpp in Sources */, + A954ACAD13EEA0C10094E3FE /* utf8nfkd.cpp in Sources */, + A954ACAE13EEA0C10094E3FE /* utf8transliterator.cpp in Sources */, + A954ACAF13EEA0C10094E3FE /* utf8utf16.cpp in Sources */, + A954ACB013EEA0C10094E3FE /* rawgenbook.cpp in Sources */, + A954ACB113EEA0C10094E3FE /* swgenbook.cpp in Sources */, + A954ACB213EEA0C10094E3FE /* rawld.cpp in Sources */, + A954ACB313EEA0C10094E3FE /* rawld4.cpp in Sources */, + A954ACB413EEA0C10094E3FE /* swld.cpp in Sources */, + A954ACB513EEA0C10094E3FE /* zld.cpp in Sources */, + A954ACB613EEA0C10094E3FE /* swmodule.cpp in Sources */, + A954ACB713EEA0C10094E3FE /* rawtext.cpp in Sources */, + A954ACB813EEA0C10094E3FE /* rawtext4.cpp in Sources */, + A954ACB913EEA0C10094E3FE /* swtext.cpp in Sources */, + A954ACBA13EEA0C10094E3FE /* ztext.cpp in Sources */, + A954ACBB13EEA0C10094E3FE /* roman.cpp in Sources */, + A954ACBC13EEA0C10094E3FE /* swbuf.cpp in Sources */, + A954ACBD13EEA0C10094E3FE /* swobject.cpp in Sources */, + A954ACBF13EEA0C10094E3FE /* swversion.cpp in Sources */, + A954ACC013EEA0C10094E3FE /* url.cpp in Sources */, + A954ACC113EEA0C10094E3FE /* utilstr.cpp in Sources */, + A954ACC213EEA0C10094E3FE /* utilxml.cpp in Sources */, + A954ABCB13EE9E460094E3FE /* AnalysisHeader.cpp in Sources */, + A954ABCC13EE9E460094E3FE /* Analyzers.cpp in Sources */, + A954ABCD13EE9E470094E3FE /* StandardAnalyzer.cpp in Sources */, + A954ABCE13EE9E470094E3FE /* StandardFilter.cpp in Sources */, + A954ABCF13EE9E470094E3FE /* StandardTokenizer.cpp in Sources */, + A954ABD013EE9E470094E3FE /* gunichartables.cpp in Sources */, + A954ABD113EE9E470094E3FE /* repl_lltot.cpp in Sources */, + A954ABD213EE9E470094E3FE /* repl_tcscasecmp.cpp in Sources */, + A954ABD313EE9E470094E3FE /* repl_tcslwr.cpp in Sources */, + A954ABD413EE9E470094E3FE /* repl_tcstod.cpp in Sources */, + A954ABD513EE9E470094E3FE /* repl_tcstoll.cpp in Sources */, + A954ABD613EE9E470094E3FE /* repl_tprintf.cpp in Sources */, + A954ABD713EE9E470094E3FE /* threads.cpp in Sources */, + A954ABD813EE9E470094E3FE /* utf8.cpp in Sources */, + A954ABD913EE9E470094E3FE /* condition.cpp in Sources */, + A954ABDA13EE9E470094E3FE /* error.cpp in Sources */, + A954ABDB13EE9E470094E3FE /* memtracking.cpp in Sources */, + A954ABDC13EE9E470094E3FE /* DateField.cpp in Sources */, + A954ABDD13EE9E470094E3FE /* Document.cpp in Sources */, + A954ABDE13EE9E470094E3FE /* Field.cpp in Sources */, + A954ABDF13EE9E470094E3FE /* CompoundFile.cpp in Sources */, + A954ABE013EE9E470094E3FE /* DocumentWriter.cpp in Sources */, + A954ABE113EE9E470094E3FE /* FieldInfos.cpp in Sources */, + A954ABE213EE9E470094E3FE /* FieldsReader.cpp in Sources */, + A954ABE313EE9E470094E3FE /* FieldsWriter.cpp in Sources */, + A954ABE413EE9E470094E3FE /* IndexModifier.cpp in Sources */, + A954ABE513EE9E470094E3FE /* IndexReader.cpp in Sources */, + A954ABE613EE9E470094E3FE /* IndexWriter.cpp in Sources */, + A954ABE713EE9E470094E3FE /* MultiReader.cpp in Sources */, + A954ABE813EE9E470094E3FE /* SegmentInfos.cpp in Sources */, + A954ABE913EE9E470094E3FE /* SegmentMergeInfo.cpp in Sources */, + A954ABEA13EE9E470094E3FE /* SegmentMergeQueue.cpp in Sources */, + A954ABEB13EE9E470094E3FE /* SegmentMerger.cpp in Sources */, + A954ABEC13EE9E470094E3FE /* SegmentReader.cpp in Sources */, + A954ABED13EE9E470094E3FE /* SegmentTermDocs.cpp in Sources */, + A954ABEE13EE9E470094E3FE /* SegmentTermEnum.cpp in Sources */, + A954ABEF13EE9E470094E3FE /* SegmentTermPositions.cpp in Sources */, + A954ABF013EE9E470094E3FE /* SegmentTermVector.cpp in Sources */, + A954ABF113EE9E470094E3FE /* Term.cpp in Sources */, + A954ABF213EE9E470094E3FE /* TermInfo.cpp in Sources */, + A954ABF313EE9E470094E3FE /* TermInfosReader.cpp in Sources */, + A954ABF413EE9E470094E3FE /* TermInfosWriter.cpp in Sources */, + A954ABF513EE9E470094E3FE /* TermVectorReader.cpp in Sources */, + A954ABF613EE9E470094E3FE /* TermVectorWriter.cpp in Sources */, + A954ABF713EE9E470094E3FE /* Lexer.cpp in Sources */, + A954ABF813EE9E470094E3FE /* MultiFieldQueryParser.cpp in Sources */, + A954ABF913EE9E470094E3FE /* QueryParser.cpp in Sources */, + A954ABFA13EE9E470094E3FE /* QueryParserBase.cpp in Sources */, + A954ABFB13EE9E470094E3FE /* QueryToken.cpp in Sources */, + A954ABFC13EE9E470094E3FE /* TokenList.cpp in Sources */, + A954ABFD13EE9E470094E3FE /* BooleanQuery.cpp in Sources */, + A954ABFE13EE9E470094E3FE /* BooleanScorer.cpp in Sources */, + A954ABFF13EE9E470094E3FE /* CachingWrapperFilter.cpp in Sources */, + A954AC0013EE9E470094E3FE /* ChainedFilter.cpp in Sources */, + A954AC0113EE9E470094E3FE /* ConjunctionScorer.cpp in Sources */, + A954AC0213EE9E470094E3FE /* DateFilter.cpp in Sources */, + A954AC0313EE9E470094E3FE /* ExactPhraseScorer.cpp in Sources */, + A954AC0413EE9E470094E3FE /* Explanation.cpp in Sources */, + A954AC0513EE9E470094E3FE /* FieldCache.cpp in Sources */, + A954AC0613EE9E470094E3FE /* FieldCacheImpl.cpp in Sources */, + A954AC0713EE9E470094E3FE /* FieldDocSortedHitQueue.cpp in Sources */, + A954AC0813EE9E470094E3FE /* FieldSortedHitQueue.cpp in Sources */, + A954AC0913EE9E470094E3FE /* FilteredTermEnum.cpp in Sources */, + A954AC0A13EE9E470094E3FE /* FuzzyQuery.cpp in Sources */, + A954AC0B13EE9E470094E3FE /* HitQueue.cpp in Sources */, + A954AC0C13EE9E470094E3FE /* Hits.cpp in Sources */, + A954AC0D13EE9E470094E3FE /* IndexSearcher.cpp in Sources */, + A954AC0E13EE9E470094E3FE /* MultiSearcher.cpp in Sources */, + A954AC0F13EE9E470094E3FE /* MultiTermQuery.cpp in Sources */, + A954AC1013EE9E470094E3FE /* PhrasePositions.cpp in Sources */, + A954AC1113EE9E470094E3FE /* PhraseQuery.cpp in Sources */, + A954AC1213EE9E470094E3FE /* PhraseScorer.cpp in Sources */, + A954AC1313EE9E470094E3FE /* PrefixQuery.cpp in Sources */, + A954AC1413EE9E470094E3FE /* QueryFilter.cpp in Sources */, + A954AC1513EE9E470094E3FE /* RangeFilter.cpp in Sources */, + A954AC1613EE9E470094E3FE /* RangeQuery.cpp in Sources */, + A954AC1713EE9E470094E3FE /* SearchHeader.cpp in Sources */, + A954AC1813EE9E470094E3FE /* Similarity.cpp in Sources */, + A954AC1913EE9E470094E3FE /* SloppyPhraseScorer.cpp in Sources */, + A954AC1A13EE9E470094E3FE /* Sort.cpp in Sources */, + A954AC1B13EE9E470094E3FE /* TermQuery.cpp in Sources */, + A954AC1C13EE9E470094E3FE /* TermScorer.cpp in Sources */, + A954AC1D13EE9E470094E3FE /* WildcardQuery.cpp in Sources */, + A954AC1E13EE9E470094E3FE /* WildcardTermEnum.cpp in Sources */, + A954AC1F13EE9E470094E3FE /* StdHeader.cpp in Sources */, + A954AC2013EE9E470094E3FE /* FSDirectory.cpp in Sources */, + A954AC2113EE9E470094E3FE /* IndexInput.cpp in Sources */, + A954AC2213EE9E470094E3FE /* IndexOutput.cpp in Sources */, + A954AC2313EE9E470094E3FE /* Lock.cpp in Sources */, + A954AC2413EE9E470094E3FE /* MMapInput.cpp in Sources */, + A954AC2513EE9E470094E3FE /* RAMDirectory.cpp in Sources */, + A954AC2613EE9E470094E3FE /* TransactionalRAMDirectory.cpp in Sources */, + A954AC2713EE9E470094E3FE /* BitSet.cpp in Sources */, + A954AC2813EE9E470094E3FE /* dirent.cpp in Sources */, + A954AC2913EE9E470094E3FE /* Equators.cpp in Sources */, + A954AC2A13EE9E470094E3FE /* FastCharStream.cpp in Sources */, + A954AC2B13EE9E470094E3FE /* fileinputstream.cpp in Sources */, + A954AC2C13EE9E470094E3FE /* MD5Digester.cpp in Sources */, + A954AC2D13EE9E470094E3FE /* Misc.cpp in Sources */, + A954AC2E13EE9E470094E3FE /* Reader.cpp in Sources */, + A954AC2F13EE9E470094E3FE /* StringBuffer.cpp in Sources */, + A954AC3013EE9E470094E3FE /* StringIntern.cpp in Sources */, + A954AC3113EE9E470094E3FE /* ThreadLocal.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2671,6 +3124,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + A9A7EEB014D5D61700B76B6A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9A7EEBE14D5D64C00B76B6A /* osis2mod.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; A9BDFA5E1207F9870067ED5B /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2679,314 +3140,321 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - A9C2819211C43C4900803CB5 /* Sources */ = { + A9BFB09D13EDF51000032679 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9BFB0BC13EDF5C900032679 /* SwordManagerTest.m in Sources */, + A9BFB0BD13EDF5C900032679 /* SwordModuleTest.m in Sources */, + A9BFB0BE13EDF5C900032679 /* SwordListKeyTest.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2714714D717D800DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2715014D717F600DA8926 /* imp2gbs.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2715414D717FD00DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2715D14D7180F00DA8926 /* imp2ld.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2716114D7181200DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2716A14D7182100DA8926 /* imp2vs.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2716E14D7182300DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2717714D7183700DA8926 /* installmgr.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2717B14D7183B00DA8926 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A96465A511C6657900640FAC /* SwordManagerTest.m in Sources */, - A918B8E511C6697400024D84 /* SwordModuleTest.m in Sources */, - A9BDFA791207F9F00067ED5B /* SwordListKeyTest.m in Sources */, - A9BDFA871207FC8C0067ED5B /* ImageModuleTest.m in Sources */, + A9D2718414D7184E00DA8926 /* mod2imp.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - A9FB25DD11FD939E004C4295 /* Sources */ = { + A9D2718814D7185800DA8926 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A9FB273711FD95CD004C4295 /* AnalysisHeader.cpp in Sources */, - A9FB273911FD95CD004C4295 /* Analyzers.cpp in Sources */, - A9FB273B11FD95CD004C4295 /* StandardAnalyzer.cpp in Sources */, - A9FB273D11FD95CD004C4295 /* StandardFilter.cpp in Sources */, - A9FB273F11FD95CD004C4295 /* StandardTokenizer.cpp in Sources */, - A9FB274A11FD95CD004C4295 /* gunichartables.cpp in Sources */, - A9FB274F11FD95CD004C4295 /* repl_lltot.cpp in Sources */, - A9FB275111FD95CD004C4295 /* repl_tcscasecmp.cpp in Sources */, - A9FB275211FD95CD004C4295 /* repl_tcslwr.cpp in Sources */, - A9FB275311FD95CD004C4295 /* repl_tcstod.cpp in Sources */, - A9FB275411FD95CD004C4295 /* repl_tcstoll.cpp in Sources */, - A9FB275511FD95CD004C4295 /* repl_tprintf.cpp in Sources */, - A9FB275911FD95CD004C4295 /* threads.cpp in Sources */, - A9FB275A11FD95CD004C4295 /* utf8.cpp in Sources */, - A9FB275B11FD95CD004C4295 /* condition.cpp in Sources */, - A9FB275D11FD95CD004C4295 /* error.cpp in Sources */, - A9FB276111FD95CD004C4295 /* memtracking.cpp in Sources */, - A9FB276211FD95CD004C4295 /* DateField.cpp in Sources */, - A9FB276411FD95CD004C4295 /* Document.cpp in Sources */, - A9FB276611FD95CD004C4295 /* Field.cpp in Sources */, - A9FB276811FD95CD004C4295 /* CompoundFile.cpp in Sources */, - A9FB276A11FD95CD004C4295 /* DocumentWriter.cpp in Sources */, - A9FB276D11FD95CD004C4295 /* FieldInfos.cpp in Sources */, - A9FB276F11FD95CD004C4295 /* FieldsReader.cpp in Sources */, - A9FB277111FD95CD004C4295 /* FieldsWriter.cpp in Sources */, - A9FB277311FD95CD004C4295 /* IndexModifier.cpp in Sources */, - A9FB277511FD95CD004C4295 /* IndexReader.cpp in Sources */, - A9FB277711FD95CD004C4295 /* IndexWriter.cpp in Sources */, - A9FB277911FD95CD004C4295 /* MultiReader.cpp in Sources */, - A9FB277C11FD95CD004C4295 /* SegmentInfos.cpp in Sources */, - A9FB277E11FD95CD004C4295 /* SegmentMergeInfo.cpp in Sources */, - A9FB278011FD95CD004C4295 /* SegmentMergeQueue.cpp in Sources */, - A9FB278211FD95CD004C4295 /* SegmentMerger.cpp in Sources */, - A9FB278411FD95CD004C4295 /* SegmentReader.cpp in Sources */, - A9FB278511FD95CD004C4295 /* SegmentTermDocs.cpp in Sources */, - A9FB278611FD95CD004C4295 /* SegmentTermEnum.cpp in Sources */, - A9FB278811FD95CD004C4295 /* SegmentTermPositions.cpp in Sources */, - A9FB278911FD95CD004C4295 /* SegmentTermVector.cpp in Sources */, - A9FB278A11FD95CD004C4295 /* Term.cpp in Sources */, - A9FB278C11FD95CD004C4295 /* TermInfo.cpp in Sources */, - A9FB278E11FD95CD004C4295 /* TermInfosReader.cpp in Sources */, - A9FB279011FD95CD004C4295 /* TermInfosWriter.cpp in Sources */, - A9FB279411FD95CD004C4295 /* TermVectorReader.cpp in Sources */, - A9FB279511FD95CD004C4295 /* TermVectorWriter.cpp in Sources */, - A9FB279711FD95CD004C4295 /* Lexer.cpp in Sources */, - A9FB279911FD95CD004C4295 /* MultiFieldQueryParser.cpp in Sources */, - A9FB279B11FD95CD004C4295 /* QueryParser.cpp in Sources */, - A9FB279D11FD95CD004C4295 /* QueryParserBase.cpp in Sources */, - A9FB279F11FD95CD004C4295 /* QueryToken.cpp in Sources */, - A9FB27A111FD95CD004C4295 /* TokenList.cpp in Sources */, - A9FB27A411FD95CD004C4295 /* BooleanQuery.cpp in Sources */, - A9FB27A611FD95CD004C4295 /* BooleanScorer.cpp in Sources */, - A9FB27A811FD95CD004C4295 /* CachingWrapperFilter.cpp in Sources */, - A9FB27AA11FD95CD004C4295 /* ChainedFilter.cpp in Sources */, - A9FB27AD11FD95CD004C4295 /* ConjunctionScorer.cpp in Sources */, - A9FB27AF11FD95CD004C4295 /* DateFilter.cpp in Sources */, - A9FB27B111FD95CD004C4295 /* ExactPhraseScorer.cpp in Sources */, - A9FB27B311FD95CD004C4295 /* Explanation.cpp in Sources */, - A9FB27B511FD95CD004C4295 /* FieldCache.cpp in Sources */, - A9FB27B711FD95CD004C4295 /* FieldCacheImpl.cpp in Sources */, - A9FB27BA11FD95CD004C4295 /* FieldDocSortedHitQueue.cpp in Sources */, - A9FB27BC11FD95CD004C4295 /* FieldSortedHitQueue.cpp in Sources */, - A9FB27BF11FD95CD004C4295 /* FilteredTermEnum.cpp in Sources */, - A9FB27C111FD95CD004C4295 /* FuzzyQuery.cpp in Sources */, - A9FB27C311FD95CD004C4295 /* HitQueue.cpp in Sources */, - A9FB27C511FD95CD004C4295 /* Hits.cpp in Sources */, - A9FB27C611FD95CD004C4295 /* IndexSearcher.cpp in Sources */, - A9FB27C811FD95CD004C4295 /* MultiSearcher.cpp in Sources */, - A9FB27CA11FD95CD004C4295 /* MultiTermQuery.cpp in Sources */, - A9FB27CC11FD95CD004C4295 /* PhrasePositions.cpp in Sources */, - A9FB27CE11FD95CD004C4295 /* PhraseQuery.cpp in Sources */, - A9FB27D111FD95CD004C4295 /* PhraseScorer.cpp in Sources */, - A9FB27D311FD95CD004C4295 /* PrefixQuery.cpp in Sources */, - A9FB27D511FD95CD004C4295 /* QueryFilter.cpp in Sources */, - A9FB27D711FD95CD004C4295 /* RangeFilter.cpp in Sources */, - A9FB27D911FD95CD004C4295 /* RangeQuery.cpp in Sources */, - A9FB27DC11FD95CD004C4295 /* SearchHeader.cpp in Sources */, - A9FB27DE11FD95CD004C4295 /* Similarity.cpp in Sources */, - A9FB27E011FD95CD004C4295 /* SloppyPhraseScorer.cpp in Sources */, - A9FB27E211FD95CD004C4295 /* Sort.cpp in Sources */, - A9FB27E411FD95CD004C4295 /* TermQuery.cpp in Sources */, - A9FB27E611FD95CD004C4295 /* TermScorer.cpp in Sources */, - A9FB27E811FD95CD004C4295 /* WildcardQuery.cpp in Sources */, - A9FB27EA11FD95CD004C4295 /* WildcardTermEnum.cpp in Sources */, - A9FB27EC11FD95CD004C4295 /* StdHeader.cpp in Sources */, - A9FB27EF11FD95CD004C4295 /* FSDirectory.cpp in Sources */, - A9FB27F111FD95CD004C4295 /* IndexInput.cpp in Sources */, - A9FB27F311FD95CD004C4295 /* IndexOutput.cpp in Sources */, - A9FB27F611FD95CD004C4295 /* Lock.cpp in Sources */, - A9FB27F811FD95CD004C4295 /* MMapInput.cpp in Sources */, - A9FB27FA11FD95CD004C4295 /* RAMDirectory.cpp in Sources */, - A9FB27FC11FD95CD004C4295 /* TransactionalRAMDirectory.cpp in Sources */, - A9FB27FF11FD95CD004C4295 /* BitSet.cpp in Sources */, - A9FB280211FD95CD004C4295 /* dirent.cpp in Sources */, - A9FB280411FD95CD004C4295 /* Equators.cpp in Sources */, - A9FB280611FD95CD004C4295 /* FastCharStream.cpp in Sources */, - A9FB280811FD95CD004C4295 /* fileinputstream.cpp in Sources */, - A9FB280D11FD95CD004C4295 /* MD5Digester.cpp in Sources */, - A9FB280F11FD95CD004C4295 /* Misc.cpp in Sources */, - A9FB281211FD95CD004C4295 /* Reader.cpp in Sources */, - A9FB281511FD95CD004C4295 /* StringBuffer.cpp in Sources */, - A9FB281711FD95CD004C4295 /* StringIntern.cpp in Sources */, - A9FB281B11FD95CD004C4295 /* ThreadLocal.cpp in Sources */, - A9FB28ED11FD95E4004C4295 /* femain.cpp in Sources */, - A9FB28EE11FD95E4004C4295 /* hebrewmcim.cpp in Sources */, - A9FB28EF11FD95E4004C4295 /* nullim.cpp in Sources */, - A9FB28F011FD95E4004C4295 /* swinputmeth.cpp in Sources */, - A9FB28F111FD95E4004C4295 /* swdisp.cpp in Sources */, - A9FB28F211FD95E4004C4295 /* swlog.cpp in Sources */, - A9FB28F311FD95E4004C4295 /* genarray.c in Sources */, - A9FB28F411FD95E4004C4295 /* listkey.cpp in Sources */, - A9FB28F511FD95E4004C4295 /* strkey.cpp in Sources */, - A9FB28F611FD95E4004C4295 /* swkey.cpp in Sources */, - A9FB28F711FD95E4004C4295 /* treekey.cpp in Sources */, - A9FB28F811FD95E4004C4295 /* treekeyidx.cpp in Sources */, - A9FB28F911FD95E4004C4295 /* versekey.cpp in Sources */, - A9FB28FA11FD95E4004C4295 /* versetreekey.cpp in Sources */, - A9FB28FB11FD95E4004C4295 /* curlftpt.cpp in Sources */, - A9FB28FC11FD95E4004C4295 /* curlhttpt.cpp in Sources */, - A9FB28FD11FD95E4004C4295 /* encfiltmgr.cpp in Sources */, - A9FB28FE11FD95E4004C4295 /* filemgr.cpp in Sources */, - A9FB28FF11FD95E4004C4295 /* ftplibftpt.cpp in Sources */, - A9FB290011FD95E4004C4295 /* ftptrans.cpp in Sources */, - A9FB290111FD95E4004C4295 /* installmgr.cpp in Sources */, - A9FB290211FD95E4004C4295 /* localemgr.cpp in Sources */, - A9FB290311FD95E4004C4295 /* markupfiltmgr.cpp in Sources */, - A9FB290411FD95E4004C4295 /* stringmgr.cpp in Sources */, - A9FB290511FD95E4004C4295 /* swcacher.cpp in Sources */, - A9FB290611FD95E4004C4295 /* swconfig.cpp in Sources */, - A9FB290711FD95E4004C4295 /* swfiltermgr.cpp in Sources */, - A9FB290811FD95E4004C4295 /* swlocale.cpp in Sources */, - A9FB290911FD95E4004C4295 /* swmgr.cpp in Sources */, - A9FB290A11FD95E4004C4295 /* swsearchable.cpp in Sources */, - A9FB290B11FD95E4004C4295 /* versemgr.cpp in Sources */, - A9FB290C11FD95E4004C4295 /* hrefcom.cpp in Sources */, - A9FB290D11FD95E4004C4295 /* rawcom.cpp in Sources */, - A9FB290E11FD95E4004C4295 /* rawcom4.cpp in Sources */, - A9FB290F11FD95E4004C4295 /* rawfiles.cpp in Sources */, - A9FB291011FD95E4004C4295 /* swcom.cpp in Sources */, - A9FB291111FD95E4004C4295 /* zcom.cpp in Sources */, - A9FB291211FD95E4004C4295 /* entriesblk.cpp in Sources */, - A9FB291311FD95E4004C4295 /* lzsscomprs.cpp in Sources */, - A9FB291411FD95E4004C4295 /* rawstr.cpp in Sources */, - A9FB291511FD95E4004C4295 /* rawstr4.cpp in Sources */, - A9FB291611FD95E4004C4295 /* rawverse.cpp in Sources */, - A9FB291711FD95E4004C4295 /* rawverse4.cpp in Sources */, - A9FB291811FD95E4004C4295 /* sapphire.cpp in Sources */, - A9FB291911FD95E4004C4295 /* swcipher.cpp in Sources */, - A9FB291A11FD95E4004C4295 /* swcomprs.cpp in Sources */, - A9FB291B11FD95E4004C4295 /* zipcomprs.cpp in Sources */, - A9FB291C11FD95E4004C4295 /* zstr.cpp in Sources */, - A9FB291D11FD95E4004C4295 /* zverse.cpp in Sources */, - A9FB291E11FD95E4004C4295 /* cipherfil.cpp in Sources */, - A9FB291F11FD95E4004C4295 /* gbffootnotes.cpp in Sources */, - A9FB292011FD95E4004C4295 /* gbfheadings.cpp in Sources */, - A9FB292111FD95E4004C4295 /* gbfhtml.cpp in Sources */, - A9FB292211FD95E4004C4295 /* gbfhtmlhref.cpp in Sources */, - A9FB292311FD95E4004C4295 /* gbfmorph.cpp in Sources */, - A9FB292411FD95E4004C4295 /* gbfosis.cpp in Sources */, - A9FB292511FD95E4004C4295 /* gbfplain.cpp in Sources */, - A9FB292611FD95E4004C4295 /* gbfredletterwords.cpp in Sources */, - A9FB292711FD95E4004C4295 /* gbfrtf.cpp in Sources */, - A9FB292811FD95E4004C4295 /* gbfstrongs.cpp in Sources */, - A9FB292911FD95E4004C4295 /* gbfthml.cpp in Sources */, - A9FB292A11FD95E4004C4295 /* gbfwebif.cpp in Sources */, - A9FB292B11FD95E4004C4295 /* gbfwordjs.cpp in Sources */, - A9FB292C11FD95E4004C4295 /* greeklexattribs.cpp in Sources */, - A9FB292D11FD95E4004C4295 /* latin1utf16.cpp in Sources */, - A9FB292E11FD95E4004C4295 /* latin1utf8.cpp in Sources */, - A9FB292F11FD95E4004C4295 /* osisfootnotes.cpp in Sources */, - A9FB293011FD95E4004C4295 /* osisheadings.cpp in Sources */, - A9FB293111FD95E4004C4295 /* osishtmlhref.cpp in Sources */, - A9FB293211FD95E4004C4295 /* osislemma.cpp in Sources */, - A9FB293311FD95E4004C4295 /* osismorph.cpp in Sources */, - A9FB293411FD95E4004C4295 /* osismorphsegmentation.cpp in Sources */, - A9FB293511FD95E4004C4295 /* osisosis.cpp in Sources */, - A9FB293611FD95E4004C4295 /* osisplain.cpp in Sources */, - A9FB293711FD95E4004C4295 /* osisredletterwords.cpp in Sources */, - A9FB293811FD95E4004C4295 /* osisrtf.cpp in Sources */, - A9FB293911FD95E4004C4295 /* osisruby.cpp in Sources */, - A9FB293A11FD95E4004C4295 /* osisscripref.cpp in Sources */, - A9FB293B11FD95E4004C4295 /* osisstrongs.cpp in Sources */, - A9FB293C11FD95E4004C4295 /* osisvariants.cpp in Sources */, - A9FB293D11FD95E4004C4295 /* osiswebif.cpp in Sources */, - A9FB293E11FD95E4004C4295 /* osiswordjs.cpp in Sources */, - A9FB293F11FD95E4004C4295 /* papyriplain.cpp in Sources */, - A9FB294011FD95E4004C4295 /* plainfootnotes.cpp in Sources */, - A9FB294111FD95E4004C4295 /* plainhtml.cpp in Sources */, - A9FB294211FD95E4004C4295 /* rtfhtml.cpp in Sources */, - A9FB294311FD95E4004C4295 /* swbasicfilter.cpp in Sources */, - A9FB294411FD95E4004C4295 /* swoptfilter.cpp in Sources */, - A9FB294511FD95E4004C4295 /* teihtmlhref.cpp in Sources */, - A9FB294611FD95E4004C4295 /* teiplain.cpp in Sources */, - A9FB294711FD95E4004C4295 /* teirtf.cpp in Sources */, - A9FB294811FD95E4004C4295 /* thmlfootnotes.cpp in Sources */, - A9FB294911FD95E4004C4295 /* thmlgbf.cpp in Sources */, - A9FB294A11FD95E4004C4295 /* thmlheadings.cpp in Sources */, - A9FB294B11FD95E4004C4295 /* thmlhtml.cpp in Sources */, - A9FB294C11FD95E4004C4295 /* thmlhtmlhref.cpp in Sources */, - A9FB294D11FD95E4004C4295 /* thmllemma.cpp in Sources */, - A9FB294E11FD95E4004C4295 /* thmlmorph.cpp in Sources */, - A9FB294F11FD95E4004C4295 /* thmlosis.cpp in Sources */, - A9FB295011FD95E4004C4295 /* thmlplain.cpp in Sources */, - A9FB295111FD95E4004C4295 /* thmlrtf.cpp in Sources */, - A9FB295211FD95E4004C4295 /* thmlscripref.cpp in Sources */, - A9FB295311FD95E4004C4295 /* thmlstrongs.cpp in Sources */, - A9FB295411FD95E4004C4295 /* thmlvariants.cpp in Sources */, - A9FB295511FD95E4004C4295 /* thmlwebif.cpp in Sources */, - A9FB295611FD95E4004C4295 /* thmlwordjs.cpp in Sources */, - A9FB295711FD95E4004C4295 /* unicodertf.cpp in Sources */, - A9FB295811FD95E4004C4295 /* utf16utf8.cpp in Sources */, - A9FB295911FD95E4004C4295 /* utf8arabicpoints.cpp in Sources */, - A9FB295A11FD95E4004C4295 /* utf8arshaping.cpp in Sources */, - A9FB295B11FD95E4004C4295 /* utf8bidireorder.cpp in Sources */, - A9FB295C11FD95E4004C4295 /* utf8cantillation.cpp in Sources */, - A9FB295D11FD95E4004C4295 /* utf8greekaccents.cpp in Sources */, - A9FB295E11FD95E4004C4295 /* utf8hebrewpoints.cpp in Sources */, - A9FB295F11FD95E4004C4295 /* utf8html.cpp in Sources */, - A9FB296011FD95E4004C4295 /* utf8latin1.cpp in Sources */, - A9FB296111FD95E4004C4295 /* utf8nfc.cpp in Sources */, - A9FB296211FD95E4004C4295 /* utf8nfkd.cpp in Sources */, - A9FB296311FD95E4004C4295 /* utf8transliterator.cpp in Sources */, - A9FB296411FD95E4004C4295 /* utf8utf16.cpp in Sources */, - A9FB296511FD95E4004C4295 /* rawgenbook.cpp in Sources */, - A9FB296611FD95E4004C4295 /* swgenbook.cpp in Sources */, - A9FB296711FD95E4004C4295 /* rawld.cpp in Sources */, - A9FB296811FD95E4004C4295 /* rawld4.cpp in Sources */, - A9FB296911FD95E4004C4295 /* swld.cpp in Sources */, - A9FB296A11FD95E4004C4295 /* zld.cpp in Sources */, - A9FB296B11FD95E4004C4295 /* swmodule.cpp in Sources */, - A9FB296C11FD95E4004C4295 /* echomod.cpp in Sources */, - A9FB296D11FD95E4004C4295 /* rawtext.cpp in Sources */, - A9FB296E11FD95E4004C4295 /* rawtext4.cpp in Sources */, - A9FB296F11FD95E4004C4295 /* swtext.cpp in Sources */, - A9FB297011FD95E4004C4295 /* ztext.cpp in Sources */, - A9FB297111FD95E4004C4295 /* adler32.c in Sources */, - A9FB297211FD95E4004C4295 /* compress.c in Sources */, - A9FB297311FD95E4004C4295 /* crc32.c in Sources */, - A9FB297411FD95E4004C4295 /* deflate.c in Sources */, - A9FB297611FD95E4004C4295 /* gzio.c in Sources */, - A9FB297711FD95E4004C4295 /* infblock.c in Sources */, - A9FB297911FD95E4004C4295 /* infcodes.c in Sources */, - A9FB297B11FD95E4004C4295 /* inffast.c in Sources */, - A9FB297E11FD95E4004C4295 /* inflate.c in Sources */, - A9FB297F11FD95E4004C4295 /* inftrees.c in Sources */, - A9FB298111FD95E4004C4295 /* infutil.c in Sources */, - A9FB298311FD95E4004C4295 /* maketree.c in Sources */, - A9FB298411FD95E4004C4295 /* trees.c in Sources */, - A9FB298611FD95E4004C4295 /* uncompr.c in Sources */, - A9FB298711FD95E4004C4295 /* untgz.c in Sources */, - A9FB298811FD95E4004C4295 /* zutil.c in Sources */, - A9FB298A11FD95E4004C4295 /* ftplib.c in Sources */, - A9FB298B11FD95E4004C4295 /* ftpparse.c in Sources */, - A9FB298C11FD95E4004C4295 /* regex.c in Sources */, - A9FB298D11FD95E4004C4295 /* roman.cpp in Sources */, - A9FB298E11FD95E4004C4295 /* swbuf.cpp in Sources */, - A9FB298F11FD95E4004C4295 /* swobject.cpp in Sources */, - A9FB299011FD95E4004C4295 /* swunicod.cpp in Sources */, - A9FB299111FD95E4004C4295 /* swversion.cpp in Sources */, - A9FB299211FD95E4004C4295 /* url.cpp in Sources */, - A9FB299311FD95E4004C4295 /* utilstr.cpp in Sources */, - A9FB299411FD95E4004C4295 /* utilxml.cpp in Sources */, + A9D2719114D7186800DA8926 /* mod2vpl.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D2719514D7186A00DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D2719E14D7187A00DA8926 /* mod2zmod.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271A214D7187E00DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271AB14D7189100DA8926 /* step2vpl.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271AF14D7189300DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271B814D718A300DA8926 /* stepdump.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271BC14D718A400DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271C514D718B700DA8926 /* tei2mod.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271C914D718B800DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271D214D718C600DA8926 /* vpl2mod.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271D614D718C800DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271DF14D718DE00DA8926 /* vs2osisref.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271E314D718DF00DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271EC14D718F400DA8926 /* vs2osisreftxt.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9D271F014D718F500DA8926 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9D271F914D7190400DA8926 /* xml2gbs.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - A964657B11C662CA00640FAC /* PBXTargetDependency */ = { + A954ABCA13EE9D0F0094E3FE /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 8DC2EF4F0486A6940098B216 /* ObjCSword */; - targetProxy = A964657A11C662CA00640FAC /* PBXContainerItemProxy */; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A954ABC913EE9D0F0094E3FE /* PBXContainerItemProxy */; + }; + A9A7EEAE14D5D4BB00B76B6A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9A7EEAD14D5D4BB00B76B6A /* PBXContainerItemProxy */; + }; + A9A7EEC114D5D66400B76B6A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9A7EEC014D5D66400B76B6A /* PBXContainerItemProxy */; }; A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 8DC2EF4F0486A6940098B216 /* ObjCSword */; targetProxy = A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */; }; - A9FB29A111FD965B004C4295 /* PBXTargetDependency */ = { + A9BFB0BB13EDF5B600032679 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A9FB25DF11FD939E004C4295 /* Sword_iOS */; - targetProxy = A9FB29A011FD965B004C4295 /* PBXContainerItemProxy */; + target = 8DC2EF4F0486A6940098B216 /* ObjCSword */; + targetProxy = A9BFB0BA13EDF5B600032679 /* PBXContainerItemProxy */; }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 089C1666FE841158C02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 089C1667FE841158C02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; + A9D2714514D717D800DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D2714614D717D800DA8926 /* PBXContainerItemProxy */; + }; + A9D2715214D717FD00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D2715314D717FD00DA8926 /* PBXContainerItemProxy */; + }; + A9D2715F14D7181200DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D2716014D7181200DA8926 /* PBXContainerItemProxy */; + }; + A9D2716C14D7182300DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D2716D14D7182300DA8926 /* PBXContainerItemProxy */; + }; + A9D2717914D7183B00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D2717A14D7183B00DA8926 /* PBXContainerItemProxy */; + }; + A9D2718614D7185800DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D2718714D7185800DA8926 /* PBXContainerItemProxy */; + }; + A9D2719314D7186A00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D2719414D7186A00DA8926 /* PBXContainerItemProxy */; + }; + A9D271A014D7187E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D271A114D7187E00DA8926 /* PBXContainerItemProxy */; + }; + A9D271AD14D7189300DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D271AE14D7189300DA8926 /* PBXContainerItemProxy */; + }; + A9D271BA14D718A400DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D271BB14D718A400DA8926 /* PBXContainerItemProxy */; + }; + A9D271C714D718B800DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D271C814D718B800DA8926 /* PBXContainerItemProxy */; + }; + A9D271D414D718C800DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D271D514D718C800DA8926 /* PBXContainerItemProxy */; + }; + A9D271E114D718DF00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D271E214D718DF00DA8926 /* PBXContainerItemProxy */; + }; + A9D271EE14D718F500DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D271EF14D718F500DA8926 /* PBXContainerItemProxy */; + }; + A9D271FF14D7193A00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A954ABC213EE9AB00094E3FE /* sword */; + targetProxy = A9D271FE14D7193A00DA8926 /* PBXContainerItemProxy */; + }; + A9D2720114D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D2714414D717D800DA8926 /* imp2gbs */; + targetProxy = A9D2720014D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2720314D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D2715114D717FD00DA8926 /* imp2ld */; + targetProxy = A9D2720214D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2720514D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D2715E14D7181200DA8926 /* imp2vs */; + targetProxy = A9D2720414D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2720714D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D2716B14D7182300DA8926 /* installmgr */; + targetProxy = A9D2720614D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2720914D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D2717814D7183B00DA8926 /* mod2imp */; + targetProxy = A9D2720814D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2720B14D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A975EED811C792B9007C1532 /* mod2osis */; + targetProxy = A9D2720A14D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2720D14D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D2718514D7185800DA8926 /* mod2vpl */; + targetProxy = A9D2720C14D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2720F14D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D2719214D7186A00DA8926 /* mod2zmod */; + targetProxy = A9D2720E14D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2721114D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9A7EEB314D5D61700B76B6A /* osis2mod */; + targetProxy = A9D2721014D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2721314D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D2719F14D7187E00DA8926 /* step2vpl */; + targetProxy = A9D2721214D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2721514D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D271AC14D7189300DA8926 /* stepdump */; + targetProxy = A9D2721414D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2721714D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D271B914D718A400DA8926 /* tei2mod */; + targetProxy = A9D2721614D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2721914D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D271C614D718B800DA8926 /* vpl2mod */; + targetProxy = A9D2721814D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2721B14D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D271D314D718C800DA8926 /* vs2osisref */; + targetProxy = A9D2721A14D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2721D14D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D271E014D718DF00DA8926 /* vs2osisreftxt */; + targetProxy = A9D2721C14D7194E00DA8926 /* PBXContainerItemProxy */; + }; + A9D2721F14D7194E00DA8926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A9D271ED14D718F500DA8926 /* xml2gbs */; + targetProxy = A9D2721E14D7194E00DA8926 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 089C1666FE841158C02AAC07 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 089C1667FE841158C02AAC07 /* English */, + ); + name = InfoPlist.strings; + sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -2995,7 +3463,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3005,25 +3474,19 @@ ); FRAMEWORK_VERSION = A; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; - GCC_ENABLE_SYMBOL_SEPARATION = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ObjCSword_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; HEADER_SEARCH_PATHS = "../../include/**"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@rpath"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/build_sword/build/result_inst/lib\"", - "\"$(SRCROOT)/build_clucene/build/result_inst/lib\"", - ); - MACOSX_DEPLOYMENT_TARGET = 10.5; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-DDEBUG"; OTHER_LDFLAGS = ( @@ -3032,7 +3495,8 @@ "-licucore", ); PRODUCT_NAME = ObjCSword; - SDKROOT = macosx10.5; + SDKROOT = macosx; + VALID_ARCHS = x86_64; WARNING_CFLAGS = "-Wall"; WRAPPER_EXTENSION = framework; }; @@ -3042,7 +3506,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3055,19 +3520,16 @@ GCC_ENABLE_OBJC_GC = required; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ObjCSword_Prefix.pch; + GCC_VERSION = ""; HEADER_SEARCH_PATHS = "../../include/**"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@rpath"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/build_sword/build/result_inst/lib\"", - "\"$(SRCROOT)/build_clucene/build/result_inst/lib\"", - ); - MACOSX_DEPLOYMENT_TARGET = 10.5; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_CFLAGS = "-DRELEASE"; OTHER_LDFLAGS = ( "-lcurl", @@ -3075,7 +3537,8 @@ "-licucore", ); PRODUCT_NAME = ObjCSword; - SDKROOT = macosx10.5; + SDKROOT = macosx; + VALID_ARCHS = x86_64; WARNING_CFLAGS = "-Wall"; WRAPPER_EXTENSION = framework; }; @@ -3087,11 +3550,11 @@ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; }; name = Debug; }; @@ -3100,307 +3563,1282 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; }; name = Release; }; - A9013D3C11E316C700E1CCCA /* Debug */ = { + A954ABC513EE9AB00094E3FE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = ( + EXECUTABLE_PREFIX = lib; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", "$(inherited)", - "\\\"$(DEVELOPER_FRAMEWORKS_DIR)\\\"", ); - FRAMEWORK_VERSION = A; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_ENABLE_SYMBOL_SEPARATION = YES; - GCC_MODEL_TUNING = G5; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../include/**", + "$(SRCROOT)/dependencies/clucene/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = "@rpath"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-DUSELUCENE", + "-D_ICU_", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include/**/** $(SRCROOT)/dependencies/clucene/** $(SRCROOT)/dependencies/icu/include/**"; + VALID_ARCHS = x86_64; + }; + name = Debug; + }; + A954ABC613EE9AB00094E3FE /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + EXECUTABLE_PREFIX = lib; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ObjCSword_Prefix.pch; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - HEADER_SEARCH_PATHS = "../../include/**"; - INFOPLIST_FILE = "Info copy.plist"; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../include/**", + "$(SRCROOT)/dependencies/clucene/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); INSTALL_PATH = "@rpath"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/build/Release\"", + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DNS_BLOCK_ASSERTIONS=1", + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-DUSELUCENE", + "-D_ICU_", ); - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = NO; - OTHER_CFLAGS = "-DDEBUG"; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = ObjCSword_iOS; - SDKROOT = macosx10.5; - WARNING_CFLAGS = "-Wall"; - WRAPPER_EXTENSION = framework; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include/**/** $(SRCROOT)/dependencies/clucene/** $(SRCROOT)/dependencies/icu/include/**"; + VALID_ARCHS = x86_64; + }; + name = Release; + }; + A975EEDE11C792BA007C1532 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = mod2osis; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; }; name = Debug; }; - A9013D3D11E316C700E1CCCA /* Release */ = { + A975EEDF11C792BA007C1532 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = ( + GCC_MODEL_TUNING = G5; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = mod2osis; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + ZERO_LINK = NO; + }; + name = Release; + }; + A9A7EEBC14D5D61700B76B6A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", "$(inherited)", - "\\\"$(DEVELOPER_FRAMEWORKS_DIR)\\\"", ); - FRAMEWORK_VERSION = A; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + A9A7EEBD14D5D61700B76B6A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + A9BDFA691207F9870067ED5B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ObjCSword_Prefix.pch; - HEADER_SEARCH_PATHS = "../../include/**"; - INFOPLIST_FILE = "Info copy.plist"; - INSTALL_PATH = "@rpath"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/build/Release\"", + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; + INFOPLIST_FILE = "test/Tests-Info.plist"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ( + "-framework", + Cocoa, + "-framework", + SenTestingKit, + ); + PRODUCT_NAME = Tests; + SDKROOT = macosx; + VALID_ARCHS = x86_64; + WRAPPER_EXTENSION = octest; + }; + name = Debug; + }; + A9BDFA6A1207F9870067ED5B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_ENABLE_OBJC_GC = required; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; + INFOPLIST_FILE = "test/Tests-Info.plist"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = ( + "-framework", + Cocoa, + "-framework", + SenTestingKit, + ); + PRODUCT_NAME = Tests; + SDKROOT = macosx; + VALID_ARCHS = x86_64; + WRAPPER_EXTENSION = octest; + ZERO_LINK = NO; + }; + name = Release; + }; + A9BFB0B813EDF51100032679 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_ENABLE_OBJC_GC = required; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + INFOPLIST_FILE = "test/Tests-Info.plist"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + VALID_ARCHS = x86_64; + WRAPPER_EXTENSION = octest; + }; + name = Debug; + }; + A9BFB0B913EDF51100032679 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_ENABLE_OBJC_GC = required; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + INFOPLIST_FILE = "test/Tests-Info.plist"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + VALID_ARCHS = x86_64; + WRAPPER_EXTENSION = octest; + }; + name = Release; + }; + A9D2714C14D717D800DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = imp2gbs; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + }; + name = Debug; + }; + A9D2714D14D717D800DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_MODEL_TUNING = G5; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = imp2gbs; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + ZERO_LINK = NO; + }; + name = Release; + }; + A9D2715914D717FD00DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = imp2ld; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + }; + name = Debug; + }; + A9D2715A14D717FD00DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_MODEL_TUNING = G5; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = imp2ld; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + ZERO_LINK = NO; + }; + name = Release; + }; + A9D2716614D7181200DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = imp2vs; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + }; + name = Debug; + }; + A9D2716714D7181200DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_MODEL_TUNING = G5; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = imp2vs; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + ZERO_LINK = NO; + }; + name = Release; + }; + A9D2717314D7182300DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = installmgr; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + }; + name = Debug; + }; + A9D2717414D7182300DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_MODEL_TUNING = G5; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = installmgr; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + ZERO_LINK = NO; + }; + name = Release; + }; + A9D2718014D7183B00DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = mod2imp; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + }; + name = Debug; + }; + A9D2718114D7183B00DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_MODEL_TUNING = G5; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = mod2imp; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + ZERO_LINK = NO; + }; + name = Release; + }; + A9D2718D14D7185800DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = mod2vpl; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + }; + name = Debug; + }; + A9D2718E14D7185800DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_MODEL_TUNING = G5; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = mod2vpl; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + ZERO_LINK = NO; + }; + name = Release; + }; + A9D2719A14D7186A00DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = mod2zmod; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + }; + name = Debug; + }; + A9D2719B14D7186A00DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_MODEL_TUNING = G5; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = mod2zmod; + SDKROOT = macosx; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + ZERO_LINK = NO; + }; + name = Release; + }; + A9D271A714D7187E00DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = step2vpl; + }; + name = Debug; + }; + A9D271A814D7187E00DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = step2vpl; + }; + name = Release; + }; + A9D271B414D7189300DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = stepdump; + }; + name = Debug; + }; + A9D271B514D7189300DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = stepdump; + }; + name = Release; + }; + A9D271C114D718A400DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = tei2mod; + }; + name = Debug; + }; + A9D271C214D718A400DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = tei2mod; + }; + name = Release; + }; + A9D271CE14D718B800DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", ); - MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_CFLAGS = "-DRELEASE"; - PRODUCT_NAME = ObjCSword_iOS; - SDKROOT = macosx10.5; - WRAPPER_EXTENSION = framework; - }; - name = Release; - }; - A975EEDE11C792BA007C1532 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - HEADER_SEARCH_PATHS = "../../include/**"; - INSTALL_PATH = /usr/local/bin; - LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - PREBINDING = NO; - PRODUCT_NAME = mod2osis; - SDKROOT = macosx10.5; - STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + PRODUCT_NAME = vpl2mod; }; name = Debug; }; - A975EEDF11C792BA007C1532 /* Release */ = { + A9D271CF14D718B800DA8926 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - HEADER_SEARCH_PATHS = "../../include/**"; - INSTALL_PATH = /usr/local/bin; - LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - PREBINDING = NO; - PRODUCT_NAME = mod2osis; - SDKROOT = macosx10.5; - STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; - ZERO_LINK = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = vpl2mod; }; name = Release; }; - A9BDFA691207F9870067ED5B /* Debug */ = { + A9D271DB14D718C800DA8926 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "Tests-Info copy.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - ONLY_ACTIVE_ARCH = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, + "-lcurl", + "-lz", + "-licucore", ); - PREBINDING = NO; - PRODUCT_NAME = Tests; - SDKROOT = macosx10.5; - WRAPPER_EXTENSION = octest; + PRODUCT_NAME = vs2osisref; }; name = Debug; }; - A9BDFA6A1207F9870067ED5B /* Release */ = { + A9D271DC14D718C800DA8926 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "Tests-Info copy.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, + "-lcurl", + "-lz", + "-licucore", ); - PREBINDING = NO; - PRODUCT_NAME = Tests; - SDKROOT = macosx10.5; - WRAPPER_EXTENSION = octest; - ZERO_LINK = NO; + PRODUCT_NAME = vs2osisref; }; name = Release; }; - A9C2819811C43C4900803CB5 /* Debug */ = { + A9D271E814D718DF00DA8926 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - ONLY_ACTIVE_ARCH = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, + "-lcurl", + "-lz", + "-licucore", ); - PREBINDING = NO; - PRODUCT_NAME = Tests; - SDKROOT = macosx10.5; - WRAPPER_EXTENSION = octest; + PRODUCT_NAME = vs2osisreftxt; }; name = Debug; }; - A9C2819911C43C4900803CB5 /* Release */ = { + A9D271E914D718DF00DA8926 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_ENABLE_OBJC_GC = required; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; + GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "../../include/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", + ); OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, + "-lcurl", + "-lz", + "-licucore", ); - PREBINDING = NO; - PRODUCT_NAME = Tests; - SDKROOT = macosx10.5; - WRAPPER_EXTENSION = octest; - ZERO_LINK = NO; + PRODUCT_NAME = vs2osisreftxt; }; name = Release; }; - A9FB25E111FD939F004C4295 /* Debug */ = { + A9D271F514D718F500DA8926 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COPY_PHASE_STRIP = NO; - EXECUTABLE_PREFIX = lib; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "dependencies/icu/include/**", - "dependencies/clucene/**", "../../include/**", - "../../include/internal/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", ); - INSTALL_PATH = "@rpath"; OTHER_LDFLAGS = ( - "-licucore", "-lcurl", "-lz", + "-licucore", ); - PREBINDING = NO; - PRODUCT_NAME = Sword; - SDKROOT = macosx10.5; + PRODUCT_NAME = xml2gbs; }; name = Debug; }; - A9FB25E211FD939F004C4295 /* Release */ = { + A9D271F614D718F500DA8926 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - EXECUTABLE_PREFIX = lib; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; HEADER_SEARCH_PATHS = ( - "dependencies/icu/include/**", - "dependencies/clucene/**", "../../include/**", - "../../include/internal/**", + "$(SRCROOT)/dependencies/icu/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = ( + "-DCURLAVAILABLE", + "-Dunix", + "-D__unix__", + "-D_ICU_", ); - INSTALL_PATH = "@rpath"; OTHER_LDFLAGS = ( - "-licucore", "-lcurl", "-lz", + "-licucore", ); - PREBINDING = NO; - PRODUCT_NAME = Sword; - SDKROOT = macosx10.5; - ZERO_LINK = NO; + PRODUCT_NAME = xml2gbs; + }; + name = Release; + }; + A9D271FC14D7193300DA8926 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + A9D271FD14D7193300DA8926 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; @@ -3425,11 +4863,11 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A9013D3B11E316C700E1CCCA /* Build configuration list for PBXNativeTarget "ObjCSword_iOS" */ = { + A954ABC413EE9AB00094E3FE /* Build configuration list for PBXNativeTarget "sword" */ = { isa = XCConfigurationList; buildConfigurations = ( - A9013D3C11E316C700E1CCCA /* Debug */, - A9013D3D11E316C700E1CCCA /* Release */, + A954ABC513EE9AB00094E3FE /* Debug */, + A954ABC613EE9AB00094E3FE /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3443,6 +4881,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + A9A7EEBB14D5D61700B76B6A /* Build configuration list for PBXNativeTarget "osis2mod" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9A7EEBC14D5D61700B76B6A /* Debug */, + A9A7EEBD14D5D61700B76B6A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -3452,20 +4899,146 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A9C2819A11C43C4900803CB5 /* Build configuration list for PBXNativeTarget "Tests" */ = { + A9BFB0B713EDF51100032679 /* Build configuration list for PBXNativeTarget "Tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9BFB0B813EDF51100032679 /* Debug */, + A9BFB0B913EDF51100032679 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D2714B14D717D800DA8926 /* Build configuration list for PBXNativeTarget "imp2gbs" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D2714C14D717D800DA8926 /* Debug */, + A9D2714D14D717D800DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D2715814D717FD00DA8926 /* Build configuration list for PBXNativeTarget "imp2ld" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D2715914D717FD00DA8926 /* Debug */, + A9D2715A14D717FD00DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D2716514D7181200DA8926 /* Build configuration list for PBXNativeTarget "imp2vs" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D2716614D7181200DA8926 /* Debug */, + A9D2716714D7181200DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D2717214D7182300DA8926 /* Build configuration list for PBXNativeTarget "installmgr" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D2717314D7182300DA8926 /* Debug */, + A9D2717414D7182300DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D2717F14D7183B00DA8926 /* Build configuration list for PBXNativeTarget "mod2imp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D2718014D7183B00DA8926 /* Debug */, + A9D2718114D7183B00DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D2718C14D7185800DA8926 /* Build configuration list for PBXNativeTarget "mod2vpl" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D2718D14D7185800DA8926 /* Debug */, + A9D2718E14D7185800DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D2719914D7186A00DA8926 /* Build configuration list for PBXNativeTarget "mod2zmod" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D2719A14D7186A00DA8926 /* Debug */, + A9D2719B14D7186A00DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D271A614D7187E00DA8926 /* Build configuration list for PBXNativeTarget "step2vpl" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D271A714D7187E00DA8926 /* Debug */, + A9D271A814D7187E00DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D271B314D7189300DA8926 /* Build configuration list for PBXNativeTarget "stepdump" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D271B414D7189300DA8926 /* Debug */, + A9D271B514D7189300DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D271C014D718A400DA8926 /* Build configuration list for PBXNativeTarget "tei2mod" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D271C114D718A400DA8926 /* Debug */, + A9D271C214D718A400DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D271CD14D718B800DA8926 /* Build configuration list for PBXNativeTarget "vpl2mod" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D271CE14D718B800DA8926 /* Debug */, + A9D271CF14D718B800DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D271DA14D718C800DA8926 /* Build configuration list for PBXNativeTarget "vs2osisref" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D271DB14D718C800DA8926 /* Debug */, + A9D271DC14D718C800DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D271E714D718DF00DA8926 /* Build configuration list for PBXNativeTarget "vs2osisreftxt" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9D271E814D718DF00DA8926 /* Debug */, + A9D271E914D718DF00DA8926 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9D271F414D718F500DA8926 /* Build configuration list for PBXNativeTarget "xml2gbs" */ = { isa = XCConfigurationList; buildConfigurations = ( - A9C2819811C43C4900803CB5 /* Debug */, - A9C2819911C43C4900803CB5 /* Release */, + A9D271F514D718F500DA8926 /* Debug */, + A9D271F614D718F500DA8926 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A9FB25E411FD93B2004C4295 /* Build configuration list for PBXNativeTarget "Sword_iOS" */ = { + A9D271FB14D7193300DA8926 /* Build configuration list for PBXAggregateTarget "Utilities" */ = { isa = XCConfigurationList; buildConfigurations = ( - A9FB25E111FD939F004C4295 /* Debug */, - A9FB25E211FD939F004C4295 /* Release */, + A9D271FC14D7193300DA8926 /* Debug */, + A9D271FD14D7193300DA8926 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/bindings/objc/ObjCSword_Prefix.pch b/bindings/objc/ObjCSword_Prefix.pch index 3c94017..0eec7f5 100644 --- a/bindings/objc/ObjCSword_Prefix.pch +++ b/bindings/objc/ObjCSword_Prefix.pch @@ -3,7 +3,7 @@ // #ifdef __OBJC__ - #import + #import #endif #ifdef DEBUG diff --git a/bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj b/bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj new file mode 100644 index 0000000..ecd4c13 --- /dev/null +++ b/bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj @@ -0,0 +1,1060 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 45; + objects = { + +/* Begin PBXBuildFile section */ + 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; + 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; }; + A918B8E411C6697400024D84 /* SwordModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A918B8E211C6697400024D84 /* SwordModuleTest.h */; }; + A918B8E511C6697400024D84 /* SwordModuleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A918B8E311C6697400024D84 /* SwordModuleTest.m */; }; + A94EAC0B117B28920018B06F /* SwordBible.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE3117B28910018B06F /* SwordBible.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE4117B28910018B06F /* SwordBible.mm */; }; + A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE5117B28920018B06F /* SwordBibleBook.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC0E117B28920018B06F /* SwordBibleBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE6117B28920018B06F /* SwordBibleBook.mm */; }; + A94EAC0F117B28920018B06F /* SwordBibleChapter.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE7117B28920018B06F /* SwordBibleChapter.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE8117B28920018B06F /* SwordBibleChapter.m */; }; + A94EAC11117B28920018B06F /* SwordBibleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC12117B28920018B06F /* SwordBibleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */; }; + A94EAC13117B28920018B06F /* SwordBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEB117B28920018B06F /* SwordBook.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC14117B28920018B06F /* SwordBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEC117B28920018B06F /* SwordBook.mm */; }; + A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABED117B28920018B06F /* SwordCommentary.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC16117B28920018B06F /* SwordCommentary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEE117B28920018B06F /* SwordCommentary.mm */; }; + A94EAC17117B28920018B06F /* SwordDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEF117B28920018B06F /* SwordDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF0117B28920018B06F /* SwordDictionary.mm */; }; + A94EAC19117B28920018B06F /* SwordInstallSource.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF1117B28920018B06F /* SwordInstallSource.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF2117B28920018B06F /* SwordInstallSource.mm */; }; + A94EAC1B117B28920018B06F /* SwordInstallSourceController.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF3117B28920018B06F /* SwordInstallSourceController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC1C117B28920018B06F /* SwordInstallSourceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */; }; + A94EAC1D117B28920018B06F /* SwordKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF5117B28920018B06F /* SwordKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC1E117B28920018B06F /* SwordKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF6117B28920018B06F /* SwordKey.mm */; }; + A94EAC1F117B28920018B06F /* SwordListKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF7117B28920018B06F /* SwordListKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC20117B28920018B06F /* SwordListKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF8117B28920018B06F /* SwordListKey.mm */; }; + A94EAC21117B28920018B06F /* SwordManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF9117B28920018B06F /* SwordManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC22117B28920018B06F /* SwordManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFA117B28920018B06F /* SwordManager.mm */; }; + A94EAC25117B28920018B06F /* SwordModule.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFD117B28920018B06F /* SwordModule.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC26117B28920018B06F /* SwordModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFE117B28920018B06F /* SwordModule.mm */; }; + A94EAC27117B28920018B06F /* SwordModuleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC28117B28920018B06F /* SwordModuleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */; }; + A94EAC29117B28920018B06F /* SwordModuleTreeEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC2A117B28920018B06F /* SwordModuleTreeEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */; }; + A94EAC2D117B28920018B06F /* SwordVerseKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC05117B28920018B06F /* SwordVerseKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC2E117B28920018B06F /* SwordVerseKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC06117B28920018B06F /* SwordVerseKey.mm */; }; + A94EAC2F117B28920018B06F /* SwordVerseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC07117B28920018B06F /* SwordVerseManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC30117B28920018B06F /* SwordVerseManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC08117B28920018B06F /* SwordVerseManager.mm */; }; + A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC09117B28920018B06F /* VerseEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A94EAC32117B28920018B06F /* VerseEnumerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC0A117B28920018B06F /* VerseEnumerator.mm */; }; + A956316611FD8C5B007DC7AD /* libsword-ub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A956316411FD8C55007DC7AD /* libsword-ub.a */; }; + A956316711FD8C5E007DC7AD /* libsword-ub.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = A956316411FD8C55007DC7AD /* libsword-ub.a */; }; + A956324411FD90CE007DC7AD /* libclucene-ub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A956324211FD90C9007DC7AD /* libclucene-ub.a */; }; + A956324511FD90D2007DC7AD /* libclucene-ub.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = A956324211FD90C9007DC7AD /* libclucene-ub.a */; }; + A964657C11C662CF00640FAC /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; }; + A964658F11C6654300640FAC /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */; }; + A96465A511C6657900640FAC /* SwordManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A964658111C663E200640FAC /* SwordManagerTest.m */; }; + A96465AD11C6658200640FAC /* SwordManagerTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A964658011C663E200640FAC /* SwordManagerTest.h */; }; + A975EAC511C77862007C1532 /* ObjCSword.h in Headers */ = {isa = PBXBuildFile; fileRef = A975EAC411C77862007C1532 /* ObjCSword.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A975EEE511C79308007C1532 /* mod2osis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAC11C7925C007C1532 /* mod2osis.cpp */; }; + A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A2C17C118D9D3D0002873D /* Notifications.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */; }; + A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; }; + A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A964658011C663E200640FAC /* SwordManagerTest.h */; }; + A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A918B8E211C6697400024D84 /* SwordModuleTest.h */; }; + A9BDFA781207F9F00067ED5B /* SwordListKeyTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */; }; + A9BDFA791207F9F00067ED5B /* SwordListKeyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */; }; + A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */; }; + A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */; }; + A9C2856F11C446B700803CB5 /* Configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2856D11C446B700803CB5 /* Configuration.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2857111C4471400803CB5 /* OSXConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A9C2857411C4471400803CB5 /* OSXConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2857211C4471400803CB5 /* OSXConfiguration.m */; }; + A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2858211C44A0A00803CB5 /* Configuration.m */; }; + A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */; }; + A9D4382311C52947007AFE83 /* locales.d in Resources */ = {isa = PBXBuildFile; fileRef = A9D437CE11C52947007AFE83 /* locales.d */; }; + A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A9EF1414120595650078A27C /* SwordLocaleManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9EF1415120595650078A27C /* SwordLocaleManager.mm */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + A964657A11C662CA00640FAC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = ObjCSword; + }; + A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = ObjCSword; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + A9A5050211C75C4B00EB6EA5 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + A956324511FD90D2007DC7AD /* libclucene-ub.a in CopyFiles */, + A956316711FD8C5E007DC7AD /* libsword-ub.a in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; + 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; + 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 32DBCF5E0370ADEE00C91783 /* ObjCSword_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword_Prefix.pch; sourceTree = ""; }; + 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjCSword.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A9013D3F11E316C700E1CCCA /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = ""; }; + A918B8E211C6697400024D84 /* SwordModuleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTest.h; path = test/SwordModuleTest.h; sourceTree = ""; }; + A918B8E311C6697400024D84 /* SwordModuleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTest.m; path = test/SwordModuleTest.m; sourceTree = ""; }; + A94EABE3117B28910018B06F /* SwordBible.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBible.h; path = src/SwordBible.h; sourceTree = ""; }; + A94EABE4117B28910018B06F /* SwordBible.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBible.mm; path = src/SwordBible.mm; sourceTree = ""; }; + A94EABE5117B28920018B06F /* SwordBibleBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleBook.h; path = src/SwordBibleBook.h; sourceTree = ""; }; + A94EABE6117B28920018B06F /* SwordBibleBook.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBibleBook.mm; path = src/SwordBibleBook.mm; sourceTree = ""; }; + A94EABE7117B28920018B06F /* SwordBibleChapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleChapter.h; path = src/SwordBibleChapter.h; sourceTree = ""; }; + A94EABE8117B28920018B06F /* SwordBibleChapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleChapter.m; path = src/SwordBibleChapter.m; sourceTree = ""; }; + A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleTextEntry.h; path = src/SwordBibleTextEntry.h; sourceTree = ""; }; + A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleTextEntry.m; path = src/SwordBibleTextEntry.m; sourceTree = ""; }; + A94EABEB117B28920018B06F /* SwordBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBook.h; path = src/SwordBook.h; sourceTree = ""; }; + A94EABEC117B28920018B06F /* SwordBook.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBook.mm; path = src/SwordBook.mm; sourceTree = ""; }; + A94EABED117B28920018B06F /* SwordCommentary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordCommentary.h; path = src/SwordCommentary.h; sourceTree = ""; }; + A94EABEE117B28920018B06F /* SwordCommentary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordCommentary.mm; path = src/SwordCommentary.mm; sourceTree = ""; }; + A94EABEF117B28920018B06F /* SwordDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordDictionary.h; path = src/SwordDictionary.h; sourceTree = ""; }; + A94EABF0117B28920018B06F /* SwordDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordDictionary.mm; path = src/SwordDictionary.mm; sourceTree = ""; }; + A94EABF1117B28920018B06F /* SwordInstallSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSource.h; path = src/SwordInstallSource.h; sourceTree = ""; }; + A94EABF2117B28920018B06F /* SwordInstallSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSource.mm; path = src/SwordInstallSource.mm; sourceTree = ""; }; + A94EABF3117B28920018B06F /* SwordInstallSourceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSourceController.h; path = src/SwordInstallSourceController.h; sourceTree = ""; }; + A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSourceController.mm; path = src/SwordInstallSourceController.mm; sourceTree = ""; }; + A94EABF5117B28920018B06F /* SwordKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordKey.h; path = src/SwordKey.h; sourceTree = ""; }; + A94EABF6117B28920018B06F /* SwordKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordKey.mm; path = src/SwordKey.mm; sourceTree = ""; }; + A94EABF7117B28920018B06F /* SwordListKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKey.h; path = src/SwordListKey.h; sourceTree = ""; }; + A94EABF8117B28920018B06F /* SwordListKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordListKey.mm; path = src/SwordListKey.mm; sourceTree = ""; }; + A94EABF9117B28920018B06F /* SwordManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManager.h; path = src/SwordManager.h; sourceTree = ""; }; + A94EABFA117B28920018B06F /* SwordManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordManager.mm; path = src/SwordManager.mm; sourceTree = ""; }; + A94EABFD117B28920018B06F /* SwordModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModule.h; path = src/SwordModule.h; sourceTree = ""; }; + A94EABFE117B28920018B06F /* SwordModule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModule.mm; path = src/SwordModule.mm; sourceTree = ""; }; + A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTextEntry.h; path = src/SwordModuleTextEntry.h; sourceTree = ""; }; + A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTextEntry.m; path = src/SwordModuleTextEntry.m; sourceTree = ""; }; + A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTreeEntry.h; path = src/SwordModuleTreeEntry.h; sourceTree = ""; }; + A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTreeEntry.m; path = src/SwordModuleTreeEntry.m; sourceTree = ""; }; + A94EAC05117B28920018B06F /* SwordVerseKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseKey.h; path = src/SwordVerseKey.h; sourceTree = ""; }; + A94EAC06117B28920018B06F /* SwordVerseKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseKey.mm; path = src/SwordVerseKey.mm; sourceTree = ""; }; + A94EAC07117B28920018B06F /* SwordVerseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseManager.h; path = src/SwordVerseManager.h; sourceTree = ""; }; + A94EAC08117B28920018B06F /* SwordVerseManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseManager.mm; path = src/SwordVerseManager.mm; sourceTree = ""; }; + A94EAC09117B28920018B06F /* VerseEnumerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VerseEnumerator.h; path = src/VerseEnumerator.h; sourceTree = ""; }; + A94EAC0A117B28920018B06F /* VerseEnumerator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VerseEnumerator.mm; path = src/VerseEnumerator.mm; sourceTree = ""; }; + A956316411FD8C55007DC7AD /* libsword-ub.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsword-ub.a"; path = "build_sword/build/result_inst/lib/libsword-ub.a"; sourceTree = ""; }; + A956324211FD90C9007DC7AD /* libclucene-ub.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libclucene-ub.a"; path = "build_clucene/build/result_inst/lib/libclucene-ub.a"; sourceTree = ""; }; + A964658011C663E200640FAC /* SwordManagerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManagerTest.h; path = test/SwordManagerTest.h; sourceTree = ""; }; + A964658111C663E200640FAC /* SwordManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordManagerTest.m; path = test/SwordManagerTest.m; sourceTree = ""; }; + A975EAC411C77862007C1532 /* ObjCSword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword.h; sourceTree = ""; }; + A975ED9811C7925C007C1532 /* imp2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2gbs.cpp; sourceTree = ""; }; + A975ED9911C7925C007C1532 /* imp2ld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2ld.cpp; sourceTree = ""; }; + A975ED9A11C7925C007C1532 /* imp2vs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2vs.cpp; sourceTree = ""; }; + A975ED9B11C7925C007C1532 /* installmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = installmgr.cpp; sourceTree = ""; }; + A975EDAB11C7925C007C1532 /* mod2imp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2imp.cpp; sourceTree = ""; }; + A975EDAC11C7925C007C1532 /* mod2osis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2osis.cpp; sourceTree = ""; }; + A975EDAD11C7925C007C1532 /* mod2vpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2vpl.cpp; sourceTree = ""; }; + A975EDAE11C7925C007C1532 /* mod2zmod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2zmod.cpp; sourceTree = ""; }; + A975EDB111C7925C007C1532 /* osis2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osis2mod.cpp; sourceTree = ""; }; + A975EDB811C7925C007C1532 /* step2vpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = step2vpl.cpp; sourceTree = ""; }; + A975EDB911C7925C007C1532 /* stepdump.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stepdump.cpp; sourceTree = ""; }; + A975EDBB11C7925C007C1532 /* tei2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tei2mod.cpp; sourceTree = ""; }; + A975EDD811C7925C007C1532 /* vpl2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vpl2mod.cpp; sourceTree = ""; }; + A975EDD911C7925C007C1532 /* vs2osisref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vs2osisref.cpp; sourceTree = ""; }; + A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vs2osisreftxt.cpp; sourceTree = ""; }; + A975EDDB11C7925C007C1532 /* xml2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml2gbs.cpp; sourceTree = ""; }; + A975EED911C792B9007C1532 /* mod2osis */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2osis; sourceTree = BUILT_PRODUCTS_DIR; }; + A9921A1911FD9CA8002DAA72 /* libSword.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSword.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + A9A2C17C118D9D3D0002873D /* Notifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Notifications.h; path = src/Notifications.h; sourceTree = ""; }; + A9BDFA6B1207F9870067ED5B /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; + A9BDFA6E1207F9870067ED5B /* Tests-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info copy.plist"; sourceTree = ""; }; + A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKeyTest.h; path = test/SwordListKeyTest.h; sourceTree = ""; }; + A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordListKeyTest.m; path = test/SwordListKeyTest.m; sourceTree = ""; }; + A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleLongRunTest.h; path = test/SwordModuleLongRunTest.h; sourceTree = ""; }; + A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModuleLongRunTest.mm; path = test/SwordModuleLongRunTest.mm; sourceTree = ""; }; + A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; + A9C2819611C43C4900803CB5 /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; + A9C2819711C43C4900803CB5 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; + A9C2856D11C446B700803CB5 /* Configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Configuration.h; path = src/services/Configuration.h; sourceTree = ""; }; + A9C2857111C4471400803CB5 /* OSXConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OSXConfiguration.h; path = src/services/OSXConfiguration.h; sourceTree = ""; }; + A9C2857211C4471400803CB5 /* OSXConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OSXConfiguration.m; path = src/services/OSXConfiguration.m; sourceTree = ""; }; + A9C2858211C44A0A00803CB5 /* Configuration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Configuration.m; path = src/services/Configuration.m; sourceTree = ""; }; + A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SwordModule+Index.h"; path = "src/SwordModule+Index.h"; sourceTree = ""; }; + A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "SwordModule+Index.mm"; path = "src/SwordModule+Index.mm"; sourceTree = ""; }; + A9D437CE11C52947007AFE83 /* locales.d */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locales.d; path = ../../locales.d; sourceTree = SOURCE_ROOT; }; + A9EF1414120595650078A27C /* SwordLocaleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordLocaleManager.h; path = src/SwordLocaleManager.h; sourceTree = ""; }; + A9EF1415120595650078A27C /* SwordLocaleManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordLocaleManager.mm; path = src/SwordLocaleManager.mm; sourceTree = ""; }; + D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8DC2EF560486A6940098B216 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A956324411FD90CE007DC7AD /* libclucene-ub.a in Frameworks */, + A956316611FD8C5B007DC7AD /* libsword-ub.a in Frameworks */, + 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A975EED711C792B9007C1532 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9BDFA611207F9870067ED5B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */, + A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9C2819311C43C4900803CB5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A964658F11C6654300640FAC /* SenTestingKit.framework in Frameworks */, + A964657C11C662CF00640FAC /* ObjCSword.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 034768DFFF38A50411DB9C8B /* Products */ = { + isa = PBXGroup; + children = ( + 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */, + A9C2819611C43C4900803CB5 /* Tests.octest */, + A975EED911C792B9007C1532 /* mod2osis */, + A9921A1911FD9CA8002DAA72 /* libSword.dylib */, + A9BDFA6B1207F9870067ED5B /* Tests.octest */, + ); + name = Products; + sourceTree = ""; + }; + 0867D691FE84028FC02AAC07 /* ObjCSword */ = { + isa = PBXGroup; + children = ( + A975ECD211C7925B007C1532 /* Utilities */, + A9C2857911C4486400803CB5 /* Tests */, + A94EAE72117B32AF0018B06F /* Services */, + 08FB77AEFE84172EC02AAC07 /* SwordWrapper */, + 32C88DFF0371C24200C91783 /* Other Sources */, + 089C1665FE841158C02AAC07 /* Resources */, + 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, + 034768DFFF38A50411DB9C8B /* Products */, + A9C2819711C43C4900803CB5 /* Tests-Info.plist */, + A9BDFA6E1207F9870067ED5B /* Tests-Info copy.plist */, + ); + name = ObjCSword; + sourceTree = ""; + }; + 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = { + isa = PBXGroup; + children = ( + 1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */, + 1058C7B2FEA5585E11CA2CBB /* Other Frameworks */, + ); + name = "External Frameworks and Libraries"; + sourceTree = ""; + }; + 089C1665FE841158C02AAC07 /* Resources */ = { + isa = PBXGroup; + children = ( + A9D437CE11C52947007AFE83 /* locales.d */, + 8DC2EF5A0486A6940098B216 /* Info.plist */, + 089C1666FE841158C02AAC07 /* InfoPlist.strings */, + A9013D3F11E316C700E1CCCA /* Info copy.plist */, + ); + name = Resources; + sourceTree = ""; + }; + 08FB77AEFE84172EC02AAC07 /* SwordWrapper */ = { + isa = PBXGroup; + children = ( + A9EF1414120595650078A27C /* SwordLocaleManager.h */, + A9EF1415120595650078A27C /* SwordLocaleManager.mm */, + A94EABF9117B28920018B06F /* SwordManager.h */, + A94EABFA117B28920018B06F /* SwordManager.mm */, + A94EAC07117B28920018B06F /* SwordVerseManager.h */, + A94EAC08117B28920018B06F /* SwordVerseManager.mm */, + A94EABFD117B28920018B06F /* SwordModule.h */, + A94EABFE117B28920018B06F /* SwordModule.mm */, + A94EABE3117B28910018B06F /* SwordBible.h */, + A94EABE4117B28910018B06F /* SwordBible.mm */, + A94EABEB117B28920018B06F /* SwordBook.h */, + A94EABEC117B28920018B06F /* SwordBook.mm */, + A94EABED117B28920018B06F /* SwordCommentary.h */, + A94EABEE117B28920018B06F /* SwordCommentary.mm */, + A94EABEF117B28920018B06F /* SwordDictionary.h */, + A94EABF0117B28920018B06F /* SwordDictionary.mm */, + A94EABE5117B28920018B06F /* SwordBibleBook.h */, + A94EABE6117B28920018B06F /* SwordBibleBook.mm */, + A94EABE7117B28920018B06F /* SwordBibleChapter.h */, + A94EABE8117B28920018B06F /* SwordBibleChapter.m */, + A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */, + A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */, + A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */, + A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */, + A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */, + A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */, + A94EABF5117B28920018B06F /* SwordKey.h */, + A94EABF6117B28920018B06F /* SwordKey.mm */, + A94EABF7117B28920018B06F /* SwordListKey.h */, + A94EABF8117B28920018B06F /* SwordListKey.mm */, + A94EABE7117B28920018B06F /* SwordBibleChapter.h */, + A94EABE8117B28920018B06F /* SwordBibleChapter.m */, + A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */, + A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */, + A94EABF5117B28920018B06F /* SwordKey.h */, + A94EABF6117B28920018B06F /* SwordKey.mm */, + A94EABF7117B28920018B06F /* SwordListKey.h */, + A94EABF8117B28920018B06F /* SwordListKey.mm */, + A94EAC05117B28920018B06F /* SwordVerseKey.h */, + A94EAC06117B28920018B06F /* SwordVerseKey.mm */, + A94EAC09117B28920018B06F /* VerseEnumerator.h */, + A94EAC0A117B28920018B06F /* VerseEnumerator.mm */, + A94EABF1117B28920018B06F /* SwordInstallSource.h */, + A94EABF2117B28920018B06F /* SwordInstallSource.mm */, + A94EABF3117B28920018B06F /* SwordInstallSourceController.h */, + A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */, + A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */, + A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */, + ); + name = SwordWrapper; + sourceTree = ""; + }; + 1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */ = { + isa = PBXGroup; + children = ( + 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */, + A956316411FD8C55007DC7AD /* libsword-ub.a */, + A956324211FD90C9007DC7AD /* libclucene-ub.a */, + ); + name = "Linked Frameworks"; + sourceTree = ""; + }; + 1058C7B2FEA5585E11CA2CBB /* Other Frameworks */ = { + isa = PBXGroup; + children = ( + 0867D6A5FE840307C02AAC07 /* AppKit.framework */, + D2F7E79907B2D74100F64583 /* CoreData.framework */, + 0867D69BFE84028FC02AAC07 /* Foundation.framework */, + A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */, + ); + name = "Other Frameworks"; + sourceTree = ""; + }; + 32C88DFF0371C24200C91783 /* Other Sources */ = { + isa = PBXGroup; + children = ( + A9A2C17C118D9D3D0002873D /* Notifications.h */, + 32DBCF5E0370ADEE00C91783 /* ObjCSword_Prefix.pch */, + A975EAC411C77862007C1532 /* ObjCSword.h */, + ); + name = "Other Sources"; + sourceTree = ""; + }; + A94EAE72117B32AF0018B06F /* Services */ = { + isa = PBXGroup; + children = ( + A9C2856D11C446B700803CB5 /* Configuration.h */, + A9C2858211C44A0A00803CB5 /* Configuration.m */, + A9C2857111C4471400803CB5 /* OSXConfiguration.h */, + A9C2857211C4471400803CB5 /* OSXConfiguration.m */, + ); + name = Services; + sourceTree = ""; + }; + A975ECD211C7925B007C1532 /* Utilities */ = { + isa = PBXGroup; + children = ( + A975ED9811C7925C007C1532 /* imp2gbs.cpp */, + A975ED9911C7925C007C1532 /* imp2ld.cpp */, + A975ED9A11C7925C007C1532 /* imp2vs.cpp */, + A975ED9B11C7925C007C1532 /* installmgr.cpp */, + A975EDAB11C7925C007C1532 /* mod2imp.cpp */, + A975EDAC11C7925C007C1532 /* mod2osis.cpp */, + A975EDAD11C7925C007C1532 /* mod2vpl.cpp */, + A975EDAE11C7925C007C1532 /* mod2zmod.cpp */, + A975EDB111C7925C007C1532 /* osis2mod.cpp */, + A975EDB811C7925C007C1532 /* step2vpl.cpp */, + A975EDB911C7925C007C1532 /* stepdump.cpp */, + A975EDBB11C7925C007C1532 /* tei2mod.cpp */, + A975EDD811C7925C007C1532 /* vpl2mod.cpp */, + A975EDD911C7925C007C1532 /* vs2osisref.cpp */, + A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */, + A975EDDB11C7925C007C1532 /* xml2gbs.cpp */, + ); + name = Utilities; + path = ../../utilities; + sourceTree = SOURCE_ROOT; + }; + A9C2857911C4486400803CB5 /* Tests */ = { + isa = PBXGroup; + children = ( + A964658011C663E200640FAC /* SwordManagerTest.h */, + A964658111C663E200640FAC /* SwordManagerTest.m */, + A918B8E211C6697400024D84 /* SwordModuleTest.h */, + A918B8E311C6697400024D84 /* SwordModuleTest.m */, + A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */, + A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */, + A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */, + A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */, + ); + name = Tests; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 8DC2EF500486A6940098B216 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + A975EAC511C77862007C1532 /* ObjCSword.h in Headers */, + A94EAC0B117B28920018B06F /* SwordBible.h in Headers */, + A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */, + A94EAC0F117B28920018B06F /* SwordBibleChapter.h in Headers */, + A94EAC11117B28920018B06F /* SwordBibleTextEntry.h in Headers */, + A94EAC13117B28920018B06F /* SwordBook.h in Headers */, + A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */, + A94EAC17117B28920018B06F /* SwordDictionary.h in Headers */, + A94EAC19117B28920018B06F /* SwordInstallSource.h in Headers */, + A94EAC1B117B28920018B06F /* SwordInstallSourceController.h in Headers */, + A94EAC1D117B28920018B06F /* SwordKey.h in Headers */, + A94EAC1F117B28920018B06F /* SwordListKey.h in Headers */, + A94EAC21117B28920018B06F /* SwordManager.h in Headers */, + A94EAC25117B28920018B06F /* SwordModule.h in Headers */, + A94EAC27117B28920018B06F /* SwordModuleTextEntry.h in Headers */, + A94EAC29117B28920018B06F /* SwordModuleTreeEntry.h in Headers */, + A94EAC2D117B28920018B06F /* SwordVerseKey.h in Headers */, + A94EAC2F117B28920018B06F /* SwordVerseManager.h in Headers */, + A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */, + A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */, + A9C2856F11C446B700803CB5 /* Configuration.h in Headers */, + A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */, + A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */, + A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9BDFA651207F9870067ED5B /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */, + A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */, + A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9C281B611C43DB800803CB5 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + A96465AD11C6658200640FAC /* SwordManagerTest.h in Headers */, + A918B8E411C6697400024D84 /* SwordModuleTest.h in Headers */, + A9BDFA781207F9F00067ED5B /* SwordListKeyTest.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 8DC2EF4F0486A6940098B216 /* ObjCSword */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */; + buildPhases = ( + 8DC2EF500486A6940098B216 /* Headers */, + 8DC2EF520486A6940098B216 /* Resources */, + 8DC2EF540486A6940098B216 /* Sources */, + 8DC2EF560486A6940098B216 /* Frameworks */, + A9A5050211C75C4B00EB6EA5 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = ObjCSword; + productInstallPath = "$(HOME)/Library/Frameworks"; + productName = ObjCSword; + productReference = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; + productType = "com.apple.product-type.framework"; + }; + A975EED811C792B9007C1532 /* mod2osis */ = { + isa = PBXNativeTarget; + buildConfigurationList = A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */; + buildPhases = ( + A975EED611C792B9007C1532 /* Sources */, + A975EED711C792B9007C1532 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = mod2osis; + productName = mod2osis; + productReference = A975EED911C792B9007C1532 /* mod2osis */; + productType = "com.apple.product-type.tool"; + }; + A9BDFA5A1207F9870067ED5B /* LongRunningTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */; + buildPhases = ( + A9BDFA5D1207F9870067ED5B /* Resources */, + A9BDFA5E1207F9870067ED5B /* Sources */, + A9BDFA611207F9870067ED5B /* Frameworks */, + A9BDFA641207F9870067ED5B /* ShellScript */, + A9BDFA651207F9870067ED5B /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */, + ); + name = LongRunningTests; + productName = Tests; + productReference = A9BDFA6B1207F9870067ED5B /* Tests.octest */; + productType = "com.apple.product-type.bundle"; + }; + A9C2819511C43C4900803CB5 /* Tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = A9C2819A11C43C4900803CB5 /* Build configuration list for PBXNativeTarget "Tests" */; + buildPhases = ( + A9C2819111C43C4900803CB5 /* Resources */, + A9C2819211C43C4900803CB5 /* Sources */, + A9C2819311C43C4900803CB5 /* Frameworks */, + A9C2819411C43C4900803CB5 /* ShellScript */, + A9C281B611C43DB800803CB5 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + A964657B11C662CA00640FAC /* PBXTargetDependency */, + ); + name = Tests; + productName = Tests; + productReference = A9C2819611C43C4900803CB5 /* Tests.octest */; + productType = "com.apple.product-type.bundle"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 0867D690FE84028FC02AAC07 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */; + compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 0867D691FE84028FC02AAC07 /* ObjCSword */; + productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8DC2EF4F0486A6940098B216 /* ObjCSword */, + A9C2819511C43C4900803CB5 /* Tests */, + A9BDFA5A1207F9870067ED5B /* LongRunningTests */, + A975EED811C792B9007C1532 /* mod2osis */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8DC2EF520486A6940098B216 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */, + A9D4382311C52947007AFE83 /* locales.d in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9BDFA5D1207F9870067ED5B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9C2819111C43C4900803CB5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + A9BDFA641207F9870067ED5B /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; + }; + A9C2819411C43C4900803CB5 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8DC2EF540486A6940098B216 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */, + A94EAC0E117B28920018B06F /* SwordBibleBook.mm in Sources */, + A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */, + A94EAC12117B28920018B06F /* SwordBibleTextEntry.m in Sources */, + A94EAC14117B28920018B06F /* SwordBook.mm in Sources */, + A94EAC16117B28920018B06F /* SwordCommentary.mm in Sources */, + A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */, + A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */, + A94EAC1C117B28920018B06F /* SwordInstallSourceController.mm in Sources */, + A94EAC1E117B28920018B06F /* SwordKey.mm in Sources */, + A94EAC20117B28920018B06F /* SwordListKey.mm in Sources */, + A94EAC22117B28920018B06F /* SwordManager.mm in Sources */, + A94EAC26117B28920018B06F /* SwordModule.mm in Sources */, + A94EAC28117B28920018B06F /* SwordModuleTextEntry.m in Sources */, + A94EAC2A117B28920018B06F /* SwordModuleTreeEntry.m in Sources */, + A94EAC2E117B28920018B06F /* SwordVerseKey.mm in Sources */, + A94EAC30117B28920018B06F /* SwordVerseManager.mm in Sources */, + A94EAC32117B28920018B06F /* VerseEnumerator.mm in Sources */, + A9C2857411C4471400803CB5 /* OSXConfiguration.m in Sources */, + A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */, + A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */, + A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A975EED611C792B9007C1532 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A975EEE511C79308007C1532 /* mod2osis.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9BDFA5E1207F9870067ED5B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A9C2819211C43C4900803CB5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A96465A511C6657900640FAC /* SwordManagerTest.m in Sources */, + A918B8E511C6697400024D84 /* SwordModuleTest.m in Sources */, + A9BDFA791207F9F00067ED5B /* SwordListKeyTest.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + A964657B11C662CA00640FAC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8DC2EF4F0486A6940098B216 /* ObjCSword */; + targetProxy = A964657A11C662CA00640FAC /* PBXContainerItemProxy */; + }; + A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8DC2EF4F0486A6940098B216 /* ObjCSword */; + targetProxy = A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 089C1666FE841158C02AAC07 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 089C1667FE841158C02AAC07 /* English */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 1DEB91AE08733DA50010E9CD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", + ); + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_ENABLE_OBJC_GC = required; + GCC_ENABLE_SYMBOL_SEPARATION = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ObjCSword_Prefix.pch; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + HEADER_SEARCH_PATHS = "../../include/**"; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "@rpath"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/build_sword/build/result_inst/lib\"", + "\"$(SRCROOT)/build_clucene/build/result_inst/lib\"", + ); + MACOSX_DEPLOYMENT_TARGET = 10.5; + ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = "-DDEBUG"; + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = ObjCSword; + SDKROOT = macosx10.5; + WARNING_CFLAGS = "-Wall"; + WRAPPER_EXTENSION = framework; + }; + name = Debug; + }; + 1DEB91AF08733DA50010E9CD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = ( + ppc, + "$(ARCHS_STANDARD_32_64_BIT)", + ); + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", + ); + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_GC = required; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ObjCSword_Prefix.pch; + HEADER_SEARCH_PATHS = "../../include/**"; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "@rpath"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/build_sword/build/result_inst/lib\"", + "\"$(SRCROOT)/build_clucene/build/result_inst/lib\"", + ); + MACOSX_DEPLOYMENT_TARGET = 10.5; + OTHER_CFLAGS = "-DRELEASE"; + OTHER_LDFLAGS = ( + "-lcurl", + "-lz", + "-licucore", + ); + PRODUCT_NAME = ObjCSword; + SDKROOT = macosx10.5; + WARNING_CFLAGS = "-Wall"; + WRAPPER_EXTENSION = framework; + }; + name = Release; + }; + 1DEB91B208733DA50010E9CD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; + PREBINDING = NO; + SDKROOT = macosx10.6; + }; + name = Debug; + }; + 1DEB91B308733DA50010E9CD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + PREBINDING = NO; + SDKROOT = macosx10.6; + }; + name = Release; + }; + A975EEDE11C792BA007C1532 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = "../../include/**"; + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path"; + PREBINDING = NO; + PRODUCT_NAME = mod2osis; + SDKROOT = macosx10.5; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + }; + name = Debug; + }; + A975EEDF11C792BA007C1532 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = G5; + HEADER_SEARCH_PATHS = "../../include/**"; + INSTALL_PATH = /usr/local/bin; + LD_RUNPATH_SEARCH_PATHS = "@loader_path"; + PREBINDING = NO; + PRODUCT_NAME = mod2osis; + SDKROOT = macosx10.5; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + ZERO_LINK = NO; + }; + name = Release; + }; + A9BDFA691207F9870067ED5B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_ENABLE_OBJC_GC = required; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; + INFOPLIST_FILE = "Tests-Info copy.plist"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ( + "-framework", + Cocoa, + "-framework", + SenTestingKit, + ); + PREBINDING = NO; + PRODUCT_NAME = Tests; + SDKROOT = macosx10.5; + WRAPPER_EXTENSION = octest; + }; + name = Debug; + }; + A9BDFA6A1207F9870067ED5B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_ENABLE_OBJC_GC = required; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; + INFOPLIST_FILE = "Tests-Info copy.plist"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = ( + "-framework", + Cocoa, + "-framework", + SenTestingKit, + ); + PREBINDING = NO; + PRODUCT_NAME = Tests; + SDKROOT = macosx10.5; + WRAPPER_EXTENSION = octest; + ZERO_LINK = NO; + }; + name = Release; + }; + A9C2819811C43C4900803CB5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_ENABLE_OBJC_GC = required; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; + INFOPLIST_FILE = "Tests-Info.plist"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ( + "-framework", + Cocoa, + "-framework", + SenTestingKit, + ); + PREBINDING = NO; + PRODUCT_NAME = Tests; + SDKROOT = macosx10.5; + WRAPPER_EXTENSION = octest; + }; + name = Debug; + }; + A9C2819911C43C4900803CB5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_ENABLE_OBJC_GC = required; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; + INFOPLIST_FILE = "Tests-Info.plist"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = ( + "-framework", + Cocoa, + "-framework", + SenTestingKit, + ); + PREBINDING = NO; + PRODUCT_NAME = Tests; + SDKROOT = macosx10.5; + WRAPPER_EXTENSION = octest; + ZERO_LINK = NO; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1DEB91AE08733DA50010E9CD /* Debug */, + 1DEB91AF08733DA50010E9CD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1DEB91B208733DA50010E9CD /* Debug */, + 1DEB91B308733DA50010E9CD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A975EEDE11C792BA007C1532 /* Debug */, + A975EEDF11C792BA007C1532 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9BDFA691207F9870067ED5B /* Debug */, + A9BDFA6A1207F9870067ED5B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A9C2819A11C43C4900803CB5 /* Build configuration list for PBXNativeTarget "Tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A9C2819811C43C4900803CB5 /* Debug */, + A9C2819911C43C4900803CB5 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 0867D690FE84028FC02AAC07 /* Project object */; +} diff --git a/bindings/objc/README b/bindings/objc/README index 5908cd5..8d1b5ed 100644 --- a/bindings/objc/README +++ b/bindings/objc/README @@ -1,5 +1,10 @@ -Building ObjCSword wrapper framework howto -========================================== +Building ObjCSword wrapper framework howto (>= Mac OSX Lion (10.7) +=================================================================== +Open Xcode Project (ObjCSword.xcodeproj) and build. + + +Building ObjCSword wrapper framework howto (pre Mac OSX Lion (10.7) +=================================================================== Mac OS X target: The framework for Mac OS X relies on a manually, via makefile compiled SWORD library. diff --git a/bindings/objc/build_sword/Makefile b/bindings/objc/build_sword/Makefile deleted file mode 100644 index 2a9c5d6..0000000 --- a/bindings/objc/build_sword/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -.PHONY: default release-ppc release-intel release-fat debug-ppc debug-intel debug-fat clean - -default: release-fat - -release-ppc: - ./build_mac_sword.sh release ppc - -release-intel: - ./build_mac_sword.sh release intel - -release-fat: - ./build_mac_sword.sh release fat - -debug-ppc: - ./build_mac_sword.sh debug ppc - -debug-intel: - ./build_mac_sword.sh debug intel - -debug-fat: - ./build_mac_sword.sh debug fat - -clean: - rm -rf build - diff --git a/bindings/objc/build_sword/build_mac_sword.sh b/bindings/objc/build_sword/build_mac_sword.sh index e7665ee..77cfff9 100755 --- a/bindings/objc/build_sword/build_mac_sword.sh +++ b/bindings/objc/build_sword/build_mac_sword.sh @@ -3,49 +3,92 @@ # APP=sword -VERS=1.6.1 +VERS=1.6.2 BDIR=`pwd` +SWORDPATH="$BDIR/../../../" +ICUPATH="$BDIR/../dependencies/icu" +PPCCLUCENEPATH="$BDIR/../build_clucene/build/ppc_inst" +INTELCLUCENEPATH="$BDIR/../build_clucene/build/intel_inst" +INTEL64CLUCENEPATH="$BDIR/../build_clucene/build/intel64_inst" + +usage() { +cat << EOF +usage: $0 options + +OPTIONS: + -d Buildtype debug version + -a Architecture [intel|intel64|ppc|fat] + -b Buildpath, default = "build" + -c With clucene + -s Path to SDK i.e. "/Developer/SDKs/MacOSX10.5.sdk" + -t Deplyoment target i.e. "10.5" +EOF +} + DEBUG=0 FAT=0 PPC=0 INTEL=0 +INTEL64=0 +USECLUCENE=0 +BUILDDIR=build +SDKDIR=/Developer/SDKs/MacOSX10.5.sdk +DTARGET=10.5 -SWORDPATH="$BDIR/../../../" -ICUPATH="$BDIR/../dependencies/icu" -PPCCLUCENEPATH="$BDIR/../clucene_build/build/ppc_inst" -INTELCLUCENEPATH="$BDIR/../clucene_build/build/intel_inst" -INTEL64CLUCENEPATH="$BDIR/../clucene_build/build/intel64_inst" - -# check commandline -for arg in "$@" +while getopts “da:b:s:t:c?†OPTION do - if [ "$arg" = "debug" ]; then - DEBUG=1 - echo "building debug version" - fi - if [ "$arg" = "fat" ]; then - FAT=1 - PPC=1 - INTEL=1 - echo "building fat version" - fi - if [ "$arg" = "ppc" ]; then - PPC=1 - echo "building ppc version" - else - PPC=0 - fi - if [ "$arg" = "intel" ]; then - INTEL=1 - echo "building intel version" - else - INTEL=0 - fi + case $OPTION in + d) + DEBUG=1 + echo "building debug version" + ;; + a) + if [ "$OPTARG" = "fat" ]; then + FAT=1 + PPC=1 + INTEL=1 + INTEL64=1 + echo "building fat version" + fi + if [ "$OPTARG" = "ppc" ]; then + PPC=1 + echo "building ppc version" + fi + if [ "$OPTARG" = "intel" ]; then + INTEL=1 + echo "building intel version" + fi + if [ "$OPTARG" = "intel64" ]; then + INTEL64=1 + echo "building intel64 version" + fi + ;; + b) + BUILDDIR="$OPTARG" + echo "using builddir $BUILDDIR" + ;; + s) + SDKDIR="$OPTARG" + echo "using SDK at $SDKDIR" + ;; + t) + DTARGET="$OPTARG" + echo "using deployment target $DTARGET" + ;; + c) + USECLUCENE=1 + echo "building with clucene" + ;; + ?) + usage + exit + ;; + esac done # using seperate build dirs and building in them doesn't work with sword -BUILD=$BDIR/build +BUILD=$BDIR/"$BUILDDIR" PPCPREFIX=$BUILD/ppc_inst INTELPREFIX=$BUILD/intel_inst INTEL64PREFIX=$BUILD/intel64_inst @@ -83,80 +126,91 @@ INTEL64_LIB_EXPORT= if [ $PPC -eq 1 ] || [ $FAT -eq 1 ]; then echo "building PPC version of library..." cd $SWORDPATH - make clean echo 'autogen.sh ...' ./autogen.sh echo 'autogen.sh ... done' export CC=gcc export CXX=g++ - export SDK=/Developer/SDKs/MacOSX10.5.sdk + export SDK=$SDKDIR if [ $DEBUG -eq 1 ]; then - export CFLAGS="-O0 -g -arch ppc -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" + export CFLAGS="-O0 -g -arch ppc -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" else - export CFLAGS="-O2 -g0 -arch ppc -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" + export CFLAGS="-O2 -g0 -arch ppc -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" fi export CXXFLAGS="$CFLAGS" export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK" - ./configure --prefix=$PPCPREFIX --with-clucene=$PPCCLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --disable-tests --disable-shared --enable-utilities + if [ $USECLUCENE -eq 1 ]; then + ./configure --prefix=$PPCPREFIX --with-clucene=$PPCCLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --disable-tests --disable-shared + else + ./configure --prefix=$PPCPREFIX --without-clucene --with-zlib --with-conf --with-icu --with-curl --disable-tests --disable-shared --enable-utilities + fi make all install make clean cd $BDIR # copy to result dir PPC_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-ppc.a" cp $PPCPREFIX/lib/lib$APP.a $PPC_LIB_EXPORT - echo "building PPC version of library...done" + echo "building PPC version of library...done" fi if [ $INTEL -eq 1 ] || [ $FAT -eq 1 ]; then - echo "building INTEL version of library..." + echo "building INTEL version of library..." cd $SWORDPATH - make clean echo 'autogen.sh ...' ./autogen.sh echo 'autogen.sh ... done' export CC=gcc export CXX=g++ - export SDK=/Developer/SDKs/MacOSX10.5.sdk + export SDK=$SDKDIR if [ $DEBUG -eq 1 ]; then - export CFLAGS="-O0 -g -arch i686 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" + export CFLAGS="-O0 -g -arch i686 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" else - export CFLAGS="-O2 -g0 -arch i686 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" + export CFLAGS="-O2 -g0 -arch i686 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" fi export CXXFLAGS="$CFLAGS" export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK" - ./configure --prefix=$INTELPREFIX --with-clucene=$INTELCLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared --enable-utilities + if [ $USECLUCENE -eq 1 ]; then + ./configure --prefix=$INTELPREFIX --with-clucene=$INTELCLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared + else + ./configure --prefix=$INTELPREFIX --without-clucene --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared --enable-utilities + fi make all install make clean cd $BDIR # copy to result dir INTEL_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-intel.a" cp $INTELPREFIX/lib/lib$APP.a $INTEL_LIB_EXPORT - echo "building INTEL version of library...done" + echo "building INTEL version of library...done" +fi - echo "building INTEL64 version of library..." +if [ $INTEL64 -eq 1 ] || [ $FAT -eq 1 ]; then + echo "building INTEL64 version of library..." cd $SWORDPATH - make clean echo 'autogen.sh ...' ./autogen.sh echo 'autogen.sh ... done' export CC=gcc export CXX=g++ - export SDK=/Developer/SDKs/MacOSX10.5.sdk + export SDK=$SDKDIR if [ $DEBUG -eq 1 ]; then - export CFLAGS="-O0 -g -arch x86_64 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" + export CFLAGS="-O0 -g -arch x86_64 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" else - export CFLAGS="-O2 -g0 -arch x86_64 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" + export CFLAGS="-O2 -g0 -arch x86_64 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include" fi export CXXFLAGS="$CFLAGS" export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK" - ./configure --prefix=$INTEL64PREFIX --with-clucene=$INTEL64CLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared --enable-utilities + if [ $USECLUCENE -eq 1 ]; then + ./configure --prefix=$INTEL64PREFIX --with-clucene=$INTEL64CLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared + else + ./configure --prefix=$INTEL64PREFIX --without-clucene --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared --enable-utilities + fi make all install make clean cd $BDIR # copy to result dir INTEL64_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-intel64.a" cp $INTEL64PREFIX/lib/lib$APP.a $INTEL64_LIB_EXPORT - echo "building INTEL64 version of library...done" + echo "building INTEL64 version of library...done" fi # only for fat version @@ -166,5 +220,6 @@ if [ $FAT -eq 1 ]; then lipo -create $PPC_LIB_EXPORT $INTEL_LIB_EXPORT $INTEL64_LIB_EXPORT -output $RESULTPREFIX/lib/lib$APP-ub.a fi + # run runlib to update the library content #ranlib $RESULTPREFIX/lib/* diff --git a/bindings/objc/build_sword/build_ub_mac_swordutils.sh b/bindings/objc/build_sword/build_ub_mac_swordutils.sh index a4238d3..55c21f7 100755 --- a/bindings/objc/build_sword/build_ub_mac_swordutils.sh +++ b/bindings/objc/build_sword/build_ub_mac_swordutils.sh @@ -4,10 +4,13 @@ # dependencies for this script are: # that "build_mac_sword.sh" has been executed in "fat" mode and -# successfully created a "build" folder with directories: "ppc_inst" and "intel_inst" +# successfully created a "build_tools" folder with directories: "ppc_inst" and "intel_inst" + +# first build library +./build_mac_sword.sh -a fat -b build_tools BDIR=. -SWORDBUILD=$BDIR/build +SWORDBUILD=$BDIR/build_tools PPCPREFIX=$SWORDBUILD/ppc_inst INTELPREFIX=$SWORDBUILD/intel_inst RESULTPREFIX=$SWORDBUILD/result_inst diff --git a/bindings/objc/build_sword/readme.txt b/bindings/objc/build_sword/readme.txt index b2ba0c8..f20e49e 100644 --- a/bindings/objc/build_sword/readme.txt +++ b/bindings/objc/build_sword/readme.txt @@ -1,8 +1,9 @@ -Building sword library for MacSword: +Building sword library for Eloquent: - make a symlink for libtoolize: ln -s /usr/bin/glibtoolize /usr/bin/libtoolize -- call one of the Build*.sh scripts either for a point release or SVN trunk. -parameters can be: "fat"|"intel"|"ppc", "debug"|"release" -- call CreateUniversalBinarySWORDUtilities.sh + +- build the library as it is a dependency for the Xcode project: +./build_mac_sword.sh -a fat -c +(check -? for possible options). diff --git a/bindings/objc/dependencies/retrieve.sh b/bindings/objc/dependencies/retrieve.sh index 898d36a..547a9fe 100755 --- a/bindings/objc/dependencies/retrieve.sh +++ b/bindings/objc/dependencies/retrieve.sh @@ -9,3 +9,11 @@ tar -xzf icu_build-ub.tar.gz curl -o clucene_src.tar.gz http://www.crosswire.org/~mbergmann/clucene_src.tar.gz tar -xzf clucene_src.tar.gz +cd icu/lib +ln -s libicudata.dylib libicudata.dylib.36 +ln -s libicui18n.dylib libicui18n.dylib.36 +ln -s libicuio.dylib libicuio.dylib.36 +ln -s libicule.dylib libicule.dylib.36 +ln -s libiculx.dylib libiculx.dylib.36 +ln -s libicutu.dylib libicutu.dylib.36 +ln -s libicuuc.dylib libicuuc.dylib.36 diff --git a/bindings/objc/dependencies/retrieve_iOS.sh b/bindings/objc/dependencies/retrieve_iOS.sh new file mode 100755 index 0000000..4415a3b --- /dev/null +++ b/bindings/objc/dependencies/retrieve_iOS.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# this script downloads dependencies for iOS project + +curl -o libcurl_build.tar.gz http://www.crosswire.org/~mbergmann/libcurl_build.tar.gz +tar -xzf libcurl_build.tar.gz diff --git a/bindings/objc/src/DefaultFilterProvider.h b/bindings/objc/src/DefaultFilterProvider.h new file mode 100644 index 0000000..435daa0 --- /dev/null +++ b/bindings/objc/src/DefaultFilterProvider.h @@ -0,0 +1,37 @@ +// +// Created by mbergmann on 18.12.12. +// +// To change the template use AppCode | Preferences | File Templates. +// + + +#import +#import "SwordFilter.h" + +@protocol FilterProvider + +- (SwordFilter *)newOsisRenderFilter; +- (SwordFilter *)newOsisPlainFilter; +- (SwordFilter *)newGbfRenderFilter; +- (SwordFilter *)newGbfPlainFilter; +- (SwordFilter *)newThmlRenderFilter; +- (SwordFilter *)newThmlPlainFilter; +- (SwordFilter *)newTeiRenderFilter; +- (SwordFilter *)newTeiPlainFilter; +- (SwordFilter *)newHtmlPlainFilter; + +@end + +@interface DefaultFilterProvider : NSObject + +- (SwordFilter *)newOsisRenderFilter; +- (SwordFilter *)newOsisPlainFilter; +- (SwordFilter *)newGbfRenderFilter; +- (SwordFilter *)newGbfPlainFilter; +- (SwordFilter *)newThmlRenderFilter; +- (SwordFilter *)newThmlPlainFilter; +- (SwordFilter *)newTeiRenderFilter; +- (SwordFilter *)newTeiPlainFilter; +- (SwordFilter *)newHtmlPlainFilter; + +@end diff --git a/bindings/objc/src/DefaultFilterProvider.mm b/bindings/objc/src/DefaultFilterProvider.mm new file mode 100644 index 0000000..65d8c0a --- /dev/null +++ b/bindings/objc/src/DefaultFilterProvider.mm @@ -0,0 +1,44 @@ +// +// Created by mbergmann on 18.12.12. +// +// + + +#import "DefaultFilterProvider.h" +#import "SwordFilter.h" + +@implementation DefaultFilterProvider + +- (SwordFilter *)newOsisRenderFilter { + return [SwordOsisHtmlRefFilter filter]; +} + +- (SwordFilter *)newOsisPlainFilter { + return [SwordOsisPlainFilter filter]; +} + +- (SwordFilter *)newGbfRenderFilter { + return [SwordGbfHtmlFilter filter]; +} + +- (SwordFilter *)newGbfPlainFilter { + return [SwordGbfPlainFilter filter]; +} + +- (SwordFilter *)newThmlRenderFilter { + return [SwordThmlHtmlFilter filter]; +} + +- (SwordFilter *)newThmlPlainFilter { + return [SwordThmlPlainFilter filter]; +} + +- (SwordFilter *)newTeiRenderFilter { + return [SwordTeiHtmlFilter filter]; +} + +- (SwordFilter *)newTeiPlainFilter { + return [SwordTeiPlainFilter filter]; +} + +@end \ No newline at end of file diff --git a/bindings/objc/src/FilterProviderFactory.h b/bindings/objc/src/FilterProviderFactory.h new file mode 100644 index 0000000..b2a6e65 --- /dev/null +++ b/bindings/objc/src/FilterProviderFactory.h @@ -0,0 +1,24 @@ +// +// Created by mbergmann on 18.12.12. +// +// + +#import + +#ifdef __cplusplus +#include // C++ Sword API +#endif + +@protocol FilterProvider; + +/** +* This factory has to be initialized before any Modules are loaded through SwordManager. +*/ +@interface FilterProviderFactory : NSObject + ++ (FilterProviderFactory *)providerFactory; + +- (void)initWithImpl:(id)aFilterProvider; +- (id)get; + +@end diff --git a/bindings/objc/src/FilterProviderFactory.mm b/bindings/objc/src/FilterProviderFactory.mm new file mode 100644 index 0000000..75abc68 --- /dev/null +++ b/bindings/objc/src/FilterProviderFactory.mm @@ -0,0 +1,42 @@ +// +// Created by mbergmann on 18.12.12. +// +// + + +#import "FilterProviderFactory.h" +#import "DefaultFilterProvider.h" + +@interface FilterProviderFactory () + +@property(nonatomic, retain) id filterProvider; + +@end + +@implementation FilterProviderFactory + ++ (FilterProviderFactory *)providerFactory { + static FilterProviderFactory *singleton = nil; + + if(singleton == nil) { + singleton = [[FilterProviderFactory alloc] init]; + } + + return singleton; +} + +- (void)initWithImpl:(id )aFilterProvider { + self.filterProvider = aFilterProvider; +} + +- (id )get { + return self.filterProvider; +} + +- (void)dealloc { + self.filterProvider = nil; + [super dealloc]; +} + + +@end \ No newline at end of file diff --git a/bindings/objc/src/SwordBible.h b/bindings/objc/src/SwordBible.h index 68bf6bb..f57d322 100644 --- a/bindings/objc/src/SwordBible.h +++ b/bindings/objc/src/SwordBible.h @@ -11,14 +11,14 @@ General Public License for more details. (http://www.gnu.org/licenses/gpl.html) */ -#import -#import "SwordModule.h" +#import #ifdef __cplusplus #import "versekey.h" #endif -@class SwordManager, SwordBibleBook, SwordModuleTextEntry, SwordBibleTextEntry; +@class SwordModule, SwordManager, SwordBibleBook, SwordModuleTextEntry, SwordBibleTextEntry; +@class SwordKey; typedef enum { OldTestament = 1, @@ -57,8 +57,17 @@ typedef enum { - (int)versesForBible; // Text pulling -- (SwordBibleTextEntry *)textEntryForKey:(SwordKey *)aKey textType:(TextPullType)aType; + +/** +* @return SwordBibleTextEntry +*/ +- (SwordModuleTextEntry *)textEntryForKey:(SwordKey *)aKey textType:(TextPullType)aType; - (NSArray *)strippedTextEntriesForRef:(NSString *)reference context:(int)context; - (NSArray *)renderedTextEntriesForRef:(NSString *)reference context:(int)context; +/** + Override from super class + @return Array of SwordBibleTextEntry + */ +- (NSArray *)textEntriesForReference:(NSString *)aReference textType:(TextPullType)textType; @end \ No newline at end of file diff --git a/bindings/objc/src/SwordBible.mm b/bindings/objc/src/SwordBible.mm index 8c86626..03e378e 100644 --- a/bindings/objc/src/SwordBible.mm +++ b/bindings/objc/src/SwordBible.mm @@ -11,20 +11,11 @@ General Public License for more details. (http://www.gnu.org/licenses/gpl.html) */ -#import "SwordBible.h" -#import "SwordModule.h" -#import "SwordManager.h" -#import "SwordBibleBook.h" -#import "SwordListKey.h" -#import "SwordModuleTextEntry.h" -#import "SwordBibleTextEntry.h" -#import "SwordVerseKey.h" -#import "SwordListKey.h" +#import using sword::AttributeTypeList; using sword::AttributeList; using sword::AttributeValue; -#include "versemgr.h" @interface SwordBible () @@ -49,12 +40,20 @@ NSLock *bibleLock = nil; if(!bibleLock) bibleLock = [[NSLock alloc] init]; [bibleLock lock]; - sword::VerseKey vk([ref UTF8String]); - - *bookName = [NSString stringWithUTF8String:vk.getBookName()]; - *book = vk.Book(); - *chapter = vk.Chapter(); - *verse = vk.Verse(); + SwordVerseKey *key = [SwordVerseKey verseKeyWithRef:ref]; + + if(bookName != NULL) { + *bookName = [key bookName]; + } + if(book != NULL) { + *book = [key book]; + } + if(chapter != NULL) { + *chapter = [key chapter]; + } + if(verse != NULL) { + *verse = [key verse]; + } [bibleLock unlock]; } @@ -75,25 +74,25 @@ NSLock *bibleLock = nil; //get parsed simple ref NSString *first = [SwordBible firstRefName:abbr]; - NSArray *firstbits = [first componentsSeparatedByString:@":"]; + NSArray *firstBits = [first componentsSeparatedByString:@":"]; //if abbr contains : or . then we are a verse so return a chapter if([abbr rangeOfString:@":"].location != NSNotFound || [abbr rangeOfString:@"."].location != NSNotFound) { - return [firstbits objectAtIndex:0]; + return [firstBits objectAtIndex:0]; } //otherwise return a book - firstbits = [first componentsSeparatedByString:@" "]; + firstBits = [first componentsSeparatedByString:@" "]; - if([firstbits count] > 0) { - return [firstbits objectAtIndex:0]; + if([firstBits count] > 0) { + return [firstBits objectAtIndex:0]; } return abbr; } /** - get book index for versekey + get book index for verseKey that is: book number + testament * 100 */ + (int)bookIndexForSWKey:(sword::VerseKey *)key { @@ -125,6 +124,7 @@ NSLock *bibleLock = nil; } - (void)dealloc { + [books release]; [super dealloc]; } @@ -133,15 +133,15 @@ NSLock *bibleLock = nil; - (void)buildBookList { [moduleLock lock]; - sword::VerseMgr *vmgr = sword::VerseMgr::getSystemVerseMgr(); - const sword::VerseMgr::System *system = vmgr->getVersificationSystem([[self versification] UTF8String]); + sword::VersificationMgr *vmgr = sword::VersificationMgr::getSystemVersificationMgr(); + const sword::VersificationMgr::System *system = vmgr->getVersificationSystem([[self versification] UTF8String]); NSMutableDictionary *buf = [NSMutableDictionary dictionary]; int bookCount = system->getBookCount(); for(int i = 0;i < bookCount;i++) { - sword::VerseMgr::Book *book = (sword::VerseMgr::Book *)system->getBook(i); + sword::VersificationMgr::Book *book = (sword::VersificationMgr::Book *)system->getBook(i); - SwordBibleBook *bb = [[SwordBibleBook alloc] initWithBook:book]; + SwordBibleBook *bb = [[[SwordBibleBook alloc] initWithBook:book] autorelease]; [bb setNumber:i+1]; NSString *bookName = [bb name]; @@ -219,7 +219,7 @@ NSLock *bibleLock = nil; - (int)chaptersForBookName:(NSString *)bookName { [moduleLock lock]; - int maxChapters = 0; + int maxChapters; sword::VerseKey *key = (sword::VerseKey *)swModule->CreateKey(); (*key) = [bookName UTF8String]; maxChapters = key->getChapterMax(); @@ -271,28 +271,28 @@ NSLock *bibleLock = nil; } - (NSString *)moduleIntroduction { - NSString *ret = @""; + NSString *ret; // save key - SwordVerseKey *save = [self getKeyCopy]; + SwordVerseKey *save = [(SwordVerseKey *)[self getKeyCopy] autorelease]; SwordVerseKey *key = [SwordVerseKey verseKeyWithVersification:[self versification]]; [key setHeadings:YES]; [key setPosition:0]; - [self setKey:key]; + [self setSwordKey:key]; ret = [self renderedText]; // restore old key - [self setKey:save]; + [self setSwordKey:save]; return ret; } - (NSString *)bookIntroductionFor:(SwordBibleBook *)aBook { - NSString *ret = @""; + NSString *ret; // save key - SwordVerseKey *save = [self getKeyCopy]; + SwordVerseKey *save = [(SwordVerseKey *)[self getKeyCopy] autorelease]; SwordVerseKey *key = [SwordVerseKey verseKeyWithVersification:[self versification]]; [key setHeadings:YES]; @@ -301,20 +301,20 @@ NSLock *bibleLock = nil; [key setBook:[aBook numberInTestament]]; [key setChapter:0]; [key setVerse:0]; - [self setKey:key]; + [self setSwordKey:key]; ret = [self renderedText]; // restore old key - [self setKey:save]; + [self setSwordKey:save]; return ret; } - (NSString *)chapterIntroductionFor:(SwordBibleBook *)aBook chapter:(int)chapter { - NSString *ret = @""; + NSString *ret; // save key - SwordVerseKey *save = [self getKeyCopy]; + SwordVerseKey *save = [(SwordVerseKey *)[self getKeyCopy] autorelease]; SwordVerseKey *key = [SwordVerseKey verseKeyWithVersification:[self versification]]; [key setHeadings:YES]; @@ -323,23 +323,23 @@ NSLock *bibleLock = nil; [key setBook:[aBook numberInTestament]]; [key setChapter:chapter]; [key setVerse:0]; - [self setKey:key]; + [self setSwordKey:key]; ret = [self renderedText]; // restore old key - [self setKey:save]; + [self setSwordKey:save]; return ret; } -- (SwordBibleTextEntry *)textEntryForKey:(SwordVerseKey *)aKey textType:(TextPullType)aType { +- (SwordModuleTextEntry *)textEntryForKey:(SwordKey *)aKey textType:(TextPullType)aType { SwordBibleTextEntry *ret = nil; if(aKey) { [moduleLock lock]; - [self setKey:aKey]; + [self setSwordKey:aKey]; if(![self error]) { - NSString *txt = @""; + NSString *txt; if(aType == TextTypeRendered) { txt = [self renderedText]; } else { @@ -355,7 +355,7 @@ NSLock *bibleLock = nil; if([swManager globalOption:SW_OPTION_HEADINGS] && [self hasFeature:SWMOD_FEATURE_HEADINGS]) { NSString *preverseHeading = [self entryAttributeValuePreverse]; if(preverseHeading && [preverseHeading length] > 0) { - [ret setPreverseHeading:preverseHeading]; + [ret setPreVerseHeading:preverseHeading]; } } } @@ -385,7 +385,7 @@ NSLock *bibleLock = nil; #pragma mark - SwordModuleAccess -- (id)createKey { +- (SwordKey *)createKey { sword::VerseKey *vk = (sword::VerseKey *)swModule->CreateKey(); SwordVerseKey *newKey = [SwordVerseKey verseKeyWithSWVerseKey:vk makeCopy:YES]; delete vk; @@ -393,19 +393,19 @@ NSLock *bibleLock = nil; return newKey; } -- (id)getKey { +- (SwordKey *)getKey { return [SwordVerseKey verseKeyWithSWVerseKey:(sword::VerseKey *)swModule->getKey()]; } -- (id)getKeyCopy { +- (SwordKey *)getKeyCopy { return [SwordVerseKey verseKeyWithSWVerseKey:(sword::VerseKey *)swModule->getKey() makeCopy:YES]; } - (long)entryCount { swModule->setPosition(sword::TOP); - unsigned long verseLowIndex = swModule->Index(); + long verseLowIndex = swModule->Index(); swModule->setPosition(sword::BOTTOM); - unsigned long verseHighIndex = swModule->Index(); + long verseHighIndex = swModule->Index(); return verseHighIndex - verseLowIndex; } @@ -426,6 +426,10 @@ NSLock *bibleLock = nil; return [self textEntriesForReference:reference context:context textType:TextTypeRendered]; } +- (NSArray *)textEntriesForReference:(NSString *)aReference textType:(TextPullType)textType { + return [self textEntriesForReference:aReference context:0 textType:textType]; +} + - (NSArray *)textEntriesForReference:(NSString *)aReference context:(int)context textType:(TextPullType)textType { NSMutableArray *ret = [NSMutableArray array]; @@ -441,14 +445,14 @@ NSLock *bibleLock = nil; long highVerse = lowVerse + (context * 2); for(;lowVerse <= highVerse;lowVerse++) { [vk setVerse:lowVerse]; - SwordBibleTextEntry *entry = [self textEntryForKey:vk textType:textType]; + SwordBibleTextEntry *entry = (SwordBibleTextEntry *) [self textEntryForKey:vk textType:textType]; if(entry) { [ret addObject:entry]; } [vk increment]; } } else { - SwordBibleTextEntry *entry = [self textEntryForKey:vk textType:textType]; + SwordBibleTextEntry *entry = (SwordBibleTextEntry *) [self textEntryForKey:vk textType:textType]; if(entry) { [ret addObject:entry]; } diff --git a/bindings/objc/src/SwordBibleBook.h b/bindings/objc/src/SwordBibleBook.h index 824d400..af48bb4 100644 --- a/bindings/objc/src/SwordBibleBook.h +++ b/bindings/objc/src/SwordBibleBook.h @@ -6,36 +6,36 @@ // Copyright 2009 __MyCompanyName__. All rights reserved. // -#import +#import #ifdef __cplusplus -#include +#include #include #include -class sword::VerseMgr::Book; +class sword::VersificationMgr::Book; #endif @interface SwordBibleBook : NSObject { #ifdef __cplusplus - sword::VerseMgr::Book *swBook; + sword::VersificationMgr::Book *swBook; #endif NSString *localizedName; int number; - int numberInTestament; - int testament; + char numberInTestament; + char testament; NSArray *chapters; } @property (readwrite) int number; -@property (readwrite) int numberInTestament; -@property (readwrite) int testament; +@property (readwrite) char numberInTestament; +@property (readwrite) char testament; @property (retain, readwrite) NSString *localizedName; @property (retain, readwrite) NSArray *chapters; #ifdef __cplusplus -- (id)initWithBook:(sword::VerseMgr::Book *)aBook; -- (sword::VerseMgr::Book *)book; +- (id)initWithBook:(sword::VersificationMgr::Book *)aBook; +- (sword::VersificationMgr::Book *)book; #endif - (NSString *)name; @@ -43,7 +43,7 @@ class sword::VerseMgr::Book; - (int)numberOfChapters; - (int)numberOfVersesForChapter:(int)chapter; /** - get book index for versekey + get book index for verseKey that is: book number + testament * 100 */ - (int)generatedIndex; diff --git a/bindings/objc/src/SwordBibleBook.mm b/bindings/objc/src/SwordBibleBook.mm index 2fb9468..eeb956b 100644 --- a/bindings/objc/src/SwordBibleBook.mm +++ b/bindings/objc/src/SwordBibleBook.mm @@ -31,7 +31,7 @@ return self; } -- (id)initWithBook:(sword::VerseMgr::Book *)aBook { +- (id)initWithBook:(sword::VersificationMgr::Book *)aBook { self = [self init]; if(self) { swBook = aBook; @@ -40,7 +40,7 @@ [self setTestament:vk.Testament()]; [self setNumberInTestament:vk.Book()]; - // get system localemgr to be able to translate the english bookname + // get system localeMgr to be able to translate the english bookName sword::LocaleMgr *lmgr = sword::LocaleMgr::getSystemLocaleMgr(); self.localizedName = [NSString stringWithUTF8String:lmgr->translate(swBook->getLongName())]; } @@ -85,7 +85,7 @@ if(chapters == nil) { NSMutableArray *temp = [NSMutableArray array]; for(int i = 0;i < swBook->getChapterMax();i++) { - [temp addObject:[[SwordBibleChapter alloc] initWithBook:self andChapter:i+1]]; + [temp addObject:[[[SwordBibleChapter alloc] initWithBook:self andChapter:i+1] autorelease]]; } [self setChapters:[NSArray arrayWithArray:temp]]; } @@ -93,14 +93,14 @@ } /** - get book index for versekey + get book index for verseKey that is: book number + testament * 100 */ - (int)generatedIndex { return number + testament * 100; } -- (sword::VerseMgr::Book *)book { +- (sword::VersificationMgr::Book *)book { return swBook; } diff --git a/bindings/objc/src/SwordBibleChapter.h b/bindings/objc/src/SwordBibleChapter.h index e8f29c2..11e4cff 100644 --- a/bindings/objc/src/SwordBibleChapter.h +++ b/bindings/objc/src/SwordBibleChapter.h @@ -6,7 +6,7 @@ // Copyright 2009 __MyCompanyName__. All rights reserved. // -#import +#import @class SwordBibleBook; diff --git a/bindings/objc/src/SwordBibleTextEntry.h b/bindings/objc/src/SwordBibleTextEntry.h index 467bf18..42969cd 100644 --- a/bindings/objc/src/SwordBibleTextEntry.h +++ b/bindings/objc/src/SwordBibleTextEntry.h @@ -6,14 +6,14 @@ // Copyright 2010 Software by MABE. All rights reserved. // -#import +#import #import "SwordModuleTextEntry.h" @interface SwordBibleTextEntry : SwordModuleTextEntry { - NSString *preverseHeading; + NSString *preVerseHeading; } -@property (readwrite, retain) NSString *preverseHeading; +@property (readwrite, retain) NSString *preVerseHeading; + (id)textEntryForKey:(NSString *)aKey andText:(NSString *)aText; - (id)initWithKey:(NSString *)aKey andText:(NSString *)aText; diff --git a/bindings/objc/src/SwordBibleTextEntry.m b/bindings/objc/src/SwordBibleTextEntry.m index 6be2c4e..115a33c 100644 --- a/bindings/objc/src/SwordBibleTextEntry.m +++ b/bindings/objc/src/SwordBibleTextEntry.m @@ -10,7 +10,7 @@ @implementation SwordBibleTextEntry -@synthesize preverseHeading; +@synthesize preVerseHeading; + (id)textEntryForKey:(NSString *)aKey andText:(NSString *)aText { return [[[SwordBibleTextEntry alloc] initWithKey:aKey andText:aText] autorelease]; @@ -30,7 +30,7 @@ } - (void)dealloc { - [self setPreverseHeading:nil]; + [self setPreVerseHeading:nil]; [super dealloc]; } diff --git a/bindings/objc/src/SwordBook.h b/bindings/objc/src/SwordBook.h index e1cd17d..b0c520a 100644 --- a/bindings/objc/src/SwordBook.h +++ b/bindings/objc/src/SwordBook.h @@ -11,7 +11,7 @@ General Public License for more details. (http://www.gnu.org/licenses/gpl.html) */ -#import +#import #import "SwordModule.h" #ifdef __cplusplus @@ -29,9 +29,9 @@ @property(readwrite, retain) NSMutableDictionary *contents; /** - return the tree content for the given treekey - the treekey has to be already loaded - @param[in]: treekey that we should look for, nil for root + return the tree content for the given treeKey + the treeKey has to be already loaded + @param[in]: treeKey that we should look for, nil for root @return: SwordTreeEntry */ - (SwordModuleTreeEntry *)treeEntryForKey:(NSString *)treeKey; diff --git a/bindings/objc/src/SwordBook.mm b/bindings/objc/src/SwordBook.mm index 05f622e..bcee1e4 100644 --- a/bindings/objc/src/SwordBook.mm +++ b/bindings/objc/src/SwordBook.mm @@ -12,7 +12,6 @@ */ #import "SwordBook.h" -#import "SwordModule.h" #import "SwordModuleTreeEntry.h" @interface SwordBook () @@ -54,14 +53,14 @@ } - (SwordModuleTreeEntry *)treeEntryForKey:(NSString *)treeKey { - SwordModuleTreeEntry * ret = nil; + SwordModuleTreeEntry * ret; [moduleLock lock]; if(treeKey == nil) { ret = [contents objectForKey:@"root"]; if(ret == nil) { - sword::TreeKeyIdx *treeKey = dynamic_cast((sword::SWKey *)*(swModule)); - ret = [self _treeEntryForKey:treeKey]; + sword::TreeKeyIdx *tk = dynamic_cast((sword::SWKey *)*(swModule)); + ret = [self _treeEntryForKey:tk]; // add to content [contents setObject:ret forKey:@"root"]; } @@ -87,22 +86,22 @@ } - (SwordModuleTreeEntry *)_treeEntryForKey:(sword::TreeKeyIdx *)treeKey { - SwordModuleTreeEntry *ret = [[SwordModuleTreeEntry alloc] init]; + SwordModuleTreeEntry *ret = [[[SwordModuleTreeEntry alloc] init] autorelease]; char *treeNodeName = (char *)treeKey->getText(); - NSString *nname = @""; + NSString *nName; if(strlen(treeNodeName) == 0) { - nname = @"root"; + nName = @"root"; } else { // key encoding depends on module encoding - nname = [NSString stringWithUTF8String:treeNodeName]; - if(!nname) { - nname = [NSString stringWithCString:treeNodeName encoding:NSISOLatin1StringEncoding]; + nName = [NSString stringWithUTF8String:treeNodeName]; + if(!nName) { + nName = [NSString stringWithCString:treeNodeName encoding:NSISOLatin1StringEncoding]; } } // set name - [ret setKey:nname]; + [ret setKey:nName]; NSMutableArray *c = [NSMutableArray array]; [ret setContent:c]; @@ -111,15 +110,15 @@ // get first child treeKey->firstChild(); do { - NSString *subname = @""; + NSString *subName; // key encoding depends on module encoding const char *textStr = treeKey->getText(); - subname = [NSString stringWithUTF8String:textStr]; - if(!subname) { - subname = [NSString stringWithCString:textStr encoding:NSISOLatin1StringEncoding]; + subName = [NSString stringWithUTF8String:textStr]; + if(!subName) { + subName = [NSString stringWithCString:textStr encoding:NSISOLatin1StringEncoding]; } - if(subname) { - [c addObject:subname]; + if(subName) { + [c addObject:subName]; } } while(treeKey->nextSibling()); @@ -131,8 +130,8 @@ - (void)testLoop { SwordModuleTreeEntry *entry = [self treeEntryForKey:nil]; if([[entry content] count] > 0) { - for(NSString *subkey in [entry content]) { - entry = [self treeEntryForKey:subkey]; + for(NSString *subKey in [entry content]) { + entry = [self treeEntryForKey:subKey]; if([[entry content] count] > 0) { } else { DLog(@"Entry: %@", [entry key]); diff --git a/bindings/objc/src/SwordCommentary.h b/bindings/objc/src/SwordCommentary.h index 5177139..feaf619 100644 --- a/bindings/objc/src/SwordCommentary.h +++ b/bindings/objc/src/SwordCommentary.h @@ -11,8 +11,8 @@ General Public License for more details. (http://www.gnu.org/licenses/gpl.html) */ -#import -#import "SwordBible.h" +#import +#import #ifdef __cplusplus #include @@ -20,6 +20,8 @@ class sword::RawFiles; class sword::SWConfig; #endif + + @interface SwordCommentary : SwordBible { } diff --git a/bindings/objc/src/SwordCommentary.mm b/bindings/objc/src/SwordCommentary.mm index fee1a1a..3b81738 100644 --- a/bindings/objc/src/SwordCommentary.mm +++ b/bindings/objc/src/SwordCommentary.mm @@ -12,7 +12,6 @@ */ #import "SwordCommentary.h" -#import "Configuration.h" @implementation SwordCommentary @@ -35,20 +34,20 @@ ret = modPath; // create folder - [fm createDirectoryAtPath:modPath attributes:nil]; + [fm createDirectoryAtPath:modPath withIntermediateDirectories:NO attributes:nil error:NULL]; // create mods.d folder NSString *modsdPath = [modPath stringByAppendingPathComponent:@"mods.d"]; - [fm createDirectoryAtPath:modsdPath attributes:nil]; + [fm createDirectoryAtPath:modsdPath withIntermediateDirectories:NO attributes:nil error:NULL]; // create module folder NSString *dataPath = [modPath stringByAppendingPathComponent:@"modules"]; - [fm createDirectoryAtPath:dataPath attributes:nil]; + [fm createDirectoryAtPath:dataPath withIntermediateDirectories:NO attributes:nil error:NULL]; dataPath = [dataPath stringByAppendingPathComponent:@"comments"]; - [fm createDirectoryAtPath:dataPath attributes:nil]; + [fm createDirectoryAtPath:dataPath withIntermediateDirectories:NO attributes:nil error:NULL]; dataPath = [dataPath stringByAppendingPathComponent:@"rawfiles"]; - [fm createDirectoryAtPath:dataPath attributes:nil]; + [fm createDirectoryAtPath:dataPath withIntermediateDirectories:NO attributes:nil error:NULL]; dataPath = [dataPath stringByAppendingPathComponent:aName]; - [fm createDirectoryAtPath:dataPath attributes:nil]; + [fm createDirectoryAtPath:dataPath withIntermediateDirectories:NO attributes:nil error:NULL]; // let's create a brand new empty module sword::RawFiles::createModule([dataPath UTF8String]); diff --git a/bindings/objc/src/SwordDictionary.h b/bindings/objc/src/SwordDictionary.h index 77df1e2..6fea741 100644 --- a/bindings/objc/src/SwordDictionary.h +++ b/bindings/objc/src/SwordDictionary.h @@ -11,10 +11,9 @@ General Public License for more details. (http://www.gnu.org/licenses/gpl.html) */ -#import -#import "SwordModule.h" +#import -@class SwordManager; +@class SwordManager, SwordModule; @interface SwordDictionary : SwordModule { /** only keys are buffered here */ @@ -24,5 +23,4 @@ - (NSArray *)allKeys; - (NSString *)entryForKey:(NSString *)aKey; - @end diff --git a/bindings/objc/src/SwordDictionary.mm b/bindings/objc/src/SwordDictionary.mm index 2876e47..4924d00 100644 --- a/bindings/objc/src/SwordDictionary.mm +++ b/bindings/objc/src/SwordDictionary.mm @@ -11,9 +11,7 @@ General Public License for more details. (http://www.gnu.org/licenses/gpl.html) */ -#import "SwordDictionary.h" -#import "SwordModuleTextEntry.h" -#import "Configuration.h" +#import @interface SwordDictionary (/* Private, class continuation */) /** private property */ @@ -78,7 +76,7 @@ - (void)readFromCache { //open cached file NSString *cachePath = [[[Configuration config] defaultAppSupportPath] stringByAppendingPathComponent:[NSString stringWithFormat:@"cache-%@", [self name]]]; - NSMutableArray *data = [NSArray arrayWithContentsOfFile:cachePath]; + NSMutableArray *data = [NSMutableArray arrayWithContentsOfFile:cachePath]; if(data != nil) { self.keys = data; } else { @@ -156,8 +154,12 @@ } - (id)attributeValueForParsedLinkData:(NSDictionary *)data { - id ret = nil; + return [self attributeValueForParsedLinkData:data withTextRenderType:TextTypeStripped]; +} +- (id)attributeValueForParsedLinkData:(NSDictionary *)data withTextRenderType:(TextPullType)textType { + id ret = nil; + NSString *attrType = [data objectForKey:ATTRTYPE_TYPE]; if([attrType isEqualToString:@"scriptRef"] || [attrType isEqualToString:@"scripRef"] || diff --git a/bindings/objc/src/SwordFilter.h b/bindings/objc/src/SwordFilter.h new file mode 100644 index 0000000..590c550 --- /dev/null +++ b/bindings/objc/src/SwordFilter.h @@ -0,0 +1,61 @@ +// +// Created by mbergmann on 18.12.12. +// +// To change the template use AppCode | Preferences | File Templates. +// + + +#import + +#ifdef __cplusplus +#include +#endif + +@interface SwordFilter : NSObject + +#ifdef __cplusplus +- (id)initWithSWFilter:(sword::SWFilter *)swFilter; +- (sword::SWFilter *)swFilter; +#endif + +@end + +@interface SwordOsisHtmlRefFilter : SwordFilter ++ (SwordOsisHtmlRefFilter *)filter; +@end + +@interface SwordOsisPlainFilter : SwordFilter ++ (SwordOsisPlainFilter *)filter; +@end + +@interface SwordOsisXHtmlFilter : SwordFilter ++ (SwordOsisXHtmlFilter *)filter; +@end + +@interface SwordThmlHtmlFilter : SwordFilter ++ (SwordThmlHtmlFilter *)filter; +@end + +@interface SwordThmlPlainFilter : SwordFilter ++ (SwordThmlPlainFilter *)filter; +@end + +@interface SwordGbfHtmlFilter : SwordFilter ++ (SwordGbfHtmlFilter *)filter; +@end + +@interface SwordGbfPlainFilter : SwordFilter ++ (SwordGbfPlainFilter *)filter; +@end + +@interface SwordTeiHtmlFilter : SwordFilter ++ (SwordTeiHtmlFilter *)filter; +@end + +@interface SwordTeiXHtmlFilter : SwordFilter ++ (SwordTeiXHtmlFilter *)filter; +@end + +@interface SwordTeiPlainFilter : SwordFilter ++ (SwordTeiPlainFilter *)filter; +@end diff --git a/bindings/objc/src/SwordFilter.mm b/bindings/objc/src/SwordFilter.mm new file mode 100644 index 0000000..7d609bc --- /dev/null +++ b/bindings/objc/src/SwordFilter.mm @@ -0,0 +1,142 @@ +// +// Created by mbergmann on 18.12.12. +// +// To change the template use AppCode | Preferences | File Templates. +// + + +#import "SwordFilter.h" +#import "osishtmlhref.h" +#import "osisplain.h" +#import "osisxhtml.h" +#import "thmlhtmlhref.h" +#import "thmlplain.h" +#import "gbfhtmlhref.h" +#import "gbfplain.h" +#import "teihtmlhref.h" +#import "teixhtml.h" +#import "teiplain.h" + +@implementation SwordFilter { + sword::SWFilter *swFilter; +} + +- (id)initWithSWFilter:(sword::SWFilter *)swFilter1 { + self = [super init]; + if (self) { + swFilter = swFilter1; + } + + return self; +} + +- (void)dealloc { + [super dealloc]; +} + +- (sword::SWFilter *)swFilter { + return swFilter; +} + +@end + +@implementation SwordOsisHtmlRefFilter ++ (SwordOsisHtmlRefFilter *)filter { + return [[[SwordOsisHtmlRefFilter alloc] init] autorelease]; +} + +- (id)init { + return [super initWithSWFilter:new sword::OSISHTMLHREF()]; +} +@end + +@implementation SwordOsisXHtmlFilter ++ (SwordOsisXHtmlFilter *)filter { + return [[[SwordOsisXHtmlFilter alloc] init] autorelease]; +} + +- (id)init { + return [super initWithSWFilter:new sword::OSISXHTML()]; +} +@end + +@implementation SwordOsisPlainFilter ++ (SwordOsisPlainFilter *)filter { + return [[[SwordOsisPlainFilter alloc] init] autorelease]; +} + +- (id)init { + return [super initWithSWFilter:new sword::OSISPlain()]; +} +@end + +@implementation SwordThmlHtmlFilter ++ (SwordThmlHtmlFilter *)filter { + return [[[SwordThmlHtmlFilter alloc] init] autorelease]; +} + +- (id)init { + return [super initWithSWFilter:new sword::ThMLHTMLHREF()]; +} +@end + +@implementation SwordThmlPlainFilter ++ (SwordThmlPlainFilter *)filter { + return [[[SwordThmlPlainFilter alloc] init] autorelease]; +} + +- (id)init { + return [super initWithSWFilter:new sword::ThMLPlain()]; +} +@end + +@implementation SwordGbfHtmlFilter ++ (SwordGbfHtmlFilter *)filter { + return [[[SwordGbfHtmlFilter alloc] init] autorelease]; +} + +- (id)init { + return [super initWithSWFilter:new sword::ThMLHTMLHREF()]; +} +@end + +@implementation SwordGbfPlainFilter ++ (SwordGbfPlainFilter *)filter { + return [[[SwordGbfPlainFilter alloc] init] autorelease]; +} + +- (id)init { + return [super initWithSWFilter:new sword::ThMLPlain()]; +} +@end + +@implementation SwordTeiHtmlFilter ++ (SwordTeiHtmlFilter *)filter { + return [[[SwordTeiHtmlFilter alloc] init] autorelease]; +} + +- (id)init { + return [super initWithSWFilter:new sword::TEIHTMLHREF()]; +} +@end + +@implementation SwordTeiXHtmlFilter ++ (SwordTeiXHtmlFilter *)filter { + return [[[SwordTeiXHtmlFilter alloc] init] autorelease]; +} + +- (id)init { + return [super initWithSWFilter:new sword::TEIXHTML()]; +} +@end + +@implementation SwordTeiPlainFilter ++ (SwordTeiPlainFilter *)filter { + return [[[SwordTeiPlainFilter alloc] init] autorelease]; +} + +- (id)init { + return [super initWithSWFilter:new sword::TEIPlain()]; +} +@end + diff --git a/bindings/objc/src/SwordInstallSource.h b/bindings/objc/src/SwordInstallSource.h index c0f8659..1b1bdf3 100644 --- a/bindings/objc/src/SwordInstallSource.h +++ b/bindings/objc/src/SwordInstallSource.h @@ -6,7 +6,8 @@ // Copyright 2007 __MyCompanyName__. All rights reserved. // -#import +#import +#import "SwordModule.h" #ifdef __cplusplus #include @@ -15,7 +16,7 @@ class sword::SWModule; #endif @class SwordManager; -@class SwordInstallSourceController; +@class SwordInstallSourceManager; #define INSTALLSOURCE_TYPE_FTP @"FTP" @@ -25,10 +26,10 @@ class sword::SWModule; sword::InstallSource *swInstallSource; #endif - /** the sword manager for this source */ - SwordManager *swordManager; - BOOL temporarySource; + + /** the sword manager for this source */ + SwordManager *swordManager; } // init @@ -56,14 +57,20 @@ class sword::SWModule; // install module - (void)installModuleWithName:(NSString *)mName usingManager:(SwordManager *)swManager - withInstallController:(SwordInstallSourceController *)sim; + withInstallController:(SwordInstallSourceManager *)sim; -// list modules of this source +/** List of available InstallSources */ - (NSArray *)listModules; + +/** List of modules for given type */ +- (NSArray *)listModulesForType:(ModuleType)aType; + /** list module types */ - (NSArray *)listModuleTypes; -// get associated SwordManager + +/** Returns the SwordManager attached to this SwordInstallSourceController */ - (SwordManager *)swordManager; +- (void)setSwordManager:(SwordManager *)swManager; #ifdef __cplusplus - (sword::InstallSource *)installSource; diff --git a/bindings/objc/src/SwordInstallSource.mm b/bindings/objc/src/SwordInstallSource.mm index 5c2c9aa..b1f71d3 100644 --- a/bindings/objc/src/SwordInstallSource.mm +++ b/bindings/objc/src/SwordInstallSource.mm @@ -7,30 +7,17 @@ // #import "SwordInstallSource.h" -#import "SwordInstallSourceController.h" +#import "SwordInstallSourceManager.h" #import "SwordManager.h" -@interface SwordInstallSource (PrivateAPI) - -- (void)setSwordManager:(SwordManager *)swManager; - -@end - -@implementation SwordInstallSource (PrivateAPI) - -- (void)setSwordManager:(SwordManager *)swManager { - [swManager retain]; - [swordManager release]; - swordManager = swManager; -} +@interface SwordInstallSource () @end @implementation SwordInstallSource // init -- (id)init -{ +- (id)init { self = [super init]; if(self) { temporarySource = NO; @@ -75,7 +62,7 @@ - (void)finalize { if(temporarySource == NO) { - //LogL(LOG_DEBUG, @"[SwordInstallSource -finalize] deleting swInstalSource"); + //LogL(LOG_DEBUG, @"[SwordInstallSource -finalize] deleting swInstallSource"); //delete swInstallSource; } @@ -83,9 +70,16 @@ } - (void)dealloc { + [swordManager release]; [super dealloc]; } +- (void)setSwordManager:(SwordManager *)swManager { + [swManager retain]; + [swordManager release]; + swordManager = swManager; +} + // accessors - (NSString *)caption { const char *str = swInstallSource->caption; @@ -133,16 +127,14 @@ } /** install module */ -- (void)installModuleWithName:(NSString *)mName usingManager:(SwordManager *)swManager withInstallController:(SwordInstallSourceController *)sim { +- (void)installModuleWithName:(NSString *)mName usingManager:(SwordManager *)swManager withInstallController:(SwordInstallSourceManager *)sim { sword::InstallMgr *im = [sim installMgr]; im->installModule([swManager swManager], 0, [mName UTF8String], swInstallSource); } /** list all modules of this source */ - (NSArray *)listModules { - NSArray *ret = nil; - - DLog(@""); + NSArray *ret = [NSArray array]; SwordManager *sm = [self swordManager]; if(sm) { @@ -154,14 +146,23 @@ return ret; } +- (NSArray *)listModulesForType:(ModuleType)aType { + NSArray *ret = [NSArray array]; + + SwordManager *sm = [self swordManager]; + if(sm) { + ret = [sm modulesForType:aType]; + } else { + ALog(@"Have nil SwordManager"); + } + + return ret; +} + /** list module types */ - (NSArray *)listModuleTypes { - NSArray *ret = nil; - - DLog(@""); - ret = [SwordManager moduleTypes]; - - return ret; + NSArray *ret = [SwordManager moduleTypes]; + return ret; } // get associated SwordManager @@ -172,7 +173,7 @@ sword::SWMgr *mgr; if([[self source] isEqualToString:@"localhost"]) { // create SwordManager from new SWMgr of path - mgr = (sword::SWMgr *)new sword::SWMgr([[self directory] UTF8String], true, NULL, false, false); + mgr = new sword::SWMgr([[self directory] UTF8String], true, NULL, false, false); } else { // create SwordManager from the SWMgr of this source mgr = swInstallSource->getMgr(); diff --git a/bindings/objc/src/SwordInstallSourceController.h b/bindings/objc/src/SwordInstallSourceController.h deleted file mode 100644 index 1f5dda5..0000000 --- a/bindings/objc/src/SwordInstallSourceController.h +++ /dev/null @@ -1,101 +0,0 @@ -// -// SwordInstallManager.h -// Eloquent -// -// Created by Manfred Bergmann on 13.08.07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#ifdef __cplusplus -#include -#include -#include -#include -class sword::SWModule; -class sword::InstallMgr; -using sword::SWModule; -using sword::InstallMgr; -#endif - -@class SwordInstallSource; -@class SwordModule; -@class SwordManager; - -typedef enum _ModuleStatusConst { - ModStatOlder = 0x001, - ModStatSameVersion = 0x002, - ModStatUpdated = 0x004, - ModStatNew = 0x008, - ModStatCiphered = 0x010, - ModStatCipheredKeyPresent = 0x020 -}ModuleStatusConst; - -@interface SwordInstallSourceController : NSObject { -@private -#ifdef __cplusplus - sword::InstallMgr *swInstallMgr; -#endif - - BOOL createPath; - - NSString *configPath; - NSString *configFilePath; - - /** the dictionary holding the install sources. caption is the key */ - NSMutableDictionary *installSources; - NSMutableArray *installSourceList; -} - -// ------------------- getter / setter ------------------- -@property (retain, readwrite) NSString *configPath; -@property (retain, readwrite) NSString *configFilePath; -@property (retain, readwrite) NSMutableDictionary *installSources; -@property (retain, readwrite) NSMutableArray *installSourceList; - -// -------------------- methods -------------------- - -// initialization -+ (SwordInstallSourceController *)defaultController; - -/** -base path of the module installation - */ -- (id)init; -- (id)initWithPath:(NSString *)aPath createPath:(BOOL)create; - -/** re-init after adding or removing new modules */ -- (void)reinitialize; - -// installation/uninstallation -- (int)installModule:(SwordModule *)aModule fromSource:(SwordInstallSource *)is withManager:(SwordManager *)manager; -- (int)uninstallModule:(SwordModule *)aModule fromManager:(SwordManager *)swManager; - -// add/remove install sources -- (void)addInstallSource:(SwordInstallSource *)is; -- (void)addInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit; -- (void)removeInstallSource:(SwordInstallSource *)is; -- (void)removeInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit; -- (void)updateInstallSource:(SwordInstallSource *)is; -- (int)refreshMasterRemoteInstallSourceList; - -// disclaimer -- (BOOL)userDisclaimerConfirmed; -- (void)setUserDisclainerConfirmed:(BOOL)flag; - -// list modules in sources -- (NSArray *)listModulesForSource:(SwordInstallSource *)is; - -// remote source list -- (int)refreshInstallSource:(SwordInstallSource *)is; - -// get module status -- (NSArray *)moduleStatusInInstallSource:(SwordInstallSource *)is baseManager:(SwordManager *)baseMgr; - -// low level access -#ifdef __cplusplus -- (sword::InstallMgr *)installMgr; -#endif - -@end diff --git a/bindings/objc/src/SwordInstallSourceController.mm b/bindings/objc/src/SwordInstallSourceController.mm deleted file mode 100644 index 452c005..0000000 --- a/bindings/objc/src/SwordInstallSourceController.mm +++ /dev/null @@ -1,333 +0,0 @@ -// -// SwordInstallManager.mm -// Eloquent -// -// Created by Manfred Bergmann on 13.08.07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "SwordInstallSourceController.h" -#import "SwordInstallSource.h" -#import "SwordManager.h" -#import "SwordModule.h" - -#include "installmgr.h" -//#include "MyInstallMgr.h" - -#ifdef __cplusplus -typedef std::map InstallSourceMap; -typedef sword::multimapwithdefault > ConfigEntMap; -#endif - -#define INSTALLSOURCE_SECTION_TYPE_FTP "FTPSource" -#define INSTALLSOURCE_SECTION_TYPE_HTTP "HTTPSource" - -@implementation SwordInstallSourceController - -@dynamic configPath; -@synthesize configFilePath; -@synthesize installSources; -@synthesize installSourceList; - -// ------------------- getter / setter ------------------- -- (NSString *)configPath { - return configPath; -} - -- (void)setConfigPath:(NSString *)value { - DLog(@""); - - if(configPath != value) { - [configPath release]; - configPath = [value copy]; - - if(value != nil) { - // check for existence - NSFileManager *fm = [NSFileManager defaultManager]; - BOOL isDir; - if(([fm fileExistsAtPath:configPath] == NO) && createPath == YES) { - // create path - [fm createDirectoryAtPath:configPath attributes:nil]; - } - - if(([fm fileExistsAtPath:configPath isDirectory:&isDir] == YES) && (isDir)) { - // set configFilePath - [self setConfigFilePath:[configPath stringByAppendingPathComponent:@"InstallMgr.conf"]]; - - // check config - if([fm fileExistsAtPath:configFilePath] == NO) { - // create config entry - sword::SWConfig config([configFilePath cStringUsingEncoding:NSUTF8StringEncoding]); - config["General"]["PassiveFTP"] = "true"; - config.Save(); - - // create default Install source - SwordInstallSource *is = [[[SwordInstallSource alloc] initWithType:INSTALLSOURCE_TYPE_FTP] autorelease]; - [is setCaption:@"CrossWire"]; - [is setSource:@"ftp.crosswire.org"]; - [is setDirectory:@"/pub/sword/raw"]; - - // addInstallSource will reinitialize - [self addInstallSource:is]; - - } else { - // init installMgr - [self reinitialize]; - } - - // sync with master install source list - //[self refreshMasterRemoteInstallSourceList]; - - } else { - ALog(@"Config path does not exist: %@", configPath); - } - } - } -} - -// -------------------- methods -------------------- - -// initialization -+ (SwordInstallSourceController *)defaultController { - static SwordInstallSourceController *singleton; - if(singleton == nil) { - singleton = [[SwordInstallSourceController alloc] init]; - } - - return singleton; -} - -/** -base path of the module installation - */ -- (id)init { - self = [super init]; - if(self) { - createPath = NO; - [self setConfigPath:nil]; - [self setConfigFilePath:nil]; - [self setInstallSources:[NSMutableDictionary dictionary]]; - [self setInstallSourceList:[NSMutableArray array]]; - } - - return self; -} - -/** - initialize with given path - */ -- (id)initWithPath:(NSString *)aPath createPath:(BOOL)create { - self = [self init]; - if(self) { - createPath = create; - [self setConfigPath:aPath]; - } - - return self; -} - -/** re-init after adding or removing new modules */ -- (void)reinitialize { - sword::SWConfig config([configFilePath UTF8String]); - config.Load(); - - // init installMgr - BOOL disclaimerConfirmed = NO; - if(swInstallMgr != nil) { - disclaimerConfirmed = [self userDisclaimerConfirmed]; - } - swInstallMgr = new sword::InstallMgr([configPath UTF8String]); - if(swInstallMgr == nil) { - ALog(@"Could not initialize InstallMgr!"); - } else { - [self setUserDisclainerConfirmed:disclaimerConfirmed]; - - // empty all lists - [installSources removeAllObjects]; - [installSourceList removeAllObjects]; - - // init install sources - for(InstallSourceMap::iterator it = swInstallMgr->sources.begin(); it != swInstallMgr->sources.end(); it++) { - sword::InstallSource *sis = it->second; - SwordInstallSource *is = [[SwordInstallSource alloc] initWithSource:(id)sis]; - - [installSources setObject:is forKey:[is caption]]; - // also add to list - [installSourceList addObject:is]; - } - } -} - -- (void)finalize { - if(swInstallMgr != nil) { - delete swInstallMgr; - } - - [super finalize]; -} - -- (void)dealloc { - if(swInstallMgr != nil) { - delete swInstallMgr; - } - - [self setConfigPath:nil]; - [self setInstallSources:nil]; - [self setInstallSourceList:nil]; - [self setConfigFilePath:nil]; - - [super dealloc]; -} - -- (void)addInstallSource:(SwordInstallSource *)is { - [self addInstallSource:is withReinitialize:YES]; -} - -// add/remove install sources -- (void)addInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit { - - // save at once - sword::SWConfig config([configFilePath cStringUsingEncoding:NSUTF8StringEncoding]); - if([[is type] isEqualToString:INSTALLSOURCE_TYPE_FTP]) { - config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_FTP, [[is configEntry] UTF8String])); - } else { - config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_HTTP, [[is configEntry] UTF8String])); - } - config.Save(); - - if(reinit) - [self reinitialize]; -} - -- (void)removeInstallSource:(SwordInstallSource *)is { - [self removeInstallSource:is withReinitialize:NO]; -} - -- (void)removeInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit { - - // remove source - [installSources removeObjectForKey:[is caption]]; - [installSourceList removeObject:is]; - - // save at once - sword::SWConfig config([configFilePath cStringUsingEncoding:NSUTF8StringEncoding]); - config["Sources"].erase(INSTALLSOURCE_SECTION_TYPE_HTTP); - config["Sources"].erase(INSTALLSOURCE_SECTION_TYPE_FTP); - - // build up new - NSEnumerator *iter = [installSources objectEnumerator]; - SwordInstallSource *sis = nil; - while((sis = [iter nextObject])) { - if([[sis type] isEqualToString:INSTALLSOURCE_TYPE_FTP]) { - config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_FTP, [[sis configEntry] UTF8String])); - } else { - config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_HTTP, [[sis configEntry] UTF8String])); - } - } - config.Save(); - - if(reinit) - [self reinitialize]; -} - -- (void)updateInstallSource:(SwordInstallSource *)is { - // first remove, then add again - [self removeInstallSource:is withReinitialize:NO]; - [self addInstallSource:is]; -} - -// installation/uninstallation -- (int)installModule:(SwordModule *)aModule fromSource:(SwordInstallSource *)is withManager:(SwordManager *)manager { - - int stat = -1; - if([[is source] isEqualToString:@"localhost"]) { - stat = swInstallMgr->installModule([manager swManager], [[is directory] UTF8String], [[aModule name] UTF8String]); - } else { - stat = swInstallMgr->installModule([manager swManager], 0, [[aModule name] UTF8String], [is installSource]); - } - - return stat; -} - -- (int)refreshMasterRemoteInstallSourceList { - int stat = swInstallMgr->refreshRemoteSourceConfiguration(); - if(stat) { - ALog(@"Unable to refresh with master install source!"); - } - - return stat; -} - -/** - uninstalls a module from a SwordManager - */ -- (int)uninstallModule:(SwordModule *)aModule fromManager:(SwordManager *)swManager { - int stat = swInstallMgr->removeModule([swManager swManager], [[aModule name] UTF8String]); - - return stat; -} - -// list modules in sources -- (NSArray *)listModulesForSource:(SwordInstallSource *)is { - return [is listModules]; -} - -/** refresh modules of this source - refreshing the install source is necessary before installation of - */ -- (int)refreshInstallSource:(SwordInstallSource *)is { - int ret = 1; - - if(is == nil) { - ALog(@"Install source is nil"); - } else { - if([[is source] isEqualToString:@"localhost"] == NO) { - ret = swInstallMgr->refreshRemoteSource([is installSource]); - } - } - - return ret; -} - -/** - returns an array of Modules with status set, nil on error - */ -- (NSArray *)moduleStatusInInstallSource:(SwordInstallSource *)is baseManager:(SwordManager *)baseMgr { - - NSArray *ret = nil; - - // get modules map - NSMutableArray *ar = [NSMutableArray array]; - std::map modStats = swInstallMgr->getModuleStatus(*[baseMgr swManager], *[[is swordManager] swManager]); - sword::SWModule *module; - int status; - for(std::map::iterator it = modStats.begin(); it != modStats.end(); it++) { - module = it->first; - status = it->second; - - SwordModule *mod = [[SwordModule alloc] initWithSWModule:module]; - [mod setStatus:status]; - [ar addObject:mod]; - } - - if(ar) { - ret = [NSArray arrayWithArray:ar]; - } - - return ret; -} - -- (BOOL)userDisclaimerConfirmed { - return swInstallMgr->isUserDisclaimerConfirmed(); -} - -- (void)setUserDisclainerConfirmed:(BOOL)flag { - swInstallMgr->setUserDisclaimerConfirmed(flag); -} - -/** low level access */ -- (sword::InstallMgr *)installMgr { - return swInstallMgr; -} - -@end diff --git a/bindings/objc/src/SwordInstallSourceManager.h b/bindings/objc/src/SwordInstallSourceManager.h new file mode 100755 index 0000000..ee22c48 --- /dev/null +++ b/bindings/objc/src/SwordInstallSourceManager.h @@ -0,0 +1,99 @@ +// +// SwordInstallManager.h +// Eloquent +// +// Created by Manfred Bergmann on 13.08.07. +// Copyright 2007 __MyCompanyName__. All rights reserved. +// + +#import + +#ifdef __cplusplus +#include +#include +#include +#include +class sword::SWModule; +class sword::InstallMgr; +using sword::SWModule; +using sword::InstallMgr; +#endif + +@class SwordInstallSource; +@class SwordModule; +@class SwordManager; + +typedef enum _ModuleStatusConst { + ModStatOlder = 0x001, + ModStatSameVersion = 0x002, + ModStatUpdated = 0x004, + ModStatNew = 0x008, + ModStatCiphered = 0x010, + ModStatCipheredKeyPresent = 0x020 +}ModuleStatusConst; + +@interface SwordInstallSourceManager : NSObject { +@private +#ifdef __cplusplus + sword::InstallMgr *swInstallMgr; +#endif + + BOOL createPath; + + NSString *configPath; +} + +// ------------------- getter / setter ------------------- +@property (retain, readwrite) NSString *configPath; +@property (retain, readwrite) NSString *configFilePath; +@property (retain, readwrite) NSMutableArray *installSourceList; +/** Dictionary of InstallSources. Key: Caption */ +@property (retain, readwrite) NSMutableDictionary *installSources; + +// -------------------- methods -------------------- + +// initialization ++ (SwordInstallSourceManager *)defaultController; ++ (SwordInstallSourceManager *)defaultControllerWithPath:(NSString *)aPath; ++ (SwordInstallSourceManager *)controllerWithPath:(NSString *)aPath; + +/** +base path of the module installation + */ +- (id)init; +- (id)initWithPath:(NSString *)aPath createPath:(BOOL)create; + +/** re-init after adding or removing new modules */ +- (void)reinitialize; + +// installation/unInstallation +- (int)installModule:(SwordModule *)aModule fromSource:(SwordInstallSource *)is withManager:(SwordManager *)manager; +- (int)uninstallModule:(SwordModule *)aModule fromManager:(SwordManager *)swManager; + +// add/remove install sources +- (void)addInstallSource:(SwordInstallSource *)is; +- (void)addInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit; +- (void)removeInstallSource:(SwordInstallSource *)is; +- (void)removeInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit; +- (void)updateInstallSource:(SwordInstallSource *)is; +- (int)refreshMasterRemoteInstallSourceList; + +// disclaimer +- (BOOL)userDisclaimerConfirmed; +- (void)setUserDisclaimerConfirmed:(BOOL)flag; + +// list modules in sources +- (NSArray *)listModulesForSource:(SwordInstallSource *)is; + +// remote source list +- (int)refreshInstallSource:(SwordInstallSource *)is; + +// get module status +- (NSArray *)moduleStatusInInstallSource:(SwordInstallSource *)is baseManager:(SwordManager *)baseMgr; + +// low level access +#ifdef __cplusplus +- (sword::InstallMgr *)installMgr; +#endif + +@end diff --git a/bindings/objc/src/SwordInstallSourceManager.mm b/bindings/objc/src/SwordInstallSourceManager.mm new file mode 100755 index 0000000..98d6cac --- /dev/null +++ b/bindings/objc/src/SwordInstallSourceManager.mm @@ -0,0 +1,337 @@ +// +// SwordInstallManager.mm +// Eloquent +// +// Created by Manfred Bergmann on 13.08.07. +// Copyright 2007 __MyCompanyName__. All rights reserved. +// + +#import "SwordInstallSourceManager.h" +#import "SwordInstallSource.h" +#import "SwordManager.h" +#import "ObjCSword_Prefix.pch" + +#ifdef __cplusplus +typedef std::map InstallSourceMap; +typedef sword::multimapwithdefault > ConfigEntMap; +#endif + +#define INSTALLSOURCE_SECTION_TYPE_FTP "FTPSource" +#define INSTALLSOURCE_SECTION_TYPE_HTTP "HTTPSource" + +@implementation SwordInstallSourceManager + +@dynamic configPath; + +// ------------------- getter / setter ------------------- +- (NSString *)configPath { + return configPath; +} + +- (void)setConfigPath:(NSString *)value { + DLog(@""); + + if(configPath != value) { + [configPath release]; + configPath = [value copy]; + + if(value == nil) { + return; + } + + + // check for existence + NSFileManager *fm = [NSFileManager defaultManager]; + BOOL isDir; + if(([fm fileExistsAtPath:configPath] == NO) && createPath == YES) { + // create path + [fm createDirectoryAtPath:configPath withIntermediateDirectories:NO attributes:nil error:NULL]; + } + + if(([fm fileExistsAtPath:configPath isDirectory:&isDir] == YES) && (isDir)) { + // set configFilePath + [self setConfigFilePath:[configPath stringByAppendingPathComponent:@"InstallMgr.conf"]]; + + // check config + if([fm fileExistsAtPath:self.configFilePath] == NO) { + // create config entry + sword::SWConfig config([self.configFilePath cStringUsingEncoding:NSUTF8StringEncoding]); + config["General"]["PassiveFTP"] = "true"; + config.Save(); + + // create default Install source + SwordInstallSource *is = [[[SwordInstallSource alloc] initWithType:INSTALLSOURCE_TYPE_FTP] autorelease]; + [is setCaption:@"CrossWire"]; + [is setSource:@"ftp.crosswire.org"]; + [is setDirectory:@"/pub/sword/raw"]; + + // addInstallSource will reinitialize + [self addInstallSource:is withReinitialize:NO]; + + } + // init installMgr + [self reinitialize]; + + // sync with master install source list + //[self refreshMasterRemoteInstallSourceList]; + + } else { + ALog(@"Config path does not exist: %@", configPath); + } + } +} + +// -------------------- methods -------------------- + +// initialization ++ (SwordInstallSourceManager *)defaultController { + static SwordInstallSourceManager *singleton = nil; + if(singleton == nil) { + singleton = [[SwordInstallSourceManager alloc] init]; + } + + return singleton; +} + ++ (SwordInstallSourceManager *)defaultControllerWithPath:(NSString *)aPath { + SwordInstallSourceManager *m = [SwordInstallSourceManager defaultController]; + [m setConfigPath:aPath]; + return m; +} + ++ (SwordInstallSourceManager *)controllerWithPath:(NSString *)aPath { + return [[[SwordInstallSourceManager alloc] initWithPath:aPath createPath:YES] autorelease]; +} + +/** +base path of the module installation + */ +- (id)init { + self = [super init]; + if(self) { + createPath = NO; + [self setConfigPath:nil]; + [self setConfigFilePath:nil]; + [self setInstallSources:[NSMutableDictionary dictionary]]; + [self setInstallSourceList:[NSMutableArray array]]; + } + + return self; +} + +/** + initialize with given path + */ +- (id)initWithPath:(NSString *)aPath createPath:(BOOL)create { + self = [self init]; + if(self) { + createPath = create; + [self setConfigPath:aPath]; + } + + return self; +} + +/** re-init after adding or removing new modules */ +- (void)reinitialize { + sword::SWConfig config([self.configFilePath UTF8String]); + config.Load(); + + // init installMgr + BOOL disclaimerConfirmed = NO; + if(swInstallMgr != nil) { + disclaimerConfirmed = [self userDisclaimerConfirmed]; + } + swInstallMgr = new sword::InstallMgr([configPath UTF8String]); + if(swInstallMgr == nil) { + ALog(@"Could not initialize InstallMgr!"); + } else { + [self setUserDisclaimerConfirmed:disclaimerConfirmed]; + + // empty all lists + [self.installSources removeAllObjects]; + [self.installSourceList removeAllObjects]; + + // init install sources + for(InstallSourceMap::iterator it = swInstallMgr->sources.begin(); it != swInstallMgr->sources.end(); it++) { + sword::InstallSource *sis = it->second; + SwordInstallSource *is = [[[SwordInstallSource alloc] initWithSource:sis] autorelease]; + + [self.installSources setObject:is forKey:[is caption]]; + // also add to list + [self.installSourceList addObject:is]; + } + } +} + +- (void)finalize { + if(swInstallMgr != nil) { + delete swInstallMgr; + } + + [super finalize]; +} + +- (void)dealloc { + if(swInstallMgr != nil) { + delete swInstallMgr; + } + + [self setConfigPath:nil]; + [self setInstallSources:nil]; + [self setInstallSourceList:nil]; + [self setConfigFilePath:nil]; + + [super dealloc]; +} + +- (void)addInstallSource:(SwordInstallSource *)is { + [self addInstallSource:is withReinitialize:YES]; +} + +// add/remove install sources +- (void)addInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit { + + // save at once + sword::SWConfig config([self.configFilePath cStringUsingEncoding:NSUTF8StringEncoding]); + if([[is type] isEqualToString:INSTALLSOURCE_TYPE_FTP]) { + config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_FTP, [[is configEntry] UTF8String])); + } else { + config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_HTTP, [[is configEntry] UTF8String])); + } + config.Save(); + + if(reinit) + [self reinitialize]; +} + +- (void)removeInstallSource:(SwordInstallSource *)is { + [self removeInstallSource:is withReinitialize:NO]; +} + +- (void)removeInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit { + + // remove source + [self.installSources removeObjectForKey:[is caption]]; + [self.installSourceList removeObject:is]; + + // save at once + sword::SWConfig config([self.configFilePath cStringUsingEncoding:NSUTF8StringEncoding]); + config["Sources"].erase(INSTALLSOURCE_SECTION_TYPE_HTTP); + config["Sources"].erase(INSTALLSOURCE_SECTION_TYPE_FTP); + + // build up new + for(SwordInstallSource *sis in self.installSources) { + if([[sis type] isEqualToString:INSTALLSOURCE_TYPE_FTP]) { + config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_FTP, [[sis configEntry] UTF8String])); + } else { + config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_HTTP, [[sis configEntry] UTF8String])); + } + } + config.Save(); + + if(reinit) + [self reinitialize]; +} + +- (void)updateInstallSource:(SwordInstallSource *)is { + // first remove, then add again + [self removeInstallSource:is withReinitialize:NO]; + [self addInstallSource:is]; +} + +// installation/unInstallation +- (int)installModule:(SwordModule *)aModule fromSource:(SwordInstallSource *)is withManager:(SwordManager *)manager { + + int stat; + if([[is source] isEqualToString:@"localhost"]) { + stat = swInstallMgr->installModule([manager swManager], [[is directory] UTF8String], [[aModule name] UTF8String]); + } else { + stat = swInstallMgr->installModule([manager swManager], 0, [[aModule name] UTF8String], [is installSource]); + } + + return stat; +} + +- (int)refreshMasterRemoteInstallSourceList { + int stat = swInstallMgr->refreshRemoteSourceConfiguration(); + if(stat) { + ALog(@"Unable to refresh with master install source!"); + } + + return stat; +} + +/** + uninstalls a module from a SwordManager + */ +- (int)uninstallModule:(SwordModule *)aModule fromManager:(SwordManager *)swManager { + int stat = swInstallMgr->removeModule([swManager swManager], [[aModule name] UTF8String]); + + return stat; +} + +// list modules in sources +- (NSArray *)listModulesForSource:(SwordInstallSource *)is { + return [is listModules]; +} + +/** refresh modules of this source + refreshing the install source is necessary before installation of + */ +- (int)refreshInstallSource:(SwordInstallSource *)is { + int ret = 1; + + if(is == nil) { + ALog(@"Install source is nil"); + } else { + if([[is source] isEqualToString:@"localhost"] == NO) { + ret = swInstallMgr->refreshRemoteSource([is installSource]); + } + } + + return ret; +} + +/** + returns an array of Modules with status set, nil on error + */ +- (NSArray *)moduleStatusInInstallSource:(SwordInstallSource *)is baseManager:(SwordManager *)baseMgr { + + NSArray *ret = nil; + + // get modules map + NSMutableArray *ar = [NSMutableArray array]; + std::map modStats = swInstallMgr->getModuleStatus(*[baseMgr swManager], *[[is swordManager] swManager]); + sword::SWModule *module; + int status; + for(std::map::iterator it = modStats.begin(); it != modStats.end(); it++) { + module = it->first; + status = it->second; + + SwordModule *mod = [[[SwordModule alloc] initWithSWModule:module] autorelease]; + [mod setStatus:status]; + [ar addObject:mod]; + } + + if(ar) { + ret = [NSArray arrayWithArray:ar]; + } + + return ret; +} + +- (BOOL)userDisclaimerConfirmed { + return swInstallMgr->isUserDisclaimerConfirmed(); +} + +- (void)setUserDisclaimerConfirmed:(BOOL)flag { + swInstallMgr->setUserDisclaimerConfirmed(flag); +} + +/** low level access */ +- (sword::InstallMgr *)installMgr { + return swInstallMgr; +} + +@end diff --git a/bindings/objc/src/SwordKey.h b/bindings/objc/src/SwordKey.h index 9761bda..caa4f35 100644 --- a/bindings/objc/src/SwordKey.h +++ b/bindings/objc/src/SwordKey.h @@ -6,7 +6,7 @@ // Copyright 2009 Software by MABE. All rights reserved. // -#import +#import #ifdef __cplusplus #include @@ -19,20 +19,20 @@ BOOL created; } -+ (id)swordKey; -+ (id)swordKeyWithRef:(NSString *)aRef; ++ (SwordKey *)swordKey; ++ (SwordKey *)swordKeyWithRef:(NSString *)aRef; #ifdef __cplusplus -+ (id)swordKeyWithSWKey:(sword::SWKey *)aSk; -+ (id)swordKeyWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy; -- (id)initWithSWKey:(sword::SWKey *)aSk; -- (id)initWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy; ++ (SwordKey *)swordKeyWithSWKey:(sword::SWKey *)aSk; ++ (SwordKey *)swordKeyWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy; +- (SwordKey *)initWithSWKey:(sword::SWKey *)aSk; +- (SwordKey *)initWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy; - (sword::SWKey *)swKey; #endif -- (id)initWithRef:(NSString *)aRef; +- (SwordKey *)initWithRef:(NSString *)aRef; -- (id)clone; +- (SwordKey *)clone; - (void)setPersist:(BOOL)flag; - (BOOL)persist; diff --git a/bindings/objc/src/SwordKey.mm b/bindings/objc/src/SwordKey.mm index 2417e93..5254443 100644 --- a/bindings/objc/src/SwordKey.mm +++ b/bindings/objc/src/SwordKey.mm @@ -11,19 +11,19 @@ @implementation SwordKey -+ (id)swordKey { ++ (SwordKey *)swordKey { return [[[SwordKey alloc] init] autorelease]; } -+ (id)swordKeyWithRef:(NSString *)aRef { ++ (SwordKey *)swordKeyWithRef:(NSString *)aRef { return [[[SwordKey alloc] initWithRef:aRef] autorelease]; } -+ (id)swordKeyWithSWKey:(sword::SWKey *)aSk { ++ (SwordKey *)swordKeyWithSWKey:(sword::SWKey *)aSk { return [[[SwordKey alloc] initWithSWKey:aSk] autorelease]; } -+ (id)swordKeyWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy { ++ (SwordKey *)swordKeyWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy { return [[[SwordKey alloc] initWithSWKey:aSk makeCopy:copy] autorelease]; } @@ -31,11 +31,11 @@ return [self initWithRef:nil]; } -- (id)initWithSWKey:(sword::SWKey *)aSk { +- (SwordKey *)initWithSWKey:(sword::SWKey *)aSk { return [self initWithSWKey:aSk makeCopy:NO]; } -- (id)initWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy { +- (SwordKey *)initWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy { self = [super init]; if(self) { if(copy) { @@ -53,7 +53,7 @@ return self; } -- (id)initWithRef:(NSString *)aRef { +- (SwordKey *)initWithRef:(NSString *)aRef { self = [super init]; if(self) { sk = new sword::SWKey([aRef UTF8String]); @@ -79,7 +79,7 @@ [super dealloc]; } -- (id)clone { +- (SwordKey *)clone { return [SwordKey swordKeyWithSWKey:sk]; } diff --git a/bindings/objc/src/SwordListKey.h b/bindings/objc/src/SwordListKey.h index 0ce68ac..043ea81 100644 --- a/bindings/objc/src/SwordListKey.h +++ b/bindings/objc/src/SwordListKey.h @@ -6,7 +6,7 @@ // Copyright 2009 __MyCompanyName__. All rights reserved. // -#import +#import #import "SwordKey.h" #ifdef __cplusplus @@ -15,31 +15,32 @@ #endif @class SwordBible, VerseEnumerator; +@class SwordVerseKey; @interface SwordListKey : SwordKey { } -+ (id)listKeyWithRef:(NSString *)aRef; -+ (id)listKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme; -+ (id)listKeyWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme; ++ (SwordListKey *)listKeyWithRef:(NSString *)aRef; ++ (SwordListKey *)listKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme; ++ (SwordListKey *)listKeyWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme; #ifdef __cplusplus -+ (id)listKeyWithSWListKey:(sword::ListKey *)aLk; -+ (id)listKeyWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy; -- (id)initWithSWListKey:(sword::ListKey *)aLk; -- (id)initWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy; ++ (SwordListKey *)listKeyWithSWListKey:(sword::ListKey *)aLk; ++ (SwordListKey *)listKeyWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy; +- (SwordListKey *)initWithSWListKey:(sword::ListKey *)aLk; +- (SwordListKey *)initWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy; - (sword::ListKey *)swListKey; #endif -- (id)initWithRef:(NSString *)aRef; -- (id)initWithRef:(NSString *)aRef v11n:(NSString *)scheme; -- (id)initWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme; +- (SwordListKey *)initWithRef:(NSString *)aRef; +- (SwordListKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme; +- (SwordListKey *)initWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme; - (void)parse; - (void)parseWithHeaders; - (VerseEnumerator *)verseEnumerator; - (NSInteger)numberOfVerses; -- (BOOL)containsKey:(SwordKey *)aVerseKey; +- (BOOL)containsKey:(SwordVerseKey *)aVerseKey; @end diff --git a/bindings/objc/src/SwordListKey.mm b/bindings/objc/src/SwordListKey.mm index 161c6aa..07aa8f8 100644 --- a/bindings/objc/src/SwordListKey.mm +++ b/bindings/objc/src/SwordListKey.mm @@ -6,33 +6,27 @@ // Copyright 2009 __MyCompanyName__. All rights reserved. // -#import "SwordListKey.h" -#import "SwordBible.h" -#import "SwordVerseKey.h" -#import "VerseEnumerator.h" - -@interface SwordListKey () -@end +#import @implementation SwordListKey -+ (id)listKeyWithRef:(NSString *)aRef { ++ (SwordListKey *)listKeyWithRef:(NSString *)aRef { return [[[SwordListKey alloc] initWithRef:aRef] autorelease]; } -+ (id)listKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme { ++ (SwordListKey *)listKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme { return [[[SwordListKey alloc] initWithRef:aRef v11n:scheme] autorelease]; } -+ (id)listKeyWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme { ++ (SwordListKey *)listKeyWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme { return [[[SwordListKey alloc] initWithRef:aRef headings:headings v11n:scheme] autorelease]; } -+ (id)listKeyWithSWListKey:(sword::ListKey *)aLk { ++ (SwordListKey *)listKeyWithSWListKey:(sword::ListKey *)aLk { return [[[SwordListKey alloc] initWithSWListKey:aLk] autorelease]; } -+ (id)listKeyWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy { ++ (SwordListKey *)listKeyWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy { return [[[SwordListKey alloc] initWithSWListKey:aLk makeCopy:copy] autorelease]; } @@ -40,23 +34,23 @@ return [super init]; } -- (id)initWithSWListKey:(sword::ListKey *)aLk { - return [super initWithSWKey:aLk]; +- (SwordListKey *)initWithSWListKey:(sword::ListKey *)aLk { + return (SwordListKey *) [super initWithSWKey:aLk]; } -- (id)initWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy { - return [super initWithSWKey:aLk makeCopy:copy]; +- (SwordListKey *)initWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy { + return (SwordListKey *) [super initWithSWKey:aLk makeCopy:copy]; } -- (id)initWithRef:(NSString *)aRef { +- (SwordListKey *)initWithRef:(NSString *)aRef { return [self initWithRef:aRef v11n:nil]; } -- (id)initWithRef:(NSString *)aRef v11n:(NSString *)scheme { +- (SwordListKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme { return [self initWithRef:aRef headings:NO v11n:scheme]; } -- (id)initWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme { +- (SwordListKey *)initWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme { sword::VerseKey vk; vk.Headings((char)headings); if(scheme) { @@ -64,7 +58,7 @@ } sword::ListKey listKey = vk.ParseVerseList([aRef UTF8String], "gen", true); sword::ListKey *lk = new sword::ListKey(listKey); - return [super initWithSWKey:lk]; + return (SwordListKey *) [super initWithSWKey:lk]; } - (void)finalize { @@ -90,7 +84,6 @@ } - (void)parseWithHeaders { - } - (VerseEnumerator *)verseEnumerator { @@ -99,12 +92,10 @@ - (BOOL)containsKey:(SwordVerseKey *)aVerseKey { BOOL ret = NO; - if(sk) { *sk = [[aVerseKey osisRef] UTF8String]; ret = !sk->Error(); } - return ret; } diff --git a/bindings/objc/src/SwordLocaleManager.h b/bindings/objc/src/SwordLocaleManager.h index ab4395f..dd67a13 100644 --- a/bindings/objc/src/SwordLocaleManager.h +++ b/bindings/objc/src/SwordLocaleManager.h @@ -6,7 +6,7 @@ // Copyright 2010 Software by MABE. All rights reserved. // -#import +#import @interface SwordLocaleManager : NSObject { } @@ -15,8 +15,14 @@ /** Initializes the global locale system. - Any created instance that needs localozed information will use it. + Any created instance that needs localized information will use it. */ - (void)initLocale; +/** + Initializes global locale system. + Loads the locale (locale.d) folder from the specified path. + */ +- (void)initLocaleWithLocaledPath:(NSString *)aPath; + @end diff --git a/bindings/objc/src/SwordLocaleManager.mm b/bindings/objc/src/SwordLocaleManager.mm index 582eee5..18e4eba 100644 --- a/bindings/objc/src/SwordLocaleManager.mm +++ b/bindings/objc/src/SwordLocaleManager.mm @@ -14,7 +14,7 @@ @implementation SwordLocaleManager + (SwordLocaleManager *)defaultManager { - static SwordLocaleManager *instance; + static SwordLocaleManager *instance = nil; if(instance == nil) { // use default path instance = [[SwordLocaleManager alloc] init]; @@ -27,23 +27,27 @@ // set locale swManager NSString *resourcePath = [[NSBundle bundleForClass:[SwordLocaleManager class]] resourcePath]; NSString *localePath = [resourcePath stringByAppendingPathComponent:@"locales.d"]; + [self initLocaleWithLocaledPath:localePath]; +} + +- (void)initLocaleWithLocaledPath:(NSString *)aPath { sword::LocaleMgr *lManager = sword::LocaleMgr::getSystemLocaleMgr(); - lManager->loadConfigDir([localePath UTF8String]); + lManager->loadConfigDir([aPath UTF8String]); //get the language NSArray *availLocales = [NSLocale preferredLanguages]; NSString *lang = nil; - NSString *loc = nil; + NSString *loc; BOOL haveLocale = NO; // for every language, check if we know the locales - sword::StringList localelist = lManager->getAvailableLocales(); + sword::StringList localeList = lManager->getAvailableLocales(); NSEnumerator *iter = [availLocales objectEnumerator]; while((loc = [iter nextObject]) && !haveLocale) { // check if this locale is available in SWORD sword::StringList::iterator it; sword::SWBuf locale; - for(it = localelist.begin(); it != localelist.end(); ++it) { + for(it = localeList.begin(); it != localeList.end(); ++it) { locale = *it; NSString *swLoc = [NSString stringWithCString:locale.c_str() encoding:NSUTF8StringEncoding]; if([swLoc hasPrefix:loc]) { @@ -56,7 +60,7 @@ if(haveLocale) { lManager->setDefaultLocaleName([lang UTF8String]); - } + } } @end diff --git a/bindings/objc/src/SwordManager.h b/bindings/objc/src/SwordManager.h index 571a7cc..daf8ece 100644 --- a/bindings/objc/src/SwordManager.h +++ b/bindings/objc/src/SwordManager.h @@ -17,14 +17,6 @@ #ifdef __cplusplus #include // C++ Sword API #include -#include -// Filters -#include -#include -#include -#include -#include -#include #include class sword::SWModule; #endif @@ -110,13 +102,12 @@ class sword::SWModule; // CipherKeys NSUserdefaultsKey #define DefaultsModuleCipherKeysKey @"DefaultsModuleCipherKeysKey" - @interface SwordManager : NSObject { #ifdef __cplusplus sword::SWMgr *swManager; - sword::SWFilter *plainFilter, *thmlFilter, *gbfFilter, *osisFilter, *teiFilter; - sword::SWFilter *thmlStripFilter, *gbfStripFilter, *osisStripFilter; + SwordFilter *plainFilter, *thmlFilter, *gbfFilter, *osisFilter, *teiFilter; + SwordFilter *thmlStripFilter, *gbfStripFilter, *osisStripFilter, *teiStripFilter; #endif NSDictionary *modules; @@ -134,7 +125,7 @@ class sword::SWModule; // --------------------- methods ----------------------- /** - Conveniance initializer. Creates an instance of SwordManager for a given module path. + Convenience initializer. Creates an instance of SwordManager for a given module path. Internally -initWithPath: is called. */ + (SwordManager *)managerWithPath:(NSString*)path; @@ -147,30 +138,23 @@ class sword::SWModule; + (SwordManager *)defaultManager; /** - Retreve a list of known module types. + Retrieve a list of known module types. See SWMOD_CATEGORY_* */ + (NSArray *)moduleTypes; -/** - Rendered Module text that has links. - This method will return a dictionary with attribute/value pairs from parameters of the link. - See ATTRTYPE_* for key types. - */ -+ (NSDictionary *)linkDataForLinkURL:(NSURL *)aURL; - /** Initializes this manager for the given module path. */ - (id)initWithPath:(NSString *)path; /** - Add an additional path to the manager to aument more modules. + Add an additional path to the manager to augment more modules. */ -- (void)addPath:(NSString*)path; +- (void)addModulesPath:(NSString*)path; /** - reinit - reloads all modules, filters and such + re-init - reloads all modules, filters and such This will be triggered if new module had been installed in the module installer. */ - (void)reInit; @@ -226,13 +210,14 @@ class sword::SWModule; - (NSArray *)modulesForCategory:(ModuleCategory)cat; #ifdef __cplusplus -- (id)initWithSWMgr:(sword::SWMgr *)smgr; +- (id)initWithSWMgr:(sword::SWMgr *)swMgr; - (sword::SWModule *)getSWModuleWithName:(NSString *)moduleName; /** Returns the underlying sword::SWMgr instance */ - (sword::SWMgr *)swManager; + #endif @end diff --git a/bindings/objc/src/SwordManager.mm b/bindings/objc/src/SwordManager.mm index a2e8793..c2962fb 100644 --- a/bindings/objc/src/SwordManager.mm +++ b/bindings/objc/src/SwordManager.mm @@ -11,22 +11,13 @@ General Public License for more details. (http://www.gnu.org/licenses/gpl.html) */ -#import "SwordManager.h" -#import "Configuration.h" -#include -#include - -#include "gbfplain.h" -#include "thmlplain.h" -#include "osisplain.h" +#import #import "Notifications.h" -#import "SwordBook.h" -#import "SwordModule.h" -#import "SwordBible.h" -#import "SwordCommentary.h" -#import "SwordDictionary.h" -#import "SwordListKey.h" -#import "SwordVerseKey.h" +#import "FilterProviderFactory.h" +#import "DefaultFilterProvider.h" + +#include "encfiltmgr.h" +#import "SwordFilter.h" using std::string; using std::list; @@ -34,7 +25,7 @@ using std::list; @interface SwordManager (PrivateAPI) - (void)refreshModules; -- (void)addFiltersToModule:(sword::SWModule *)mod; +- (void)addFiltersToModule:(SwordModule *)mod; @end @@ -52,13 +43,12 @@ using std::list; // temporary instance SwordModule *swMod = [SwordModule moduleForSWModule:mod]; NSString *type = [swMod typeString]; - NSString *name = [swMod name]; - + ModuleType aType = [SwordModule moduleTypeForModuleTypeString:type]; - SwordModule *sm = [SwordModule moduleForType:aType andName:name swModule:mod swordManager:self]; - [dict setObject:sm forKey:[sm name]]; - - [self addFiltersToModule:mod]; + SwordModule *sm = [SwordModule moduleForType:aType swModule:mod swordManager:self]; + [dict setObject:sm forKey:[[sm name] lowercaseString]]; + + [self addFiltersToModule:sm]; } } @@ -66,51 +56,58 @@ using std::list; self.modules = dict; } -- (void)addFiltersToModule:(sword::SWModule *)mod { +- (void)addFiltersToModule:(SwordModule *)mod { // prepare display filters - switch(mod->Markup()) { + + id filterProvider = [[FilterProviderFactory providerFactory] get]; + + switch([mod swModule]->Markup()) { case sword::FMT_GBF: if(!gbfFilter) { - gbfFilter = new sword::GBFHTMLHREF(); + gbfFilter = [filterProvider newGbfRenderFilter]; } if(!gbfStripFilter) { - gbfStripFilter = new sword::GBFPlain(); + gbfStripFilter = [filterProvider newGbfPlainFilter]; } - mod->AddRenderFilter(gbfFilter); - mod->AddStripFilter(gbfStripFilter); + [mod addRenderFilter:gbfFilter]; + [mod addStripFilter:gbfStripFilter]; break; case sword::FMT_THML: if(!thmlFilter) { - thmlFilter = new sword::ThMLHTMLHREF(); + thmlFilter = [filterProvider newThmlRenderFilter]; } if(!thmlStripFilter) { - thmlStripFilter = new sword::ThMLPlain(); + thmlStripFilter = [filterProvider newThmlPlainFilter]; } - mod->AddRenderFilter(thmlFilter); - mod->AddStripFilter(thmlStripFilter); + [mod addRenderFilter:thmlFilter]; + [mod addStripFilter:thmlStripFilter]; break; case sword::FMT_OSIS: if(!osisFilter) { - osisFilter = new sword::OSISHTMLHREF(); + osisFilter = [filterProvider newOsisRenderFilter]; } if(!osisStripFilter) { - osisStripFilter = new sword::OSISPlain(); + osisStripFilter = [filterProvider newOsisPlainFilter]; } - mod->AddRenderFilter(osisFilter); - mod->AddStripFilter(osisStripFilter); + [mod addRenderFilter:osisFilter]; + [mod addStripFilter:osisStripFilter]; break; case sword::FMT_TEI: if(!teiFilter) { - teiFilter = new sword::TEIHTMLHREF(); + teiFilter = [filterProvider newTeiRenderFilter]; + } + if(!teiStripFilter) { + teiStripFilter = [filterProvider newTeiPlainFilter]; } - mod->AddRenderFilter(teiFilter); + [mod addRenderFilter:teiFilter]; + [mod addStripFilter:teiStripFilter]; break; case sword::FMT_PLAIN: default: if(!plainFilter) { - plainFilter = new sword::PLAINHTML(); + plainFilter = [filterProvider newHtmlPlainFilter]; } - mod->AddRenderFilter(plainFilter); + [mod addRenderFilter:plainFilter]; break; } } @@ -126,56 +123,6 @@ using std::list; # pragma mark - class methods -+ (NSDictionary *)linkDataForLinkURL:(NSURL *)aURL { - NSMutableDictionary *ret = [NSMutableDictionary dictionary]; - - NSString *scheme = [aURL scheme]; - if([scheme isEqualToString:@"sword"]) { - // in this case host is the module and path the reference - [ret setObject:[aURL host] forKey:ATTRTYPE_MODULE]; - [ret setObject:[[[aURL path] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] - stringByReplacingOccurrencesOfString:@"/" withString:@""] - forKey:ATTRTYPE_VALUE]; - [ret setObject:@"scriptRef" forKey:ATTRTYPE_TYPE]; - [ret setObject:@"showRef" forKey:ATTRTYPE_ACTION]; - } else if([scheme isEqualToString:@"applewebdata"]) { - // in this case - NSString *path = [aURL path]; - NSString *query = [aURL query]; - if([[path lastPathComponent] isEqualToString:@"passagestudy.jsp"]) { - NSArray *data = [query componentsSeparatedByString:@"&"]; - NSString *type = @"x"; - NSString *module = @""; - NSString *passage = @""; - NSString *value = @"1"; - NSString *action = @""; - for(NSString *entry in data) { - if([entry hasPrefix:@"type="]) { - type = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; - } else if([entry hasPrefix:@"module="]) { - module = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; - } else if([entry hasPrefix:@"passage="]) { - passage = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; - } else if([entry hasPrefix:@"action="]) { - action = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; - } else if([entry hasPrefix:@"value="]) { - value = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; - } else { - ALog(@"Unknown parameter: %@", entry); - } - } - - [ret setObject:module forKey:ATTRTYPE_MODULE]; - [ret setObject:passage forKey:ATTRTYPE_PASSAGE]; - [ret setObject:value forKey:ATTRTYPE_VALUE]; - [ret setObject:action forKey:ATTRTYPE_ACTION]; - [ret setObject:type forKey:ATTRTYPE_TYPE]; - } - } - - return ret; -} - + (NSArray *)moduleTypes { return [NSArray arrayWithObjects: SWMOD_TYPES_BIBLES, @@ -190,7 +137,7 @@ using std::list; } + (SwordManager *)defaultManager { - static SwordManager *instance; + static SwordManager *instance = nil; if(instance == nil) { // use default path instance = [[SwordManager alloc] initWithPath:[[Configuration config] defaultModulePath]]; @@ -208,7 +155,7 @@ using std::list; self.modulesPath = path; self.modules = [NSDictionary dictionary]; - self.managerLock = [[NSRecursiveLock alloc] init]; + self.managerLock = (NSLock *)[[[NSRecursiveLock alloc] init] autorelease]; [self reInit]; @@ -230,7 +177,7 @@ using std::list; temporaryManager = YES; self.modules = [NSDictionary dictionary]; - self.managerLock = [[NSRecursiveLock alloc] init]; + self.managerLock = [(NSLock *)[[NSRecursiveLock alloc] init] autorelease]; [self refreshModules]; } @@ -253,7 +200,16 @@ using std::list; [self setModules:nil]; [self setModulesPath:nil]; [self setManagerLock:nil]; - + + [gbfFilter release]; + [gbfStripFilter release]; + [thmlFilter release]; + [thmlStripFilter release]; + [osisFilter release]; + [osisStripFilter release]; + [teiFilter release]; + [teiStripFilter release]; + [plainFilter release]; [super dealloc]; } @@ -268,11 +224,11 @@ using std::list; ALog(@"Cannot create SWMgr instance for default module path!"); } else { NSFileManager *fm = [NSFileManager defaultManager]; - NSArray *subDirs = [fm directoryContentsAtPath:modulesPath]; + NSArray *subDirs = [fm contentsOfDirectoryAtPath:modulesPath error:NULL]; // for all sub directories add module BOOL directory; - NSString *fullSubDir = nil; - NSString *subDir = nil; + NSString *fullSubDir; + NSString *subDir; for(subDir in subDirs) { // as long as it's not hidden if(![subDir hasPrefix:@"."] && @@ -296,14 +252,13 @@ using std::list; // clear some data [self refreshModules]; - SendNotifyModulesChanged(nil); + SendNotifyModulesChanged(NULL); } } [managerLock unlock]; } -- (void)addPath:(NSString *)path { - +- (void)addModulesPath:(NSString *)path { [managerLock lock]; if(swManager == nil) { swManager = new sword::SWMgr([path UTF8String], true, new sword::EncodingFilterMgr(sword::ENC_UTF8)); @@ -314,12 +269,12 @@ using std::list; [self refreshModules]; [managerLock unlock]; - SendNotifyModulesChanged(nil); + SendNotifyModulesChanged(NULL); } - (SwordModule *)moduleWithName:(NSString *)name { - SwordModule *ret = [modules objectForKey:name]; + SwordModule *ret = [modules objectForKey:[name lowercaseString]]; if(ret == nil) { sword::SWModule *mod = [self getSWModuleWithName:name]; if(mod == NULL) { @@ -330,11 +285,11 @@ using std::list; NSString *type = [swMod typeString]; ModuleType aType = [SwordModule moduleTypeForModuleTypeString:type]; - ret = [SwordModule moduleForType:aType andName:name swModule:mod swordManager:self]; + ret = [SwordModule moduleForType:aType swModule:mod swordManager:self]; if(ret != nil) { NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:modules]; - [dict setObject:ret forKey:name]; + [dict setObject:ret forKey:[name lowercaseString]]; self.modules = dict; } } @@ -381,8 +336,8 @@ using std::list; } // sort - NSArray *sortDescritors = [NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES]]; - [ret sortUsingDescriptors:sortDescritors]; + NSArray *sortDescriptors = [NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES] autorelease]]; + [ret sortUsingDescriptors:sortDescriptors]; return [NSArray arrayWithArray:ret]; } @@ -390,14 +345,14 @@ using std::list; - (NSArray *)modulesForType:(ModuleType)type { NSMutableArray *ret = [NSMutableArray array]; for(SwordModule *mod in [modules allValues]) { - if([mod type] == type) { + if([mod type] == type || type == All) { [ret addObject:mod]; } } // sort - NSArray *sortDescritors = [NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES]]; - [ret sortUsingDescriptors:sortDescritors]; + NSArray *sortDescriptors = [NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES] autorelease]]; + [ret sortUsingDescriptors:sortDescriptors]; return [NSArray arrayWithArray:ret]; } @@ -411,20 +366,20 @@ using std::list; } // sort - NSArray *sortDescritors = [NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES]]; - [ret sortUsingDescriptors:sortDescritors]; + NSArray *sortDescriptors = [NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES] autorelease]]; + [ret sortUsingDescriptors:sortDescriptors]; return [NSArray arrayWithArray:ret]; } -#pragma mark - lowlevel methods +#pragma mark - lowLevel methods - (sword::SWMgr *)swManager { return swManager; } - (sword::SWModule *)getSWModuleWithName:(NSString *)moduleName { - sword::SWModule *module = NULL; + sword::SWModule *module; [managerLock lock]; module = swManager->Modules[[moduleName UTF8String]]; diff --git a/bindings/objc/src/SwordModule+Index.h b/bindings/objc/src/SwordModule+Index.h index 879d8cb..df4f7d7 100644 --- a/bindings/objc/src/SwordModule+Index.h +++ b/bindings/objc/src/SwordModule+Index.h @@ -6,7 +6,7 @@ // Copyright 2010 Software by MABE. All rights reserved. // -#import +#import #import "SwordModule.h" @interface SwordModule(Index) diff --git a/bindings/objc/src/SwordModule.h b/bindings/objc/src/SwordModule.h index ee47da7..9f1e0ad 100644 --- a/bindings/objc/src/SwordModule.h +++ b/bindings/objc/src/SwordModule.h @@ -11,15 +11,13 @@ General Public License for more details. (http://www.gnu.org/licenses/gpl.html) */ -#import +#import #ifdef __cplusplus #import "swmodule.h" #endif -#define My_SWDYNAMIC_CAST(className, object) (sword::className *)((object)?((object->getClass()->isAssignableFrom(#className))?object:0):0) - -// defines for dictionary entries for passagestudy +// defines for dictionary entries for passage study #define ATTRTYPE_TYPE @"type" #define ATTRTYPE_PASSAGE @"passage" #define ATTRTYPE_MODULE @"modulename" @@ -33,6 +31,7 @@ @class SwordManager, SwordModuleTextEntry, SwordKey; +@class SwordFilter; typedef enum { TextTypeStripped = 1, @@ -41,6 +40,7 @@ typedef enum { /** These are the main module types as returned in -typeString */ typedef enum { + All = 0x0000, Bible = 0x0001, Commentary = 0x0002, Dictionary = 0x0004, @@ -74,7 +74,11 @@ typedef enum { NSLock *indexLock; /** we store the name separately */ + NSString *typeString; NSString *name; + NSString *descr; + NSString *lang; + /** yes, we have a delegate to report any action to */ id delegate; @@ -89,19 +93,44 @@ typedef enum { @property (readwrite) int status; @property (retain, readwrite) NSRecursiveLock *moduleLock; @property (retain, readwrite) NSLock *indexLock; -@property (retain, readwrite) NSString *name; @property (retain, readwrite) SwordManager *swManager; +// swmodule properties +@property (retain, readonly) NSString *name; +@property (retain, readonly) NSString *typeString; +@property (retain, readonly) NSString *descr; +@property (retain, readonly) NSString *lang; + #ifdef __cplusplus + /** - Convenience initializers + Convenience initializer */ + (id)moduleForSWModule:(sword::SWModule *)aModule; + (id)moduleForSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager; + /** Factory method that creates the correct module type instance for the given type */ -+ (id)moduleForType:(ModuleType)aType andName:(NSString *)aName swModule:(sword::SWModule *)swModule swordManager:(SwordManager *)aManager; ++ (id)moduleForType:(ModuleType)aType swModule:(sword::SWModule *)swModule swordManager:(SwordManager *)aManager; + +/** + Initialize this module with an the SWModule. + This initializer should normally not need to be used. + */ +- (id)initWithSWModule:(sword::SWModule *)aModule; + +/** + Initialize this module with an the SWModule and a SwordManager instance. + This initializer should normally not need to be used. + */ +- (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager; + +/** + Retrieve the underlying SWModule instance + */ +- (sword::SWModule *)swModule; + #endif /** @@ -125,22 +154,12 @@ typedef enum { The SwordManager is needed because the underlying SWModule is retrieved from SwordManager. */ - (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager; -#ifdef __cplusplus -/** - Initialize this module with an the SWModule. - This initializer should normally not need to be used. - */ -- (id)initWithSWModule:(sword::SWModule *)aModule; -/** - Initialize this module with an the SWModule and a SwordManager instance. - This initializer should normally not need to be used. - */ -- (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager; -/** - Retrieve the underlying SWModule instance - */ -- (sword::SWModule *)swModule; -#endif + +/** Adds a render filter to this module */ +- (void)addRenderFilter:(SwordFilter *)aFilter; + +/** Adds a strip filter to this module */ +- (void)addStripFilter:(SwordFilter *)aFilter; /** Any error while processing the module? @@ -149,18 +168,6 @@ typedef enum { // --------------- Conf entries -------------- -/** - Module description - */ -- (NSString *)descr; -/** - Module language - */ -- (NSString *)lang; -/** - Module type as string - */ -- (NSString *)typeString; /** Module category as string */ @@ -254,20 +261,20 @@ typedef enum { /** Set position from a key */ -- (void)setKey:(SwordKey *)aKey; +- (void)setSwordKey:(SwordKey *)aKey; /** Module key. New instance created by module. */ -- (id)createKey; +- (SwordKey *)createKey; /** Module key. Reference only. */ -- (id)getKey; +- (SwordKey *)getKey; /** Module key. Reference only but cloned. */ -- (id)getKeyCopy; +- (SwordKey *)getKeyCopy; // ------------------- module metadata processing ------------------ @@ -286,6 +293,7 @@ typedef enum { @return NSString for text data */ - (id)attributeValueForParsedLinkData:(NSDictionary *)data; +- (id)attributeValueForParsedLinkData:(NSDictionary *)data withTextRenderType:(TextPullType)textType; /** returns the pre-verse entry value */ - (NSString *)entryAttributeValuePreverse; @@ -307,6 +315,11 @@ typedef enum { Convenience method with a key-string */ - (SwordModuleTextEntry *)textEntryForKeyString:(NSString *)aKeyString textType:(TextPullType)aType; +/** + Pulls all text entries for the given reference + @return Array of SwordModuleTextEntry + */ +- (NSArray *)textEntriesForReference:(NSString *)aReference textType:(TextPullType)textType; /** Returns a rendered text for the text at the current module position diff --git a/bindings/objc/src/SwordModule.mm b/bindings/objc/src/SwordModule.mm index 1b1bf1c..12e2ad8 100644 --- a/bindings/objc/src/SwordModule.mm +++ b/bindings/objc/src/SwordModule.mm @@ -11,6 +11,7 @@ General Public License for more details. (http://www.gnu.org/licenses/gpl.html) */ +#import "ObjCSword_Prefix.pch" #import "SwordModule.h" #import "SwordManager.h" #import "SwordModuleTextEntry.h" @@ -19,21 +20,22 @@ #import "SwordCommentary.h" #import "SwordDictionary.h" #import "SwordBook.h" - -#import "rtfhtml.h" -#import "swtext.h" -#import "versekey.h" -#import "regex.h" +#import "SwordFilter.h" @interface SwordModule () + +@property (retain, readwrite) NSString *name; +@property (retain, readwrite) NSString *typeString; +@property (retain, readwrite) NSString *descr; +@property (retain, readwrite) NSString *lang; @property(readwrite, retain) NSMutableDictionary *configEntries; + - (void)mainInit; + @end @implementation SwordModule -#pragma mark - Property implementations - @synthesize configEntries; @synthesize type; @synthesize status; @@ -41,6 +43,10 @@ @synthesize indexLock; @synthesize swManager; @synthesize name; +@synthesize typeString; +@synthesize descr; +@synthesize lang; + + (id)moduleForSWModule:(sword::SWModule *)aModule { return [[[SwordModule alloc] initWithSWModule:aModule] autorelease]; @@ -50,8 +56,8 @@ return [[[SwordModule alloc] initWithSWModule:aModule swordManager:aManager] autorelease]; } -+ (id)moduleForType:(ModuleType)aType andName:(NSString *)aName swModule:(sword::SWModule *)swModule swordManager:(SwordManager *)aManager { - SwordModule *sm = nil; ++ (id)moduleForType:(ModuleType)aType swModule:(sword::SWModule *)swModule swordManager:(SwordManager *)aManager { + SwordModule *sm; if(aType == Bible) { sm = [[[SwordBible alloc] initWithSWModule:swModule swordManager:aManager] autorelease]; } else if(aType == Commentary) { @@ -113,15 +119,19 @@ return ret; } -#pragma mark - Initializers +#pragma mark - Initializer - (void)mainInit { category = Unset; - self.type = [SwordModule moduleTypeForModuleTypeString:[self typeString]]; - self.moduleLock = [[NSRecursiveLock alloc] init]; - self.indexLock = [[NSLock alloc] init]; + self.name = [self retrieveName]; + self.typeString = [self retrieveType]; + self.descr = [self retrieveDescr]; + self.lang = [self retrieveLang]; + + self.type = [SwordModule moduleTypeForModuleTypeString:self.typeString]; + self.moduleLock = [[[NSRecursiveLock alloc] init] autorelease]; + self.indexLock = [[[NSLock alloc] init] autorelease]; self.configEntries = [NSMutableDictionary dictionary]; - self.name = [NSString stringWithCString:swModule->Name() encoding:NSUTF8StringEncoding]; } - (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager { @@ -162,10 +172,23 @@ [self setModuleLock:nil]; [self setIndexLock:nil]; [self setName:nil]; + [self setDescr:nil]; + [self setTypeString:nil]; + [self setLang:nil]; [super dealloc]; } +#pragma mark - Filters + +- (void)addRenderFilter:(SwordFilter *)aFilter { + swModule->AddRenderFilter([aFilter swFilter]); +} + +- (void)addStripFilter:(SwordFilter *)aFilter { + swModule->AddStripFilter([aFilter swFilter]); +} + #pragma mark - Module access semaphores - (void)lockModuleAccess { @@ -186,7 +209,15 @@ return swModule->Error(); } -- (NSString *)descr { +- (NSString *)retrieveName { + NSString *str = [NSString stringWithCString:swModule->Name() encoding:NSUTF8StringEncoding]; + if(!str) { + str = [NSString stringWithCString:swModule->Name() encoding:NSISOLatin1StringEncoding]; + } + return str; +} + +- (NSString *)retrieveDescr { NSString *str = [NSString stringWithCString:swModule->Description() encoding:NSUTF8StringEncoding]; if(!str) { str = [NSString stringWithCString:swModule->Description() encoding:NSISOLatin1StringEncoding]; @@ -194,7 +225,7 @@ return str; } -- (NSString *)lang { +- (NSString *)retrieveLang { NSString *str = [NSString stringWithCString:swModule->Lang() encoding:NSUTF8StringEncoding]; if(!str) { str = [NSString stringWithCString:swModule->Lang() encoding:NSISOLatin1StringEncoding]; @@ -202,7 +233,7 @@ return str; } -- (NSString *)typeString { +- (NSString *)retrieveType { NSString *str = [NSString stringWithCString:swModule->Type() encoding:NSUTF8StringEncoding]; if(!str) { str = [NSString stringWithCString:swModule->Type() encoding:NSISOLatin1StringEncoding]; @@ -289,7 +320,7 @@ if (d == 'u') { //we have an unicode character! @try { - NSUInteger unicodeChar = 0; + NSInteger unicodeChar = 0; NSMutableString *unicodeCharString = [[@"" mutableCopy] autorelease]; int j = 0; BOOL negative = NO; @@ -469,11 +500,11 @@ swModule->setKey([aKeyString UTF8String]); } -- (void)setKey:(SwordKey *)aKey { +- (void)setSwordKey:(SwordKey *)aKey { swModule->setKey([aKey swKey]); } -- (id)createKey { +- (SwordKey *)createKey { sword::SWKey *sk = swModule->CreateKey(); SwordKey *newKey = [SwordKey swordKeyWithSWKey:sk makeCopy:YES]; delete sk; @@ -481,17 +512,21 @@ return newKey; } -- (id)getKey { +- (SwordKey *)getKey { return [SwordKey swordKeyWithSWKey:swModule->getKey()]; } -- (id)getKeyCopy { +- (SwordKey *)getKeyCopy { return [SwordKey swordKeyWithSWKey:swModule->getKey() makeCopy:YES]; } #pragma mark - Module metadata processing - (id)attributeValueForParsedLinkData:(NSDictionary *)data { + return [self attributeValueForParsedLinkData:data withTextRenderType:TextTypeStripped]; +} + +- (id)attributeValueForParsedLinkData:(NSDictionary *)data withTextRenderType:(TextPullType)textType { id ret = nil; NSString *passage = [data objectForKey:ATTRTYPE_PASSAGE]; @@ -503,16 +538,22 @@ NSString *footnoteText = [self entryAttributeValueFootnoteOfType:attrType indexValue:[data objectForKey:ATTRTYPE_VALUE] forKey:[SwordKey swordKeyWithRef:passage]]; - ret = [self strippedTextFromString:footnoteText]; - } else if([attrType isEqualToString:@"x"]) { - NSString *refListString = [self entryAttributeValueFootnoteOfType:attrType - indexValue:[data objectForKey:ATTRTYPE_VALUE] - forKey:[SwordKey swordKeyWithRef:passage]]; - ret = [self strippedTextEntriesForRef:refListString]; - } else if([attrType isEqualToString:@"scriptRef"] || [attrType isEqualToString:@"scripRef"]) { - NSString *key = [[[data objectForKey:ATTRTYPE_VALUE] stringByReplacingOccurrencesOfString:@"+" - withString:@" "] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; - ret = [self strippedTextEntriesForRef:key]; + ret = footnoteText; + } else if([attrType isEqualToString:@"x"] || [attrType isEqualToString:@"scriptRef"] || [attrType isEqualToString:@"scripRef"]) { + NSString *key = @""; + if([attrType isEqualToString:@"x"]) { + key = [self entryAttributeValueFootnoteOfType:attrType + indexValue:[data objectForKey:ATTRTYPE_VALUE] + forKey:[SwordKey swordKeyWithRef:passage]]; + } else { + key = [[[data objectForKey:ATTRTYPE_VALUE] stringByReplacingOccurrencesOfString:@"+" + withString:@" "] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + } + if(textType == TextTypeRendered) { + ret = [self renderedTextEntriesForRef:key]; + } else { + ret = [self strippedTextEntriesForRef:key]; + } } return ret; @@ -527,8 +568,7 @@ } - (NSString *)entryAttributeValuePreverse { - NSString *ret = @""; - ret = [NSString stringWithUTF8String:swModule->getEntryAttributes()["Heading"]["Preverse"]["0"].c_str()]; + NSString *ret = [NSString stringWithUTF8String:swModule->getEntryAttributes()["Heading"]["Preverse"]["0"].c_str()]; return ret; } @@ -560,7 +600,7 @@ if (word->second.find("Text") == word->second.end()) continue; // no text? let's skip } - NSMutableString *stringValStr = [NSMutableString stringWithUTF8String:strongVal->second]; + NSMutableString *stringValStr = [NSMutableString stringWithUTF8String:(const char *)strongVal->second]; if(stringValStr) { [stringValStr replaceOccurrencesOfString:@"|x-Strongs:" withString:@" " options:0 range:NSMakeRange(0, [stringValStr length])]; [array addObject:stringValStr]; @@ -573,7 +613,7 @@ - (NSString *)entryAttributeValuePreverseForKey:(SwordKey *)aKey { [moduleLock lock]; - [self setKey:aKey]; + [self setSwordKey:aKey]; swModule->RenderText(); // force processing of key NSString *value = [self entryAttributeValuePreverse]; [moduleLock unlock]; @@ -582,7 +622,7 @@ - (NSString *)entryAttributeValueFootnoteOfType:(NSString *)fnType indexValue:(NSString *)index forKey:(SwordKey *)aKey { [moduleLock lock]; - [self setKey:aKey]; + [self setSwordKey:aKey]; swModule->RenderText(); // force processing of key NSString *value = [self entryAttributeValueFootnoteOfType:fnType indexValue:index]; [moduleLock unlock]; @@ -633,27 +673,11 @@ } - (NSArray *)strippedTextEntriesForRef:(NSString *)reference { - NSArray *ret = nil; - - SwordModuleTextEntry *entry = [self textEntryForKey:[SwordKey swordKeyWithRef:reference] - textType:TextTypeStripped]; - if(entry) { - ret = [NSArray arrayWithObject:entry]; - } - - return ret; + return [self textEntriesForReference:reference textType:TextTypeStripped]; } - (NSArray *)renderedTextEntriesForRef:(NSString *)reference { - NSArray *ret = nil; - - SwordModuleTextEntry *entry = [self textEntryForKey:[SwordKey swordKeyWithRef:reference] - textType:TextTypeRendered]; - if(entry) { - ret = [NSArray arrayWithObject:entry]; - } - - return ret; + return [self textEntriesForReference:reference textType:TextTypeRendered]; } - (SwordModuleTextEntry *)textEntryForKey:(SwordKey *)aKey textType:(TextPullType)aType { @@ -661,7 +685,7 @@ if(aKey) { [moduleLock lock]; - [self setKey:aKey]; + [self setSwordKey:aKey]; if(![self error]) { NSString *txt = @""; if(aType == TextTypeRendered) { @@ -686,6 +710,17 @@ return [self textEntryForKey:[SwordKey swordKeyWithRef:aKeyString] textType:aType]; } +- (NSArray *)textEntriesForReference:(NSString *)aReference textType:(TextPullType)textType { + NSArray *ret = nil; + + SwordModuleTextEntry *entry = [self textEntryForKey:[SwordKey swordKeyWithRef:aReference] + textType:textType]; + if(entry) { + ret = [NSArray arrayWithObject:entry]; + } + + return ret; +} - (void)writeEntry:(SwordModuleTextEntry *)anEntry {} diff --git a/bindings/objc/src/SwordModuleTextEntry.h b/bindings/objc/src/SwordModuleTextEntry.h index f13789a..7759be4 100644 --- a/bindings/objc/src/SwordModuleTextEntry.h +++ b/bindings/objc/src/SwordModuleTextEntry.h @@ -6,7 +6,7 @@ // Copyright 2009 Software by MABE. All rights reserved. // -#import +#import @class SwordKey; diff --git a/bindings/objc/src/SwordModuleTreeEntry.h b/bindings/objc/src/SwordModuleTreeEntry.h index fcd0cae..cd27cbe 100644 --- a/bindings/objc/src/SwordModuleTreeEntry.h +++ b/bindings/objc/src/SwordModuleTreeEntry.h @@ -6,7 +6,7 @@ // Copyright 2008 __MyCompanyName__. All rights reserved. // -#import +#import @interface SwordModuleTreeEntry : NSObject { diff --git a/bindings/objc/src/SwordUtil.h b/bindings/objc/src/SwordUtil.h new file mode 100644 index 0000000..92779bf --- /dev/null +++ b/bindings/objc/src/SwordUtil.h @@ -0,0 +1,20 @@ +// +// Created by mbergmann on 18.12.12. +// +// To change the template use AppCode | Preferences | File Templates. +// + + +#import + + +@interface SwordUtil : NSObject + +/** + Rendered Module texts may have hyperlinks. Those links may have key/value pairs to target data. + This method will return a dictionary with attribute/value pairs from parameters of the link. + See ATTRTYPE_* for key types. + */ ++ (NSDictionary *)dictionaryFromUrl:(NSURL *)aURL; + +@end diff --git a/bindings/objc/src/SwordUtil.m b/bindings/objc/src/SwordUtil.m new file mode 100644 index 0000000..9f53870 --- /dev/null +++ b/bindings/objc/src/SwordUtil.m @@ -0,0 +1,64 @@ +// +// Created by mbergmann on 18.12.12. +// +// To change the template use AppCode | Preferences | File Templates. +// + + +#import +#import "SwordUtil.h" + + +@implementation SwordUtil + ++ (NSDictionary *)dictionaryFromUrl:(NSURL *)aURL { + NSMutableDictionary *ret = [NSMutableDictionary dictionary]; + + NSString *scheme = [aURL scheme]; + if([scheme isEqualToString:@"sword"]) { + // in this case host is the module and path the reference + [ret setObject:[aURL host] forKey:ATTRTYPE_MODULE]; + [ret setObject:[[[aURL path] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] + stringByReplacingOccurrencesOfString:@"/" withString:@""] + forKey:ATTRTYPE_VALUE]; + [ret setObject:@"scriptRef" forKey:ATTRTYPE_TYPE]; + [ret setObject:@"showRef" forKey:ATTRTYPE_ACTION]; + } else if([scheme isEqualToString:@"applewebdata"]) { + // in this case + NSString *path = [aURL path]; + NSString *query = [aURL query]; + if([[path lastPathComponent] isEqualToString:@"passagestudy.jsp"]) { + NSArray *data = [query componentsSeparatedByString:@"&"]; + NSString *type = @"x"; + NSString *module = @""; + NSString *passage = @""; + NSString *value = @"1"; + NSString *action = @""; + for(NSString *entry in data) { + if([entry hasPrefix:@"type="]) { + type = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; + } else if([entry hasPrefix:@"module="]) { + module = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; + } else if([entry hasPrefix:@"passage="]) { + passage = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; + } else if([entry hasPrefix:@"action="]) { + action = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; + } else if([entry hasPrefix:@"value="]) { + value = [[entry componentsSeparatedByString:@"="] objectAtIndex:1]; + } else { + ALog(@"Unknown parameter: %@", entry); + } + } + + [ret setObject:[module stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_MODULE]; + [ret setObject:[passage stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_PASSAGE]; + [ret setObject:[value stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_VALUE]; + [ret setObject:[action stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_ACTION]; + [ret setObject:[type stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_TYPE]; + } + } + + return ret; +} + +@end \ No newline at end of file diff --git a/bindings/objc/src/SwordVerseKey.h b/bindings/objc/src/SwordVerseKey.h index d915a2a..a72911b 100644 --- a/bindings/objc/src/SwordVerseKey.h +++ b/bindings/objc/src/SwordVerseKey.h @@ -6,7 +6,7 @@ // Copyright 2009 __MyCompanyName__. All rights reserved. // -#import +#import #import "SwordKey.h" #ifdef __cplusplus @@ -16,28 +16,28 @@ @interface SwordVerseKey : SwordKey { } -+ (id)verseKey; -+ (id)verseKeyWithVersification:(NSString *)scheme; -+ (id)verseKeyWithRef:(NSString *)aRef; -+ (id)verseKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme; ++ (SwordVerseKey *)verseKey; ++ (SwordVerseKey *)verseKeyWithVersification:(NSString *)scheme; ++ (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef; ++ (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme; #ifdef __cplusplus -+ (id)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk; -+ (id)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy; -- (id)initWithSWVerseKey:(sword::VerseKey *)aVk; -- (id)initWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy; ++ (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk; ++ (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy; +- (SwordVerseKey *)initWithSWVerseKey:(sword::VerseKey *)aVk; +- (SwordVerseKey *)initWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy; - (sword::VerseKey *)swVerseKey; #endif -- (id)initWithVersification:(NSString *)scheme; -- (id)initWithRef:(NSString *)aRef; -- (id)initWithRef:(NSString *)aRef v11n:(NSString *)scheme; +- (SwordVerseKey *)initWithVersification:(NSString *)scheme; +- (SwordVerseKey *)initWithRef:(NSString *)aRef; +- (SwordVerseKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme; - (int)index; - (int)testament; -- (void)setTestament:(int)val; +- (void)setTestament:(char)val; - (int)book; -- (void)setBook:(int)val; +- (void)setBook:(char)val; - (int)chapter; - (void)setChapter:(int)val; - (int)verse; diff --git a/bindings/objc/src/SwordVerseKey.mm b/bindings/objc/src/SwordVerseKey.mm index b0d3f2d..ca15f17 100644 --- a/bindings/objc/src/SwordVerseKey.mm +++ b/bindings/objc/src/SwordVerseKey.mm @@ -11,27 +11,27 @@ @implementation SwordVerseKey -+ (id)verseKey { ++ (SwordVerseKey *)verseKey { return [[[SwordVerseKey alloc] init] autorelease]; } -+ (id)verseKeyWithVersification:(NSString *)scheme { ++ (SwordVerseKey *)verseKeyWithVersification:(NSString *)scheme { return [[[SwordVerseKey alloc] initWithVersification:scheme] autorelease]; } -+ (id)verseKeyWithRef:(NSString *)aRef { ++ (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef { return [[[SwordVerseKey alloc] initWithRef:aRef] autorelease]; } -+ (id)verseKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme { ++ (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme { return [[[SwordVerseKey alloc] initWithRef:aRef v11n:scheme] autorelease]; } -+ (id)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk { ++ (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk { return [[[SwordVerseKey alloc] initWithSWVerseKey:aVk] autorelease]; } -+ (id)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy { ++ (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy { return [[[SwordVerseKey alloc] initWithSWVerseKey:aVk makeCopy:copy] autorelease]; } @@ -39,15 +39,15 @@ return [self initWithRef:nil]; } -- (id)initWithVersification:(NSString *)scheme { +- (SwordVerseKey *)initWithVersification:(NSString *)scheme { return [self initWithRef:nil v11n:scheme]; } -- (id)initWithSWVerseKey:(sword::VerseKey *)aVk { +- (SwordVerseKey *)initWithSWVerseKey:(sword::VerseKey *)aVk { return [self initWithSWVerseKey:aVk makeCopy:NO]; } -- (id)initWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy { +- (SwordVerseKey *)initWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy { self = [super initWithSWKey:aVk makeCopy:copy]; if(self) { [self swVerseKey]->setVersificationSystem(aVk->getVersificationSystem()); @@ -55,11 +55,11 @@ return self; } -- (id)initWithRef:(NSString *)aRef { +- (SwordVerseKey *)initWithRef:(NSString *)aRef { return [self initWithRef:aRef v11n:nil]; } -- (id)initWithRef:(NSString *)aRef v11n:(NSString *)scheme { +- (SwordVerseKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme { sword::VerseKey *vk = new sword::VerseKey(); self = [super initWithSWKey:vk]; if(self) { @@ -84,20 +84,16 @@ [super dealloc]; } -- (id)clone { +- (SwordKey *)clone { return [SwordVerseKey verseKeyWithSWVerseKey:(sword::VerseKey *)sk]; } -- (int)index { - return sk->Index(); -} - - (BOOL)headings { return (BOOL)((sword::VerseKey *)sk)->Headings(); } - (void)setHeadings:(BOOL)flag { - ((sword::VerseKey *)sk)->Headings((int)flag); + ((sword::VerseKey *)sk)->Headings(flag); } - (BOOL)autoNormalize { @@ -105,7 +101,7 @@ } - (void)setAutoNormalize:(BOOL)flag { - ((sword::VerseKey *)sk)->AutoNormalize((int)flag); + ((sword::VerseKey *)sk)->AutoNormalize(flag); } - (int)testament { @@ -124,11 +120,11 @@ return ((sword::VerseKey *)sk)->getVerse(); } -- (void)setTestament:(int)val { +- (void)setTestament:(char)val { ((sword::VerseKey *)sk)->setTestament(val); } -- (void)setBook:(int)val { +- (void)setBook:(char)val { ((sword::VerseKey *)sk)->setBook(val); } diff --git a/bindings/objc/src/SwordVerseManager.h b/bindings/objc/src/SwordVerseManager.h index 71eef6a..c9667c5 100644 --- a/bindings/objc/src/SwordVerseManager.h +++ b/bindings/objc/src/SwordVerseManager.h @@ -6,18 +6,18 @@ // Copyright 2009 __MyCompanyName__. All rights reserved. // -#import +#import #ifdef __cplusplus -#include -class sword::VerseMgr::Book; +#include +class sword::VersificationMgr::Book; #endif #define SW_VERSIFICATION_KJV @"KJV" @interface SwordVerseManager : NSObject { #ifdef __cplusplus - sword::VerseMgr *verseMgr; + sword::VersificationMgr *verseMgr; #endif NSMutableDictionary *booksPerVersification; } @@ -30,7 +30,7 @@ class sword::VerseMgr::Book; - (NSArray *)booksForVersification:(NSString *)verseScheme; #ifdef __cplusplus -- (sword::VerseMgr *)verseMgr; +- (sword::VersificationMgr *)verseMgr; #endif @end diff --git a/bindings/objc/src/SwordVerseManager.mm b/bindings/objc/src/SwordVerseManager.mm index a9bc12b..72f26fc 100644 --- a/bindings/objc/src/SwordVerseManager.mm +++ b/bindings/objc/src/SwordVerseManager.mm @@ -21,7 +21,7 @@ @synthesize booksPerVersification; + (SwordVerseManager *)defaultManager { - static SwordVerseManager *singleton; + static SwordVerseManager *singleton = nil; if(!singleton) { singleton = [[SwordVerseManager alloc] init]; } @@ -33,7 +33,7 @@ self = [super init]; if(self) { self.booksPerVersification = [NSMutableDictionary dictionary]; - verseMgr = sword::VerseMgr::getSystemVerseMgr(); + verseMgr = sword::VersificationMgr::getSystemVersificationMgr(); } return self; @@ -59,13 +59,13 @@ NSArray *ret = [booksPerVersification objectForKey:verseScheme]; if(ret == nil) { // hasn't been initialized yet - const sword::VerseMgr::System *system = verseMgr->getVersificationSystem([verseScheme UTF8String]); - int bookCount = system->getBookCount(); + const sword::VersificationMgr::System *system = verseMgr->getVersificationSystem([verseScheme UTF8String]); + NSUInteger bookCount = (NSUInteger)system->getBookCount(); NSMutableArray *buf = [NSMutableArray arrayWithCapacity:bookCount]; for(int i = 0;i < bookCount;i++) { - sword::VerseMgr::Book *book = (sword::VerseMgr::Book *)system->getBook(i); + sword::VersificationMgr::Book *book = (sword::VersificationMgr::Book *)system->getBook(i); - SwordBibleBook *bb = [[SwordBibleBook alloc] initWithBook:book]; + SwordBibleBook *bb = [[[SwordBibleBook alloc] initWithBook:book] autorelease]; [bb setNumber:i+1]; // VerseKey-Book() starts at index 1 // add to array @@ -78,7 +78,7 @@ return ret; } -- (sword::VerseMgr *)verseMgr { +- (sword::VersificationMgr *)verseMgr { return verseMgr; } diff --git a/bindings/objc/src/VerseEnumerator.h b/bindings/objc/src/VerseEnumerator.h index 8eabbe9..52da7ab 100644 --- a/bindings/objc/src/VerseEnumerator.h +++ b/bindings/objc/src/VerseEnumerator.h @@ -6,7 +6,7 @@ // Copyright 2010 Software by MABE. All rights reserved. // -#import +#import @class SwordListKey; diff --git a/bindings/objc/src/VerseEnumerator.mm b/bindings/objc/src/VerseEnumerator.mm index ca8e40b..cd5c665 100644 --- a/bindings/objc/src/VerseEnumerator.mm +++ b/bindings/objc/src/VerseEnumerator.mm @@ -31,6 +31,7 @@ } - (void)dealloc { + [listKey release]; [super dealloc]; } @@ -39,7 +40,7 @@ for(*[listKey swListKey] = sword::TOP;![listKey swListKey]->Error(); *[listKey swListKey] += 1) { [t addObject:[listKey keyText]]; } - // possition TOP again + // position TOP again *[listKey swListKey] = sword::TOP; return [NSArray arrayWithArray:t]; diff --git a/bindings/objc/src/services/Configuration.h b/bindings/objc/src/services/Configuration.h index 1734fa6..e967c58 100644 --- a/bindings/objc/src/services/Configuration.h +++ b/bindings/objc/src/services/Configuration.h @@ -6,7 +6,7 @@ // Copyright 2010 Software by MABE. All rights reserved. // -#import +#import /* To define your own configuration: @@ -27,10 +27,11 @@ @end @interface Configuration : NSObject { - + Configuration *impl; } + (Configuration *)config; ++ (Configuration *)configWithImpl:(id)configImpl; - (NSString *)osVersion; - (NSString *)bundleVersion; @@ -39,6 +40,6 @@ - (NSString *)tempFolder; - (NSString *)logFile; -- (void)setClass:(Class)classImpl; +- (void)setImpl:(id)configImpl; @end diff --git a/bindings/objc/src/services/Configuration.m b/bindings/objc/src/services/Configuration.m index 8ba2842..67ec709 100644 --- a/bindings/objc/src/services/Configuration.m +++ b/bindings/objc/src/services/Configuration.m @@ -11,13 +11,18 @@ @implementation Configuration + (Configuration *)config { - static Configuration *instance; + static Configuration *instance = nil; if(instance == nil) { instance = [[Configuration alloc] init]; } return instance; } ++ (Configuration *)configWithImpl:(id)configImpl { + [[Configuration config] setImpl:configImpl]; + return [Configuration config]; +} + - (id)init { return [super init]; } @@ -27,20 +32,23 @@ } - (void)dealloc { + [impl release]; + [super dealloc]; } -- (void)setClass:(Class)classImpl { - object_setClass(self, classImpl); +- (void)setImpl:(id)configImpl { + impl = (Configuration *)configImpl; + [impl retain]; } #pragma mark Configuration implementation -- (NSString *)osVersion {return @"";} -- (NSString *)bundleVersion {return @"";} -- (NSString *)defaultModulePath {return @"";} -- (NSString *)defaultAppSupportPath {return @"";} -- (NSString *)tempFolder {return @"";} -- (NSString *)logFile {return @"";} +- (NSString *)osVersion {return [impl osVersion];} +- (NSString *)bundleVersion {return [impl bundleVersion];} +- (NSString *)defaultModulePath {return [impl defaultModulePath];} +- (NSString *)defaultAppSupportPath {return [impl defaultAppSupportPath];} +- (NSString *)tempFolder {return [impl tempFolder];} +- (NSString *)logFile {return [impl logFile];} @end diff --git a/bindings/objc/src/services/OSXConfiguration.h b/bindings/objc/src/services/OSXConfiguration.h index 0fff767..93e02e1 100644 --- a/bindings/objc/src/services/OSXConfiguration.h +++ b/bindings/objc/src/services/OSXConfiguration.h @@ -6,7 +6,7 @@ // Copyright 2010 Software by MABE. All rights reserved. // -#import +#import #import "Configuration.h" @interface OSXConfiguration : Configuration { diff --git a/bindings/objc/src/services/iOSConfiguration.h b/bindings/objc/src/services/iOSConfiguration.h new file mode 100644 index 0000000..2f0989b --- /dev/null +++ b/bindings/objc/src/services/iOSConfiguration.h @@ -0,0 +1,24 @@ +// +// iOSConfiguration.h +// ObjCSword-iOS +// +// Created by Manfred Bergmann on 10.03.11. +// Copyright 2011 Software by MABE. All rights reserved. +// + +#import +#import +#import "Configuration.h" + + +@interface iOSConfiguration : Configuration { +} + +- (NSString *)osVersion; +- (NSString *)bundleVersion; +- (NSString *)defaultModulePath; +- (NSString *)defaultAppSupportPath; +- (NSString *)tempFolder; +- (NSString *)logFile; + +@end diff --git a/bindings/objc/src/services/iOSConfiguration.m b/bindings/objc/src/services/iOSConfiguration.m new file mode 100644 index 0000000..2f5b439 --- /dev/null +++ b/bindings/objc/src/services/iOSConfiguration.m @@ -0,0 +1,38 @@ +// +// iOSConfiguration.m +// ObjCSword-iOS +// +// Created by Manfred Bergmann on 10.03.11. +// Copyright 2011 Software by MABE. All rights reserved. +// + +#import "iOSConfiguration.h" + + +@implementation iOSConfiguration + +- (NSString *)osVersion { + return [[UIDevice currentDevice] systemVersion]; +} + +- (NSString *)bundleVersion { + return (NSString *)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleVersionKey); +} + +- (NSString *)defaultModulePath { + return [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex: 0] stringByAppendingString: @"/Modules"]; +} + +- (NSString *)defaultAppSupportPath { + return [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) objectAtIndex: 0] stringByAppendingString: @"/"]; +} + +- (NSString *)tempFolder { + return [[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) objectAtIndex: 0] stringByAppendingString: @"/Temp"]; +} + +- (NSString *)logFile { + return [super logFile]; +} + +@end diff --git a/bindings/objc/test/SwordListKeyTest.m b/bindings/objc/test/SwordListKeyTest.m index 7f4899f..73d47dc 100644 --- a/bindings/objc/test/SwordListKeyTest.m +++ b/bindings/objc/test/SwordListKeyTest.m @@ -6,8 +6,8 @@ // Copyright 2009 __MyCompanyName__. All rights reserved. // +#import #import "SwordListKeyTest.h" -#import "ObjCSword/ObjCSword.h" @implementation SwordListKeyTest @@ -41,7 +41,7 @@ VerseEnumerator *ve = [lk verseEnumerator]; int count = 0; - NSString *ref = nil; + NSString *ref; while((ref = [ve nextObject])) { count++; } diff --git a/bindings/objc/test/SwordManagerTest.m b/bindings/objc/test/SwordManagerTest.m index 8fcd588..d2c93dd 100644 --- a/bindings/objc/test/SwordManagerTest.m +++ b/bindings/objc/test/SwordManagerTest.m @@ -6,20 +6,20 @@ // Copyright 2010 Software by MABE. All rights reserved. // +#import #import "SwordManagerTest.h" -#import "ObjCSword/SwordManager.h" -#import "ObjCSword/Configuration.h" -#import "ObjCSword/OSXConfiguration.h" - @implementation SwordManagerTest - (void)setUp { - [[Configuration config] setClass:[OSXConfiguration class]]; + [Configuration configWithImpl:[[[OSXConfiguration alloc] init] autorelease]]; } - (void)testSwordManagerInit { - SwordManager *sm = [SwordManager defaultManager]; + NSString *modPath = [[Configuration config] defaultModulePath]; + NSLog(@"%@", modPath); + + SwordManager *sm = [SwordManager managerWithPath:modPath]; STAssertTrue([[sm modules] count] > 0, @""); } diff --git a/bindings/objc/test/SwordModuleLongRunTest.mm b/bindings/objc/test/SwordModuleLongRunTest.mm index 3ed363d..699a18c 100644 --- a/bindings/objc/test/SwordModuleLongRunTest.mm +++ b/bindings/objc/test/SwordModuleLongRunTest.mm @@ -7,12 +7,26 @@ // #import "SwordModuleTest.h" +#ifdef TARGET_IPHONE_SIMULATOR +#import "SwordManager.h" +#import "Configuration.h" +#import "iOSConfiguration.h" +#import "SwordModule.h" +#import "SwordBibleTextEntry.h" +#import "VerseEnumerator.h" +#import "SwordListKey.h" +#else #import "ObjCSword/ObjCSword.h" +#endif @implementation SwordModuleTest - (void)setUp { +#ifdef TARGET_IPHONE_SIMULATOR + [[Configuration config] setClass:[iOSConfiguration class]]; +#else [[Configuration config] setClass:[OSXConfiguration class]]; +#endif mod = [[SwordManager defaultManager] moduleWithName:@"GerNeUe"]; } @@ -52,7 +66,7 @@ SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:1-2"]; [lk setPersist:YES]; - [com setKey:lk]; + [com setSwordKey:lk]; NSString *ref = nil; NSString *rendered = nil; int count = 0; @@ -77,7 +91,7 @@ int count = 0; while(![lk error]) { ref = [lk keyText]; - [com setKey:lk]; + [com setSwordKey:lk]; rendered = [com renderedText]; NSLog(@"%@:%@", ref, rendered); [lk increment]; diff --git a/bindings/objc/test/SwordModuleTest.h b/bindings/objc/test/SwordModuleTest.h index 74bca21..95135fc 100644 --- a/bindings/objc/test/SwordModuleTest.h +++ b/bindings/objc/test/SwordModuleTest.h @@ -8,9 +8,10 @@ #import -@class SwordModule; +@class SwordModule, SwordManager; @interface SwordModuleTest : SenTestCase { + SwordManager *mgr; SwordModule *mod; } diff --git a/bindings/objc/test/SwordModuleTest.m b/bindings/objc/test/SwordModuleTest.m index 7debcc1..a308513 100644 --- a/bindings/objc/test/SwordModuleTest.m +++ b/bindings/objc/test/SwordModuleTest.m @@ -6,20 +6,19 @@ // Copyright 2010 Software by MABE. All rights reserved. // +#import #import "SwordModuleTest.h" -#import "ObjCSword/ObjCSword.h" -#import "ObjCSword/SwordModule+Index.h" - @implementation SwordModuleTest - (void)setUp { - [[Configuration config] setClass:[OSXConfiguration class]]; - mod = [[SwordManager defaultManager] moduleWithName:@"GerNeUe"]; + [Configuration configWithImpl:[[[OSXConfiguration alloc] init] autorelease]]; + mgr = [SwordManager managerWithPath:[[Configuration config] defaultModulePath]]; + mod = [mgr moduleWithName:@"GerNeUe"]; } - (void)testLoopRenderedVerses { - SwordBible *bible = (SwordBible *)[[SwordManager defaultManager] moduleWithName:@"GerSch"]; + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"]; STAssertNotNil(bible, @"Module is nil"); NSArray *verses = [bible renderedTextEntriesForRef:@"Gen"]; @@ -28,7 +27,7 @@ } - (void)testRenderedVerseText { - SwordBible *bible = (SwordBible *)[[SwordManager defaultManager] moduleWithName:@"GerSch"]; + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"]; STAssertNotNil(bible, @"Module is nil"); SwordModuleTextEntry *text = [bible textEntryForKeyString:@"gen1.1" textType:TextTypeRendered]; @@ -37,7 +36,7 @@ } - (void)testCloneModule { - SwordBible *bible = (SwordBible *)[[SwordManager defaultManager] moduleWithName:@"GerSch"]; + SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"]; STAssertNotNil(bible, @"Module is nil"); /* @@ -49,7 +48,7 @@ - (void)testLoopWithModulePos { SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen" v11n:[mod versification]]; [lk setPersist:YES]; - [mod setKey:lk]; + [mod setSwordKey:lk]; NSString *ref = nil; NSString *rendered = nil; while(![mod error]) { @@ -67,7 +66,7 @@ NSString *rendered = nil; while(![lk error]) { ref = [lk keyText]; - [mod setKey:lk]; + [mod setSwordKey:lk]; rendered = [mod renderedText]; //NSLog(@"%@:%@", ref, rendered); [lk increment]; @@ -77,7 +76,7 @@ - (void)testLoopWithModulePosWithHeadings { SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen" headings:YES v11n:[mod versification]]; [lk setPersist:YES]; - [mod setKey:lk]; + [mod setSwordKey:lk]; NSString *ref = nil; NSString *rendered = nil; while(![mod error]) { @@ -90,7 +89,7 @@ - (void)testLoopWithModulePosWithDiverseReference { SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:1;4:5-8" v11n:[mod versification]]; [lk setPersist:YES]; - [mod setKey:lk]; + [mod setSwordKey:lk]; NSString *ref = nil; NSString *rendered = nil; while(![mod error]) { @@ -109,7 +108,7 @@ NSString *rendered = nil; while(![lk error]) { ref = [lk keyText]; - [mod setKey:lk]; + [mod setSwordKey:lk]; rendered = [mod renderedText]; NSLog(@"%@:%@", ref, rendered); [lk increment]; @@ -122,7 +121,7 @@ [vk setPersist:YES]; SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:1;4:5;8:4;10:2-5" v11n:[mod versification]]; [lk setPersist:YES]; - [mod setKey:lk]; + [mod setSwordKey:lk]; NSString *ref = nil; NSString *rendered = nil; while(![mod error]) { @@ -131,7 +130,7 @@ long lowVerse = [vk verse] - context; long highVerse = lowVerse + (context * 2); [vk setVerse:lowVerse]; - [mod setKey:vk]; + [mod setSwordKey:vk]; for(;lowVerse <= highVerse;lowVerse++) { ref = [vk keyText]; rendered = [mod renderedText]; @@ -139,7 +138,7 @@ [mod incKeyPosition]; } // set back list key - [mod setKey:lk]; + [mod setSwordKey:lk]; [mod incKeyPosition]; } else { ref = [lk keyText]; @@ -152,66 +151,11 @@ - (void)testStrippedTextForRef { SwordVerseKey *vk = [SwordVerseKey verseKeyWithRef:@"1Mo 1:2"]; - NSLog(@"start position: %s", [vk keyText]); + NSLog(@"start position: %@", [vk keyText]); [vk decrement]; - NSLog(@"decrement position: %s", [vk keyText]); + NSLog(@"decrement position: %@", [vk keyText]); [vk setVerse:[vk verse] + 3]; - NSLog(@"verse + 3: %s", [vk keyText]); + NSLog(@"verse + 3: %@", [vk keyText]); } -/* - #ifdef __cplusplus - #include - #include - #include - #include - class sword::SWModule; - #include - #include - #include - #include - #include - #include - using namespace sword; - #endif - - - (void)testHeadings { - mod = [[SwordManager defaultManager] moduleWithName:@"KJV"]; - STAssertNotNil(mod, @"No Mod"); - - // enable headings - [[SwordManager defaultManager] setGlobalOption:SW_OPTION_HEADINGS value:SW_ON]; - [[SwordManager defaultManager] setGlobalOption:SW_OPTION_STRONGS value:SW_ON]; - [[SwordManager defaultManager] setGlobalOption:SW_OPTION_FOOTNOTES value:SW_ON]; - - SWModule *target; - target = [mod swModule]; - target->setKey("gen 1:1"); - target->RenderText(); // force an entry lookup to resolve key to something in the index - - std::cout << "==Raw=Entry===============\n"; - std::cout << target->getKeyText() << ":\n"; - std::cout << target->getRawEntry(); - std::cout << "\n"; - std::cout << "==Render=Entry============\n"; - std::cout << target->RenderText(); - std::cout << "\n"; - std::cout << "==========================\n"; - std::cout << "Entry Attributes:\n\n"; - AttributeTypeList::iterator i1; - AttributeList::iterator i2; - AttributeValue::iterator i3; - for (i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); i1++) { - std::cout << "[ " << i1->first << " ]\n"; - for (i2 = i1->second.begin(); i2 != i1->second.end(); i2++) { - std::cout << "\t[ " << i2->first << " ]\n"; - for (i3 = i2->second.begin(); i3 != i2->second.end(); i3++) { - std::cout << "\t\t" << i3->first << " = " << i3->second << "\n"; - } - } - } - std::cout << std::endl; - } - */ - @end diff --git a/bindings/objc/test/Tests-Info.plist b/bindings/objc/test/Tests-Info.plist new file mode 100644 index 0000000..c285a47 --- /dev/null +++ b/bindings/objc/test/Tests-Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + com.yourcompany.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/bindings/swig/CMakeLists.txt b/bindings/swig/CMakeLists.txt new file mode 100644 index 0000000..d2f4b16 --- /dev/null +++ b/bindings/swig/CMakeLists.txt @@ -0,0 +1,41 @@ +##################################################################################################### +# +# A system to, hopefully, build the Sword bindings which are asked for. Currently I only know and +# therefore only support Python & Perl bindings. YMMV for it, please submit patches or suggestions. +# I will try to get them integrated into the system if I can. If there are bindings that you need +# other than the Python|Perl/Swig bindings, then you should probably speak up now. + +MESSAGE(STATUS "\n-- CONFIGURING SWIG BINDINGS") +##################################################################################################### +# SWIG +# We need to find the SWIG executable in order to be able to do this, right? +FIND_PACKAGE(SWIG) + +IF(NOT SWIG_FOUND) + MESSAGE(FATAL_ERROR "Swig: no") +ELSE(NOT SWIG_FOUND) + MESSAGE(STATUS "Swig: yes") + + SET(CMAKE_SWIG_FLAGS "-w-451,-402;-shadow;-c++") + + MACRO(SWORD_SWIG_GENERATE LANG) + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx + COMMAND ${SWIG_EXECUTABLE} ${CMAKE_SWIG_FLAGS} -${LANG} -o "${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx" + "-I${CMAKE_SOURCE_DIR}/bindings/swig" ${SWIG_INCLUDES} "${CMAKE_SOURCE_DIR}/bindings/swig/sword.i" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + ENDMACRO(SWORD_SWIG_GENERATE) + + GET_DIRECTORY_PROPERTY(cmake_include_directories INCLUDE_DIRECTORIES) + SET(SWIG_INCLUDES) + FOREACH(directory ${cmake_include_directories}) + SET(SWIG_INCLUDES ${SWIG_INCLUDES} "-I${directory}") + ENDFOREACH(directory ${cmake_include_directories}) + + IF(SWORD_BINDINGS MATCHES ".*Python.*") + ADD_SUBDIRECTORY(python) + ENDIF(SWORD_BINDINGS MATCHES ".*Python.*") + + IF(SWORD_BINDINGS MATCHES ".*Perl.*") + ADD_SUBDIRECTORY(perl) + ENDIF(SWORD_BINDINGS MATCHES ".*Perl.*") +ENDIF(NOT SWIG_FOUND) diff --git a/bindings/swig/README b/bindings/swig/README index 4febafe..88f5026 100644 --- a/bindings/swig/README +++ b/bindings/swig/README @@ -1,3 +1,6 @@ +Also see the directions in the README file in the parent directory from this +file (/bindings/README) for directions on building with CMake. + Building the SWIG Bindings ========================== @@ -8,8 +11,6 @@ cd package # Special step for BSD-liks (e.g. Mac OS X): # edit autogen.sh to remove the "-a" option from cp -libtoolize --force - ./autogen.sh ./configure make @@ -17,17 +18,18 @@ make # Rather than make, you probably only care about one of the languages bindings. # So you might try one of these pairs of commands instead: # -# make perlswig -# make perl_make -# -# make pythonswig -# make python_make -# - -# Install the perl bindings +make perlswig +make perl_make cd perl sudo make install -# Install the python bindings - you may need to run this with sudo +# +# or +# + +make pythonswig +make python_make cd python -python setup.py install +sudo python setup.py install + + diff --git a/bindings/swig/deprecations.i b/bindings/swig/deprecations.i new file mode 100644 index 0000000..bab0381 --- /dev/null +++ b/bindings/swig/deprecations.i @@ -0,0 +1,62 @@ +/* Methods that are deprecated in SWORD and should be ignored. */ + +/* These are all together */ +%ignore sword::SWModule::operator const char *; +%ignore sword::SWVersion::operator const char *; +%ignore sword::ListKey::operator const char *; +%ignore sword::VerseKey::operator const char *; +%ignore sword::TreeKey::operator const char *; +%ignore sword::TreeKeyIdx::operator const char *; +%ignore sword::VerseTreeKey::operator const char *; +%ignore sword::XMLTag::operator const char *; + +%ignore sword::StatusReporter::statusUpdate; + +%ignore sword::SWDisplay::Display(SWModule&); + +%ignore sword::SWKey::Error(); +%ignore sword::SWKey::Persist() const; +%ignore sword::SWKey::Persist(signed char); + +%ignore sword::SWModule::AddEncodingFilter(SWFilter*); +%ignore sword::SWModule::AddOptionFilter(SWOptionFilter*); +%ignore sword::SWModule::AddRawFilter(SWFilter*); +%ignore sword::SWModule::AddRenderFilter(SWFilter*); +%ignore sword::SWModule::AddStripFilter(SWFilter*); +%ignore sword::SWModule::CreateKey; +%ignore sword::SWModule::Description; +%ignore sword::SWModule::Direction; +%ignore sword::SWModule::Disp; +%ignore sword::SWModule::Display(); +%ignore sword::SWModule::Encoding; +%ignore sword::SWModule::Error(); +%ignore sword::SWModule::getSkipConsecutiveLinks(); +%ignore sword::SWModule::Index; +%ignore sword::SWModule::Key; +%ignore sword::SWModule::KeyText; +%ignore sword::SWModule::Lang; +%ignore sword::SWModule::Markup; +%ignore sword::SWModule::Name; +%ignore sword::SWModule::processEntryAttributes(bool) const; +%ignore sword::SWModule::ReplaceEncodingFilter(SWFilter*, SWFilter*); +%ignore sword::SWModule::RemoveEncodingFilter(SWFilter*); +%ignore sword::SWModule::RenderText; +%ignore sword::SWModule::ReplaceRenderFilter(SWFilter*, SWFilter*); +%ignore sword::SWModule::RemoveRenderFilter(SWFilter*); +%ignore sword::SWModule::SetKey; +%ignore sword::SWModule::setKey(SWKey const &); +%ignore sword::SWModule::StripText; +%ignore sword::SWModule::Type; + +%ignore sword::VerseKey::AutoNormalize; +%ignore sword::VerseKey::Book; +%ignore sword::VerseKey::Chapter; +%ignore sword::VerseKey::ClearBounds(); +%ignore sword::VerseKey::Headings; +%ignore sword::VerseKey::LowerBound; +%ignore sword::VerseKey::Normalize; +%ignore sword::VerseKey::ParseVerseList; +%ignore sword::VerseKey::Testament; +%ignore sword::VerseKey::TestamentIndex() const; +%ignore sword::VerseKey::UpperBound; +%ignore sword::VerseKey::Verse; diff --git a/bindings/swig/examples/av11n.py b/bindings/swig/examples/av11n.py new file mode 100755 index 0000000..9ce7979 --- /dev/null +++ b/bindings/swig/examples/av11n.py @@ -0,0 +1,112 @@ +#!/usr/bin/env python +# +# This does a very roughshod attempt to compare the osisIDs found in an +# XML file with each of the versifications that SWORD knows about to help +# a user find the one which is most akin to the one they are using. It is +# limited in its need for your file to be at least segregated into OT/NT +# in the proper order, although within each testament, it requires nothing +# special as for ordering. +# +# Invoke simply by calling the program and the file name. If you want +# more output, change the following line to be True instead of False +verbose = False +debug = True +import sys +import re +verseid = re.compile('^.+\..+\..+$') + +# Inform the user that we need the SWORD extension +try: + import Sword +except: + print "You do not have the SWORD library installed. Please install it." + sys.exit(1) + +# Inform the user that we need pyquery, as it makes parsing XML files that much easier +try: + from pyquery import PyQuery as pq +except: + print "You do not appear to have PyQuery installed. Please install it." + sys.exit(2) + +# Without the name of a file, we cannot proceed any further +if len(sys.argv) < 2 or sys.argv[1] == '--help': + print "Usage: %s " % (sys.argv[0],) + +# Open the file +if debug: + print 'Opening %s' % (sys.argv[1],) +d = pq(filename=sys.argv[1]) +# Get the list of versifications +if debug: + print 'Fetching a list of versifications' +vmgr = Sword.VersificationMgr.getSystemVersificationMgr() +av11ns = vmgr.getVersificationSystems() + +# Get the list of all osisIDs +if debug: + print 'Fetching a list of OSIS IDs' +ids = d("*[osisID]") +# Iterate each versification scheme +for v11n in av11ns: + print 'Checking %s' % (v11n.c_str(),) + # Construct a list of the IDs in this versification + key = Sword.VerseKey() + key.setVersificationSystem(v11n.c_str()) + otkeyList = [] # Anything left in this afterwards is missing from the OSIS ot + ntkeyList = [] # Anything left in this afterwards is missing from the OSIS nt + otextraKeys = [] # Anything that gets placed in here is extraneous OT material (we think) + ntextraKeys = [] # Anything that gets placed in here is extraneous NT material (we think) + + inNT = False + while key.popError() == '\x00': + skey = key.getOSISRef() + if not inNT and re.match('^Matt', skey): # Assume we enter the NT when we hit Matthew + inNT = True + if inNT: + ntkeyList.append(skey) + else: + otkeyList.append(skey) + key.increment() + ntkeyList = set(ntkeyList) # The 'in' operator only works on a set + otkeyList = set(otkeyList) + + inNT = False + # Now iterate the ones we have in this file + for e in ids: + osisid = e.attrib.get('osisID') + #print 'Checking key %s' % (osisid,) + if osisid in otkeyList: + otkeyList.remove(osisid) + elif osisid in ntkeyList: + ntkeyList.remove(osisid) + inNT = True + elif verseid.match(osisid) and inNT: + ntextraKeys.append(osisid) + elif verseid.match(osisid) and not inNT: + otextraKeys.append(osisid) + # Ignore it if not verseid.match() + + # Now let's see what is left over + keyList = list(otkeyList.union(ntkeyList)) # Sets in Python cannot be ordered + keyList.sort() + if len(keyList) > 0: + if verbose: + print '\tThe following IDs do not appear in your file:' + for k in keyList: + print k + else: + print '\tThere are %d OT IDs and %d NT IDs in the versification which are not in your file.' % (len(otkeyList), len(ntkeyList)) + else: + print '\tYour file has all the references in this versification' + + # Now let's see if you had extra + if len(otextraKeys + ntextraKeys) > 0: + if verbose: + print '\tThe following IDs do not appear in the versification:' + for k in ntextraKeys + otextraKeys: + print k + else: + print '\tThere are %d OT IDs and %d NT IDs in your file which do not appear in the versification.' % (len(otextraKeys), len(ntextraKeys)) + else: + print '\tYour file has no extra references' diff --git a/bindings/swig/examples/mod2zmod.pl b/bindings/swig/examples/mod2zmod.pl index c8d5d59..d771830 100755 --- a/bindings/swig/examples/mod2zmod.pl +++ b/bindings/swig/examples/mod2zmod.pl @@ -1,13 +1,16 @@ #!/usr/bin/perl + #****************************************************************************** # -# This program converts a given module into a compressed module of the same type. -# This is just an example to demomstrate the power of the Perl Sword bindings. -# The code is almost written the same way the C++ of mod2zmod.cpp code was written +# mod2zmod.pl - This program converts a given module into a compressed +# module of the same type. This is just an example to +# demomstrate the power of the Perl Sword bindings. The +# code is almost written the same way the C++ of +# mod2zmod.cpp code was written # -# $Id: mod2zmod.pl 2327 2009-04-22 11:42:33Z scribe $ +# $Id: mod2zmod.pl 2841 2013-06-29 10:58:08Z chrislit $ # -# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) +# Copyright 2002-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society # P. O. Box 2528 # Tempe, AZ 85280-2528 diff --git a/bindings/swig/ftptrans.i b/bindings/swig/ftptrans.i deleted file mode 100644 index 923cebc..0000000 --- a/bindings/swig/ftptrans.i +++ /dev/null @@ -1,6 +0,0 @@ -%{ -#include "ftptrans.h" -%} - -%include "ftptrans.h" - diff --git a/bindings/swig/listkey.i b/bindings/swig/listkey.i index 3c91343..deaeac2 100644 --- a/bindings/swig/listkey.i +++ b/bindings/swig/listkey.i @@ -3,6 +3,11 @@ %} %ignore sword::ListKey::operator<<; +%ignore sword::ListKey::ClearList; +%ignore sword::ListKey::Count; +%ignore sword::ListKey::Remove; +%ignore sword::ListKey::SetToElement; +%ignore sword::ListKey::GetElement; %include "listkey.h" @@ -18,4 +23,4 @@ static sword::ListKey *castTo(sword::SWKey *o) { return dynamic_cast(o); } -} \ No newline at end of file +} diff --git a/bindings/swig/multimapwdef.i b/bindings/swig/multimapwdef.i new file mode 100644 index 0000000..ac25ae9 --- /dev/null +++ b/bindings/swig/multimapwdef.i @@ -0,0 +1,11 @@ +%{ +#include "multimapwdef.h" +%} + +%ignore sword::multimapwithdefault::operator []; + +%include "multimapwdef.h" + +%extend sword::multimapwithdefault { +} + diff --git a/bindings/swig/osishtmlhref.i b/bindings/swig/osishtmlhref.i index d721b0c..a3ae458 100755 --- a/bindings/swig/osishtmlhref.i +++ b/bindings/swig/osishtmlhref.i @@ -1,7 +1,6 @@ %{ #include #include -#include #include #include #include "utf8html.h" @@ -9,7 +8,6 @@ %include %include "osishtmlhref.h" -%include "plainhtml.h" %include "thmlhtmlhref.h" %include "gbfhtmlhref.h" %include "utf8html.h" diff --git a/bindings/swig/package/Makefile.am b/bindings/swig/package/Makefile.am index c440017..14500c3 100644 --- a/bindings/swig/package/Makefile.am +++ b/bindings/swig/package/Makefile.am @@ -1,6 +1,7 @@ -INCLUDES = $(SWORD_INCLUDES) +AM_CPPFLAGS = @SWORD_CFLAGS@ +ACLOCAL_AMFLAGS=$(ACLOCAL_AMFLAGS) -I m4 lib_LTLIBRARIES = libsword_csharpsword.la -libsword_csharpsword_la_LIBADD = $(SWORD_LIBS) +libsword_csharpsword_la_LIBADD = @SWORD_LIBS@ libsword_csharpsword_la_SOURCES = csharp/Sword.cxx EXTRA_DIST = *.i @@ -26,7 +27,7 @@ perl_make: perl_makebuild perlswig: sword.i mkdir -p perl - $(SWIG) -perl -c++ -shadow -o perl/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i + $(SWIG) -perl -c++ -shadow -o perl/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i perl_makebuild: $(PERLSWIG) mkdir -p perl @@ -40,9 +41,9 @@ perl_makebuild: $(PERLSWIG) @echo "WriteMakefile(" >> perl/Makefile.PL @echo " 'NAME' => 'Sword'," >> perl/Makefile.PL @echo " 'VERSION' => '$(VERSION)'," >> perl/Makefile.PL - @echo " 'INC' => '$(SWORD_INCLUDES) -I..'," >> perl/Makefile.PL + @echo " 'INC' => '@SWORD_CFLAGS@ -I..'," >> perl/Makefile.PL @echo " 'DEFINE' => '-DSWIG'," >> perl/Makefile.PL - @echo " 'LIBS' => '$(LIB_SWORD) -lz'," >> perl/Makefile.PL + @echo " 'LIBS' => '@SWORD_LIBS@'," >> perl/Makefile.PL @echo " 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1" >> perl/Makefile.PL @echo " ($$] >= 5.005 ? ## Add these new keywords supported since 5.005" >> perl/Makefile.PL @echo " (ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module" >> perl/Makefile.PL @@ -69,30 +70,43 @@ perl_makebuild: $(PERLSWIG) tclswig: sword.i mkdir -p tcl - $(SWIG) -tcl -c++ -namespace -pkgversion $(VERSION) -o tcl/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i + $(SWIG) -tcl -c++ -namespace -pkgversion $(VERSION) -o tcl/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i python_make: python_makebuild cd python && $(PYTHON) setup.py build_ext $(LIB_SWORD) pythonswig: sword.i mkdir -p python - $(SWIG) -python -c++ -shadow -o python/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i + $(SWIG) -python -c++ -shadow -o python/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i python_makebuild: $(PYTHONSWIG) mkdir -p python echo "writing python/setup.py" @echo "#! /usr/bin/python" > python/setup.py @echo "" >> python/setup.py - @echo "from distutils.core import setup, Extension" >> python/setup.py + @echo "from distutils.core import setup" >> python/setup.py + @echo "from distutils.extension import Extension" >> python/setup.py + @echo "import commands" >> python/setup.py + @echo "" >> python/setup.py + @echo "def pkgconfig(*packages, **kw):" >> python/setup.py + @echo " flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}" >> python/setup.py + @echo " for token in commands.getoutput(\"pkg-config --libs --cflags %s\" % ' '.join(packages)).split():" >> python/setup.py + @echo " if flag_map.has_key(token[:2]):" >> python/setup.py + @echo " kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])" >> python/setup.py + @echo " else: # throw others to extra_link_args" >> python/setup.py + @echo " kw.setdefault('extra_link_args', []).append(token)" >> python/setup.py + @echo " for k, v in kw.iteritems(): # remove duplicated" >> python/setup.py + @echo " kw[k] = list(set(v))" >> python/setup.py + @echo " return kw" >> python/setup.py + @echo "" >> python/setup.py @echo "setup (name = \"sword\"," >> python/setup.py @echo " version = \"$(VERSION)\"," >> python/setup.py @echo " maintainer = \"Sword Developers\"," >> python/setup.py @echo " maintainer_email = \"sword-devel@crosswire.org\"," >> python/setup.py @echo " url = \"http://www.crosswire.org/sword\"," >> python/setup.py @echo " py_modules = [\"Sword\"]," >> python/setup.py - @echo " include_dirs=['$(SWORD_INCLUDE_DIR)', '..', '../..']," >> python/setup.py - @echo " ext_modules = [Extension(\"_Sword\", [\"Sword.cxx\"]," >> python/setup.py - @echo " libraries=[('sword')], " >> python/setup.py + @echo " include_dirs=['..', '../..']," >> python/setup.py + @echo " ext_modules = [Extension(\"_Sword\", [\"Sword.cxx\"], **pkgconfig('sword')" >> python/setup.py @echo " )], " >> python/setup.py @echo ")" >> python/setup.py @@ -100,14 +114,14 @@ python_makebuild: $(PYTHONSWIG) phpswig: sword.i mkdir -p php - $(SWIG) -php4 -c++ -phpfull -o php/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i + $(SWIG) -php4 -c++ -phpfull -o php/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i csharp/Sword.cxx: csharpswig csharpswig: sword.i mkdir -p csharp - $(SWIG) -csharp -c++ -nodefaultctor -dllimport libsword_csharpwrap.dll -o csharp/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i + $(SWIG) -csharp -c++ -nodefaultctor -dllimport libsword_csharpwrap.dll -o csharp/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i csharpmake: mcs -out:csharp/Sword.dll -target:library csharp/*.cs diff --git a/bindings/swig/package/Makefile.in b/bindings/swig/package/Makefile.in index a398dfa..9d9d7ee 100644 --- a/bindings/swig/package/Makefile.in +++ b/bindings/swig/package/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,14 +79,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \ - config.sub depcomp install-sh ltmain.sh missing +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) depcomp README \ + config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/perl.m4 $(top_srcdir)/php4.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/perl.m4 $(top_srcdir)/php4.m4 \ $(top_srcdir)/python.m4 $(top_srcdir)/swig.m4 \ - $(top_srcdir)/sword.m4 $(top_srcdir)/tcl.m4 \ - $(top_srcdir)/zlib.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/tcl.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -71,42 +117,104 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) libsword_csharpsword_la_DEPENDENCIES = am_libsword_csharpsword_la_OBJECTS = Sword.lo libsword_csharpsword_la_OBJECTS = \ $(am_libsword_csharpsword_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libsword_csharpsword_la_SOURCES) DIST_SOURCES = $(libsword_csharpsword_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope +AM_RECURSIVE_TARGETS = cscope DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -124,6 +232,7 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -143,13 +252,12 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIBZ = @LIBZ@ -LIB_SWORD = @LIB_SWORD@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -162,6 +270,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ @@ -171,6 +280,9 @@ PERL5LIB = @PERL5LIB@ PERLBUILD = @PERLBUILD@ PHP4 = @PHP4@ PHP4INC = @PHP4INC@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYINCLUDE = @PYINCLUDE@ PYLIB = @PYLIB@ PYLINK = @PYLINK@ @@ -183,18 +295,17 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ SWIG = @SWIG@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_INCLUDE_DIR = @SWORD_INCLUDE_DIR@ +SWORD_CFLAGS = @SWORD_CFLAGS@ +SWORD_LIBS = @SWORD_LIBS@ TCLDYNAMICLINKING = @TCLDYNAMICLINKING@ TCLINCLUDE = @TCLINCLUDE@ TCLLIB = @TCLLIB@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -228,7 +339,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -244,9 +354,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = $(SWORD_INCLUDES) +AM_CPPFLAGS = @SWORD_CFLAGS@ +ACLOCAL_AMFLAGS = $(ACLOCAL_AMFLAGS) -I m4 lib_LTLIBRARIES = libsword_csharpsword.la -libsword_csharpsword_la_LIBADD = $(SWORD_LIBS) +libsword_csharpsword_la_LIBADD = @SWORD_LIBS@ libsword_csharpsword_la_SOURCES = csharp/Sword.cxx EXTRA_DIST = *.i @RUNSWIG_FALSE@PERLSWIG = @@ -261,7 +372,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .cxx .lo .o .obj -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -295,9 +406,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -305,6 +416,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -320,14 +433,17 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libsword_csharpsword.la: $(libsword_csharpsword_la_OBJECTS) $(libsword_csharpsword_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libsword_csharpsword_la_OBJECTS) $(libsword_csharpsword_la_LIBADD) $(LIBS) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libsword_csharpsword.la: $(libsword_csharpsword_la_OBJECTS) $(libsword_csharpsword_la_DEPENDENCIES) $(EXTRA_libsword_csharpsword_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libsword_csharpsword_la_OBJECTS) $(libsword_csharpsword_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -338,32 +454,32 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sword.Plo@am__quote@ .cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< Sword.lo: csharp/Sword.cxx -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sword.lo -MD -MP -MF $(DEPDIR)/Sword.Tpo -c -o Sword.lo `test -f 'csharp/Sword.cxx' || echo '$(srcdir)/'`csharp/Sword.cxx -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sword.Tpo $(DEPDIR)/Sword.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='csharp/Sword.cxx' object='Sword.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sword.lo -MD -MP -MF $(DEPDIR)/Sword.Tpo -c -o Sword.lo `test -f 'csharp/Sword.cxx' || echo '$(srcdir)/'`csharp/Sword.cxx +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sword.Tpo $(DEPDIR)/Sword.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='csharp/Sword.cxx' object='Sword.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sword.lo `test -f 'csharp/Sword.cxx' || echo '$(srcdir)/'`csharp/Sword.cxx +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sword.lo `test -f 'csharp/Sword.cxx' || echo '$(srcdir)/'`csharp/Sword.cxx mostlyclean-libtool: -rm -f *.lo @@ -374,26 +490,15 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -405,15 +510,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -422,9 +523,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -467,36 +590,36 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -507,8 +630,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -518,9 +641,9 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -528,6 +651,7 @@ distcheck: dist && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -551,13 +675,21 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -590,10 +722,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -681,21 +818,22 @@ uninstall-am: uninstall-libLTLIBRARIES .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \ - dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \ + clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES all: $(PERLBUILD) $(TCLBUILD) $(PYTHONBUILD) $(PHPBUILD) @@ -706,7 +844,7 @@ perl_make: perl_makebuild perlswig: sword.i mkdir -p perl - $(SWIG) -perl -c++ -shadow -o perl/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i + $(SWIG) -perl -c++ -shadow -o perl/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i perl_makebuild: $(PERLSWIG) mkdir -p perl @@ -720,9 +858,9 @@ perl_makebuild: $(PERLSWIG) @echo "WriteMakefile(" >> perl/Makefile.PL @echo " 'NAME' => 'Sword'," >> perl/Makefile.PL @echo " 'VERSION' => '$(VERSION)'," >> perl/Makefile.PL - @echo " 'INC' => '$(SWORD_INCLUDES) -I..'," >> perl/Makefile.PL + @echo " 'INC' => '@SWORD_CFLAGS@ -I..'," >> perl/Makefile.PL @echo " 'DEFINE' => '-DSWIG'," >> perl/Makefile.PL - @echo " 'LIBS' => '$(LIB_SWORD) -lz'," >> perl/Makefile.PL + @echo " 'LIBS' => '@SWORD_LIBS@'," >> perl/Makefile.PL @echo " 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1" >> perl/Makefile.PL @echo " ($$] >= 5.005 ? ## Add these new keywords supported since 5.005" >> perl/Makefile.PL @echo " (ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module" >> perl/Makefile.PL @@ -749,42 +887,55 @@ perl_makebuild: $(PERLSWIG) tclswig: sword.i mkdir -p tcl - $(SWIG) -tcl -c++ -namespace -pkgversion $(VERSION) -o tcl/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i + $(SWIG) -tcl -c++ -namespace -pkgversion $(VERSION) -o tcl/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i python_make: python_makebuild cd python && $(PYTHON) setup.py build_ext $(LIB_SWORD) pythonswig: sword.i mkdir -p python - $(SWIG) -python -c++ -shadow -o python/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i + $(SWIG) -python -c++ -shadow -o python/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i python_makebuild: $(PYTHONSWIG) mkdir -p python echo "writing python/setup.py" @echo "#! /usr/bin/python" > python/setup.py @echo "" >> python/setup.py - @echo "from distutils.core import setup, Extension" >> python/setup.py + @echo "from distutils.core import setup" >> python/setup.py + @echo "from distutils.extension import Extension" >> python/setup.py + @echo "import commands" >> python/setup.py + @echo "" >> python/setup.py + @echo "def pkgconfig(*packages, **kw):" >> python/setup.py + @echo " flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}" >> python/setup.py + @echo " for token in commands.getoutput(\"pkg-config --libs --cflags %s\" % ' '.join(packages)).split():" >> python/setup.py + @echo " if flag_map.has_key(token[:2]):" >> python/setup.py + @echo " kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])" >> python/setup.py + @echo " else: # throw others to extra_link_args" >> python/setup.py + @echo " kw.setdefault('extra_link_args', []).append(token)" >> python/setup.py + @echo " for k, v in kw.iteritems(): # remove duplicated" >> python/setup.py + @echo " kw[k] = list(set(v))" >> python/setup.py + @echo " return kw" >> python/setup.py + @echo "" >> python/setup.py @echo "setup (name = \"sword\"," >> python/setup.py @echo " version = \"$(VERSION)\"," >> python/setup.py @echo " maintainer = \"Sword Developers\"," >> python/setup.py @echo " maintainer_email = \"sword-devel@crosswire.org\"," >> python/setup.py @echo " url = \"http://www.crosswire.org/sword\"," >> python/setup.py @echo " py_modules = [\"Sword\"]," >> python/setup.py - @echo " include_dirs=['$(SWORD_INCLUDE_DIR)', '..', '../..']," >> python/setup.py - @echo " ext_modules = [Extension(\"_Sword\", [\"Sword.cxx\"]," >> python/setup.py - @echo " libraries=[('sword')], " >> python/setup.py + @echo " include_dirs=['..', '../..']," >> python/setup.py + @echo " ext_modules = [Extension(\"_Sword\", [\"Sword.cxx\"], **pkgconfig('sword')" >> python/setup.py @echo " )], " >> python/setup.py @echo ")" >> python/setup.py phpswig: sword.i mkdir -p php - $(SWIG) -php4 -c++ -phpfull -o php/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i + $(SWIG) -php4 -c++ -phpfull -o php/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i csharp/Sword.cxx: csharpswig csharpswig: sword.i mkdir -p csharp - $(SWIG) -csharp -c++ -nodefaultctor -dllimport libsword_csharpwrap.dll -o csharp/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i + $(SWIG) -csharp -c++ -nodefaultctor -dllimport libsword_csharpwrap.dll -o csharp/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i csharpmake: mcs -out:csharp/Sword.dll -target:library csharp/*.cs diff --git a/bindings/swig/package/README b/bindings/swig/package/README new file mode 100644 index 0000000..90caf83 --- /dev/null +++ b/bindings/swig/package/README @@ -0,0 +1,28 @@ +README +------ + +To build the sword bindings for Sword you require + +SWIG 1.3 (see http://www.swig.org) +one of perl, python, tcl, php +Sword 1.5.8 or newer + +First run +./autogen.sh +./configure + +Then, e.g.,: + +make perlswig +make perl_make +cd perl +sudo make install + +or + +make pythonswig +make python_make +cd python +sudo python setup.py install + + diff --git a/bindings/swig/package/README.cvs b/bindings/swig/package/README.cvs deleted file mode 100644 index 72aaaaa..0000000 --- a/bindings/swig/package/README.cvs +++ /dev/null @@ -1,10 +0,0 @@ -README ------- - -To build the sword bindings for Sword you require - -SWIG 1.3 (see http://www.swig.org) -one of perl, python, tcl, php -Sword 1.5.8 - -First run ./autogen.sh to generate this directory diff --git a/bindings/swig/package/aclocal.m4 b/bindings/swig/package/aclocal.m4 index f20413e..0c2ed70 100644 --- a/bindings/swig/package/aclocal.m4 +++ b/bindings/swig/package/aclocal.m4 @@ -1,7974 +1,226 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) - -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 56 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - -_LT_OUTPUT_LIBTOOL_INIT -]) - - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2008 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_XSI_SHELLFNS - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo - _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}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _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}" - _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}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _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}" - _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}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_SYS_MODULE_PATH_AIX - - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_SHELL_INIT - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -[$]* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi - -AC_SUBST(lt_ECHO) -]) -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], - [An echo program that does not interpret backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -])# _LT_CMD_OLD_ARCHIVE - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* -]) - -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line __oline__ "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - 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' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[[3-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - 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' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl - -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - - -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi - -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -]) # _LT_CMD_GLOBAL_SYMBOLS - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; -esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag= - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _LT_PROG_CXX -# ------------ -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -# compiler, we have our own version here. -m4_defun([_LT_PROG_CXX], -[ -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -AC_PROG_CXX -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_CXX - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_CXX], []) - - -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[AC_REQUIRE([_LT_PROG_CXX])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl - -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - gnu*) - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 will use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - xl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=echo - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - CC=$lt_save_CC - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -]) -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - ;; - - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _LT_PROG_F77 -# ------------ -# Since AC_PROG_F77 is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_F77], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -AC_PROG_F77 -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_F77 - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_F77], []) - - -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_REQUIRE([_LT_PROG_F77])dnl -AC_LANG_PUSH(Fortran 77) - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - CC=${F77-"f77"} - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" -fi # test "$_lt_disable_F77" != yes - -AC_LANG_POP -])# _LT_LANG_F77_CONFIG - - -# _LT_PROG_FC -# ----------- -# Since AC_PROG_FC is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_FC], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -AC_PROG_FC -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_FC - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_FC], []) - - -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_REQUIRE([_LT_PROG_FC])dnl -AC_LANG_PUSH(Fortran) - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - CC=${FC-"f95"} - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC="$lt_save_CC" -])# _LT_LANG_GCJ_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC="$lt_save_CC" -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) - - -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -_LT_EOF - ;; - esac -]) +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Helper functions for option handling. -*- Autoconf -*- +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltoptions.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS - - - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - +fi[]dnl +])# PKG_PROG_PKG_CONFIG -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) - -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) -# lt_join(SEP, ARG1, [ARG2...]) +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED # ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) # -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) - -# ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# # -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -# Generated from ltversion.in. +pkg_failed=no +AC_MSG_CHECKING([for $1]) -# serial 3017 ltversion.m4 -# This file is part of GNU Libtool +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6b' -macro_revision='1.3017' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# serial 4 lt~obsolete.m4 +$$1_PKG_ERRORS -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7980,10 +232,10 @@ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -7999,22 +251,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -8033,7 +285,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -8059,22 +311,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -8093,16 +342,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -8112,7 +359,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -8125,12 +372,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -8138,8 +386,9 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -8178,16 +427,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -8196,16 +445,16 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -8253,7 +502,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -8263,34 +512,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -8303,7 +557,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -8315,21 +569,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -8347,7 +599,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -8357,15 +609,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -8381,7 +630,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -8410,31 +659,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -8445,28 +703,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -8494,7 +756,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8513,16 +775,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -8539,20 +799,17 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -8560,13 +817,14 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -8574,18 +832,14 @@ AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -8603,7 +857,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -8630,15 +884,12 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -8646,11 +897,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -8663,63 +913,35 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -8732,22 +954,16 @@ AC_DEFUN([_AM_IF_OPTION], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -8758,32 +974,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -8793,9 +1017,85 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8803,34 +1103,32 @@ AC_MSG_RESULT(yes)]) # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -8838,24 +1136,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -8865,83 +1161,125 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/libtool.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) m4_include([perl.m4]) m4_include([php4.m4]) m4_include([python.m4]) m4_include([swig.m4]) -m4_include([sword.m4]) m4_include([tcl.m4]) -m4_include([zlib.m4]) diff --git a/bindings/swig/package/config.guess b/bindings/swig/package/config.guess index dc84c68..b79252d 100755 --- a/bindings/swig/package/config.guess +++ b/bindings/swig/package/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ timestamp='2009-11-20' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -394,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +501,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +515,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +572,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +615,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +751,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +790,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,30 +809,35 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -848,15 +874,22 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,52 +899,56 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -930,51 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1032,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1068,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1096,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1137,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1181,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1210,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1178,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1204,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1230,7 +1284,10 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1275,13 +1332,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,11 +1356,11 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/bindings/swig/package/config.sub b/bindings/swig/package/config.sub index 2a55a50..c765b34 100755 --- a/bindings/swig/package/config.sub +++ b/bindings/swig/package/config.sub @@ -1,38 +1,31 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2013-04-24' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,8 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,13 +115,18 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -152,12 +149,12 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +170,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -221,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -245,20 +248,27 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,34 +286,45 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ - | nios | nios2 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +334,21 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,25 +363,30 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -363,29 +404,34 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ - | nios-* | nios2-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +456,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +526,20 @@ case $basic_machine in basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +571,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +729,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,9 +786,13 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -771,10 +829,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +905,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +993,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -933,7 +1006,7 @@ case $basic_machine in ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -948,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1017,6 +1094,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1153,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1224,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1324,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1281,20 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1413,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1462,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1426,15 +1498,14 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1528,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1543,20 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1576,11 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1509,6 +1589,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1527,7 +1610,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff --git a/bindings/swig/package/configure b/bindings/swig/package/configure index e0aad4a..7e38cc8 100755 --- a/bindings/swig/package/configure +++ b/bindings/swig/package/configure @@ -1,21 +1,21 @@ #! /bin/sh -# From configure.ac Revision: 2541 . +# From configure.ac Revision: 2875 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for swordbindings 1.6.1+svn$Rev: 2541 $. +# Generated by GNU Autoconf 2.69 for swordbindings 1.6.2. +# +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # -# Report bugs to . # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -23,23 +23,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -47,7 +39,13 @@ export as_nl as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -58,7 +56,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -81,13 +79,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -97,15 +88,16 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -117,12 +109,16 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -134,7 +130,301 @@ export LC_ALL LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -148,8 +438,12 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -169,566 +463,115 @@ $as_echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit } -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac -if as_func_ret_success; then - : +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi else - exitcode=1 - echo positional parameters were not saved. + as_ln_s='cp -pR' fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi +as_test_x='test -x' +as_executable_p=as_fn_executable_p - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -fi +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +SHELL=${CONFIG_SHELL-/bin/sh} -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac -fi +test -n "$DJDIR" || exec 7<&0 &1 - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -$* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - - -exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` # # Initializations. @@ -741,14 +584,14 @@ cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='swordbindings' PACKAGE_TARNAME='swordbindings' -PACKAGE_VERSION='1.6.1+svn$Rev: 2541 $' -PACKAGE_STRING='swordbindings 1.6.1+svn$Rev: 2541 $' -PACKAGE_BUGREPORT='sword-bugs@crosswire.org' +PACKAGE_VERSION='1.6.2' +PACKAGE_STRING='swordbindings 1.6.2' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="sword.i" # Factoring default headers for most tests. @@ -810,12 +653,11 @@ PERL MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE -SWORD_INCLUDE_DIR -SWORD_INCLUDES -LIB_SWORD -LIBZ -USER_LDFLAGS -USER_INCLUDES +SWORD_LIBS +SWORD_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG RUNSWIG_FALSE RUNSWIG_TRUE SWIG @@ -826,9 +668,11 @@ OTOOL LIPO NMEDIT DSYMUTIL -lt_ECHO +MANIFEST_TOOL RANLIB +ac_ct_AR AR +DLLTOOL OBJDUMP LN_S NM @@ -857,6 +701,7 @@ CXX am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -870,6 +715,10 @@ CPPFLAGS LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -923,6 +772,7 @@ bindir program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -933,19 +783,17 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_shared enable_static with_pic enable_fast_install with_gnu_ld +with_sysroot enable_libtool_lock with_swigbin enable_swig -with_sword_dir -enable_static_sword -with_extra_includes -with_extra_libs enable_maintainer_mode with_perl with_python @@ -967,7 +815,12 @@ CXX CXXFLAGS CCC CPP -CXXCPP' +CXXCPP +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +SWORD_CFLAGS +SWORD_LIBS' # Initialize some variables set by options. @@ -1030,8 +883,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1076,8 +930,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1103,8 +956,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1308,8 +1160,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1325,8 +1176,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1356,17 +1206,17 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1375,7 +1225,7 @@ Try \`$0 --help' for more information." >&2 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1383,15 +1233,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1414,8 +1262,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1429,8 +1276,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1445,11 +1290,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1488,13 +1331,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1520,7 +1361,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures swordbindings 1.6.1+svn$Rev: 2541 $ to adapt to many kinds of systems. +\`configure' configures swordbindings 1.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1534,7 +1375,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1590,7 +1431,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of swordbindings 1.6.1+svn$Rev: 2541 $:";; + short | recursive ) echo "Configuration of swordbindings 1.6.2:";; esac cat <<\_ACEOF @@ -1598,30 +1439,32 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-swig=path Run swig to generate new source default=no - --enable-static-sword Link to the static Sword library - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer --disable-swig do not run swig to generate input files Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). --with-swigbin=path Set location of swig executable - --with-sword-dir=DIR Path where Sword is being installed (default=/usr) - --with-extra-includes=DIR - adds non standard include paths - --with-extra-libs=DIR adds non standard library paths --with-perl=path Set location of Perl5 executable --with-python=path Set location of Python executable --with-php4=path Set location of PHP4 executable @@ -1636,17 +1479,25 @@ Some influential environment variables: LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CXX C++ compiler command CXXFLAGS C++ compiler flags CPP C preprocessor CXXCPP C++ preprocessor + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + SWORD_CFLAGS + C compiler flags for SWORD, overriding pkg-config + SWORD_LIBS linker flags for SWORD, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to the package provider. _ACEOF ac_status=$? fi @@ -1709,36 +1560,421 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -swordbindings configure 1.6.1+svn$Rev: 2541 $ -generated by GNU Autoconf 2.63 +swordbindings configure 1.6.2 +generated by GNU Autoconf 2.69 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by swordbindings $as_me 1.6.1+svn$Rev: 2541 $, which was -generated by GNU Autoconf 2.63. Invocation command line was - $ $0 $@ +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## -_ACEOF -exec 5>>config.log +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_cxx_try_cpp LINENO +# ------------------------ +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_cpp + +# ac_fn_cxx_try_link LINENO +# ------------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_link +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by swordbindings $as_me 1.6.2, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` uname -s = `(uname -s) 2>/dev/null || echo unknown` uname -v = `(uname -v) 2>/dev/null || echo unknown` @@ -1760,8 +1996,8 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1798,9 +2034,9 @@ do ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1816,13 +2052,13 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1834,11 +2070,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1847,13 +2081,13 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1872,11 +2106,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1889,11 +2121,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1907,11 +2137,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -1925,46 +2153,53 @@ _ASBOX exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -1975,19 +2210,23 @@ fi for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; @@ -1995,7 +2234,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -2010,11 +2249,11 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -2024,17 +2263,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -2046,43 +2285,20 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2094,7 +2310,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.11' +am__api_version='1.13' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2113,9 +2329,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2141,10 +2355,10 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2152,11 +2366,11 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2164,7 +2378,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2193,7 +2407,7 @@ case $as_dir/ in ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2209,7 +2423,7 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2220,68 +2434,73 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 -$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 -$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2304,12 +2523,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2321,17 +2540,17 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2342,24 +2561,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2369,9 +2588,9 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2382,24 +2601,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2408,7 +2627,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2421,10 +2640,10 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2432,9 +2651,9 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2444,11 +2663,12 @@ do esac done done -done + done IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2456,26 +2676,19 @@ fi # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2486,24 +2699,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2511,11 +2724,11 @@ fi test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2523,7 +2736,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2533,11 +2746,11 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2551,21 +2764,58 @@ else fi rmdir .tst 2>/dev/null -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } - fi +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; fi -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then CYGPATH_W='cygpath -w' else CYGPATH_W=echo @@ -2574,8 +2824,8 @@ fi # Define the identity of the package. - PACKAGE=swordbindings - VERSION=1.5.11 + PACKAGE='swordbindings' + VERSION='1.6.2' cat >>confdefs.h <<_ACEOF @@ -2603,13 +2853,25 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' @@ -2633,9 +2895,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2646,24 +2908,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2673,9 +2935,9 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2686,24 +2948,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2712,7 +2974,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2726,9 +2988,9 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2739,24 +3001,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2766,9 +3028,9 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2780,18 +3042,18 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2810,10 +3072,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2825,9 +3087,9 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2838,24 +3100,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2869,9 +3131,9 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2882,24 +3144,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2912,7 +3174,7 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2923,57 +3185,37 @@ fi fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2989,8 +3231,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3006,17 +3248,17 @@ do done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3033,7 +3275,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3052,84 +3294,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3144,32 +3343,83 @@ for ac_file in conftest.exe conftest conftest.*; do esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3181,17 +3431,17 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3204,31 +3454,23 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3242,37 +3484,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3281,20 +3502,16 @@ else fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3305,35 +3522,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3344,36 +3537,12 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3384,42 +3553,17 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -3436,23 +3580,18 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3504,32 +3643,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3540,17 +3656,19 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -3569,14 +3687,14 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3597,18 +3715,19 @@ if test "$am__include" = "#"; then fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3622,17 +3741,18 @@ fi depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3666,16 +3786,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3684,16 +3804,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3732,7 +3852,7 @@ else fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3761,9 +3881,9 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -3774,24 +3894,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 $as_echo "$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3805,9 +3925,9 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -3818,24 +3938,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 $as_echo "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3848,7 +3968,7 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3859,53 +3979,36 @@ fi fi fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +if ${ac_cv_cxx_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3919,37 +4022,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes @@ -3958,20 +4040,16 @@ else fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then +if ${ac_cv_prog_cxx_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3982,35 +4060,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4021,36 +4075,12 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4061,42 +4091,17 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -4121,17 +4126,18 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4165,16 +4171,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4183,16 +4189,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4231,7 +4237,7 @@ else fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type @@ -4246,109 +4252,17 @@ else fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - -done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.2.6b' -macro_revision='1.3017' +macro_version='2.4.2' +macro_revision='1.3337' @@ -4366,35 +4280,27 @@ ltmain="$ac_aux_dir/ltmain.sh" # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -4410,28 +4316,24 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -4447,9 +4349,78 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -4457,7 +4428,7 @@ else ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - $as_unset ac_script || ac_script= + { ac_script=; unset ac_script;} if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -4466,10 +4437,10 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4486,7 +4457,7 @@ case `"$ac_path_SED" --version 2>&1` in $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" @@ -4501,19 +4472,17 @@ esac $ac_path_SED_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4531,9 +4500,9 @@ Xsed="$SED -e 1s/^X//" -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4544,10 +4513,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4564,7 +4533,7 @@ case `"$ac_path_GREP" --version 2>&1` in $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -4579,26 +4548,24 @@ esac $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4612,10 +4579,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4632,7 +4599,7 @@ case `"$ac_path_EGREP" --version 2>&1` in $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -4647,12 +4614,10 @@ esac $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4660,14 +4625,14 @@ fi fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -4681,10 +4646,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -4701,7 +4666,7 @@ case `"$ac_path_FGREP" --version 2>&1` in $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" @@ -4716,12 +4681,10 @@ esac $ac_path_FGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -4729,7 +4692,7 @@ fi fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -4755,7 +4718,7 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -4764,7 +4727,7 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -4794,13 +4757,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -4831,18 +4794,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -4855,7 +4816,7 @@ case `$LD -v 2>&1 &5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -4867,9 +4828,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -4916,20 +4877,23 @@ else : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$ac_tool_prefix"; then - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then +if ${ac_cv_prog_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -4940,24 +4904,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 $as_echo "$DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4967,13 +4931,13 @@ fi fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -4984,24 +4948,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 $as_echo "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5014,7 +4978,7 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5022,6 +4986,15 @@ esac fi fi + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -5034,44 +5007,44 @@ test -z "$NM" && NM=nm -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then +if ${lt_cv_nm_interface+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5044: $ac_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5047: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5050: output\"" >&5) + (eval echo "\"\$as_me:$LINENO: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 $as_echo "$lt_cv_nm_interface" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 $as_echo "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -5104,6 +5077,11 @@ else lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -5129,6 +5107,11 @@ else lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5168,8 +5151,8 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -5189,10 +5172,10 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:$LINENO: result: none" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -5206,27 +5189,27 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 $as_echo "$xsi_shell" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 $as_echo "$lt_shell_append" >&6; } @@ -5261,14 +5244,88 @@ esac -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then +if ${lt_cv_ld_reload_flag+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in @@ -5277,6 +5334,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -5297,9 +5359,9 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -5310,24 +5372,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 $as_echo "$OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5337,9 +5399,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -5350,24 +5412,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 $as_echo "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5376,7 +5438,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5396,9 +5458,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -5440,16 +5502,18 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -5479,6 +5543,10 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -5487,11 +5555,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -5512,8 +5580,8 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5592,8 +5660,23 @@ tpf*) esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5607,54 +5690,212 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then +if ${ac_cv_prog_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 -$as_echo "$AR" >&6; } +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -5665,44 +5906,49 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 $as_echo "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} + + + @@ -5711,15 +5957,70 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -5730,24 +6031,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5757,9 +6058,9 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -5770,24 +6071,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5796,7 +6097,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5816,9 +6117,9 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -5829,24 +6130,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5856,9 +6157,9 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -5869,24 +6170,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 $as_echo "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5895,7 +6196,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5920,15 +6221,27 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + @@ -5973,9 +6286,9 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6036,8 +6349,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6061,6 +6374,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -6073,6 +6387,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -6091,18 +6406,18 @@ void nm_test_func(void){} int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -6114,6 +6429,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -6125,7 +6452,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -6151,19 +6478,19 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -6193,13 +6520,29 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:$LINENO: result: failed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 $as_echo "failed" >&6; } else - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + + + + + @@ -6216,6 +6559,39 @@ fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } @@ -6223,7 +6599,7 @@ fi # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -6235,11 +6611,11 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -6253,12 +6629,12 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6256 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -6288,15 +6664,15 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -6306,7 +6682,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6325,7 +6704,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -6345,9 +6727,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -6356,11 +6738,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6371,38 +6749,13 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6410,25 +6763,38 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -6444,135 +6810,252 @@ esac need_locks="$enable_libtool_lock" - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - DSYMUTIL=$ac_ct_DSYMUTIL + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL fi else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes fi -done -done -IFS=$as_save_IFS + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 $as_echo "$NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6582,9 +7065,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -6595,24 +7078,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 $as_echo "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6621,7 +7104,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6634,9 +7117,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -6647,24 +7130,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 $as_echo "$LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6674,9 +7157,9 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -6687,24 +7170,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 $as_echo "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6713,7 +7196,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6726,9 +7209,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -6739,24 +7222,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 $as_echo "$OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6766,9 +7249,9 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -6779,24 +7262,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 $as_echo "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6805,7 +7288,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6818,9 +7301,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then +if ${ac_cv_prog_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -6831,24 +7314,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 $as_echo "$OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6858,9 +7341,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -6871,24 +7354,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 $as_echo "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6897,7 +7380,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6933,9 +7416,9 @@ fi - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -6951,7 +7434,13 @@ else $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -6960,22 +7449,19 @@ else rm -f conftest.* fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +if ${lt_cv_ld_exported_symbols_list+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6986,43 +7472,53 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no + lt_cv_ld_exported_symbols_list=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -7050,7 +7546,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7063,14 +7559,14 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -7085,11 +7581,7 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -7098,78 +7590,34 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -7181,7 +7629,7 @@ fi else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -7192,11 +7640,7 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -7205,87 +7649,40 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -7295,16 +7692,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -7319,48 +7712,23 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7370,18 +7738,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7391,14 +7755,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -7425,925 +7785,65 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_header in dlfcn.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi - # Broken: fails on valid input. -continue fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then -rm -f conftest.err conftest.$ac_ext +$as_echo "#define STDC_HEADERS 1" >>confdefs.h - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break fi -rm -f conftest.err conftest.$ac_ext - done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -_lt_caught_CXX_error=yes; } -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -else - _lt_caught_CXX_error=yes +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + fi +done + + + +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf + @@ -8359,7 +7859,7 @@ fi # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -8390,7 +7890,7 @@ fi # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -8422,8 +7922,23 @@ fi # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8438,7 +7953,7 @@ test -z "$pic_mode" && pic_mode=default # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -8494,6 +8009,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + + @@ -8519,9 +8039,9 @@ if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -8534,7 +8054,7 @@ else fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -8549,19 +8069,6 @@ _ACEOF - - - - - - - - - - - - - case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -8574,23 +8081,6 @@ aix3*) ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -8619,7 +8109,7 @@ for cc_temp in $compiler""; do *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -8627,9 +8117,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8680,10 +8170,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8693,9 +8183,9 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:$LINENO: checking for file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8746,10 +8236,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8819,16 +8309,25 @@ _lt_linker_boilerplate=`cat conftest.err` $RM -r conftest* +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac - { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -8844,15 +8343,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8847: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8851: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes @@ -8861,7 +8360,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then @@ -8881,8 +8380,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -8930,6 +8427,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -8972,6 +8475,15 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -9013,7 +8525,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -9034,7 +8546,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' @@ -9046,25 +8564,40 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-qpic' lt_prog_compiler_static='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' ;; esac ;; @@ -9096,7 +8629,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; @@ -9153,21 +8686,25 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -9183,15 +8720,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9186: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9190: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes @@ -9200,7 +8737,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then @@ -9220,13 +8757,18 @@ fi + + + + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -9239,7 +8781,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes @@ -9252,7 +8794,7 @@ else LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then @@ -9267,9 +8809,9 @@ fi - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9288,16 +8830,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9291: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9295: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9314,7 +8856,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9322,9 +8864,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9343,16 +8885,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9346: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9350: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9369,7 +8911,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9378,7 +8920,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -9386,10 +8928,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; } touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -9402,7 +8944,7 @@ fi - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= @@ -9418,7 +8960,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9465,7 +9006,33 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie esac ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -9483,6 +9050,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -9498,11 +9066,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -9538,10 +9107,12 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -9559,6 +9130,11 @@ _LT_EOF fi ;; + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no @@ -9574,7 +9150,7 @@ _LT_EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -9584,15 +9160,16 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9603,13 +9180,17 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -9625,17 +9206,16 @@ _LT_EOF fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9649,8 +9229,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9668,8 +9248,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9715,8 +9295,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9756,8 +9336,10 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -9844,11 +9426,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9859,54 +9443,34 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_link "$LINENO"; then : + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' @@ -9915,11 +9479,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9930,59 +9496,44 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_link "$LINENO"; then : + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -10014,20 +9565,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -10037,7 +9632,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec='' + fi link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in @@ -10045,7 +9645,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="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}" @@ -10063,10 +9663,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10079,7 +9675,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10088,7 +9684,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -10096,7 +9692,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -10111,14 +9707,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10130,16 +9725,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -10151,7 +9746,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + ;; esac fi @@ -10179,52 +9813,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF -int foo(void) {} + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + lt_cv_irix_exported_symbol=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -10286,17 +9907,17 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -10306,13 +9927,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10325,9 +9946,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -10476,7 +10097,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no @@ -10513,46 +10134,52 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac fi @@ -10710,12 +10337,7 @@ esac - - - - - - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then @@ -10723,16 +10345,23 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -10745,7 +10374,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -10765,7 +10394,13 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[lt_foo]++; } if (lt_freq[lt_foo] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -10791,7 +10426,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10800,7 +10435,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10853,7 +10488,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - 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' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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' ;; esac ;; @@ -10865,7 +10500,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -10884,8 +10519,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -10906,36 +10542,83 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -10956,7 +10639,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10964,10 +10647,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -10975,7 +10654,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10993,7 +10672,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11013,12 +10692,26 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -11064,12 +10757,14 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -11085,7 +10780,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -11122,9 +10817,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11132,16 +10827,17 @@ linux* | k*bsd*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11152,43 +10848,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -11200,8 +10872,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - 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' ' '` + 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;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11232,7 +10905,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11301,7 +10974,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11326,7 +10999,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11350,7 +11023,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11381,7 +11054,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11391,7 +11064,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11401,7 +11074,7 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -11503,7 +11176,12 @@ fi - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || @@ -11528,7 +11206,7 @@ else # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || @@ -11573,18 +11251,14 @@ else darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11602,43 +11276,18 @@ return dlopen (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -11650,190 +11299,20 @@ fi ;; - *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif - -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then - lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dld_shl_load=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -11841,72 +11320,41 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif - +char shl_load (); int main () { -return dlopen (); +return shl_load (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no + ac_cv_lib_dld_shl_load=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11924,57 +11372,28 @@ return dlopen (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11992,57 +11411,28 @@ return dlopen (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12060,43 +11450,18 @@ return dld_link (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -12135,9 +11500,9 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -12146,7 +11511,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12149 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12187,7 +11552,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12196,7 +11567,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -12205,11 +11580,11 @@ int main () return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12226,14 +11601,14 @@ rm -fr conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -12242,7 +11617,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12245 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12283,7 +11658,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12292,7 +11673,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -12301,11 +11686,11 @@ int main () return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12322,7 +11707,7 @@ rm -fr conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 $as_echo "$lt_cv_dlopen_self_static" >&6; } fi @@ -12361,12 +11746,12 @@ fi striplib= old_striplib= -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough @@ -12375,15 +11760,15 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi ;; *) - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ;; esac @@ -12401,12 +11786,12 @@ fi # Report which library types will actually be built - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 $as_echo "$can_build_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no @@ -12427,14 +11812,14 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } fi ;; esac - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 $as_echo "$enable_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -12449,6 +11834,145 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CC="$lt_save_CC" + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then + if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +else + _lt_caught_CXX_error=yes +fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -12465,7 +11989,6 @@ export_dynamic_flag_spec_CXX= hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -12475,6 +11998,8 @@ module_cmds_CXX= module_expsym_cmds_CXX= link_all_deplibs_CXX=unknown old_archive_cmds_CXX=$old_archive_cmds +reload_flag_CXX=$reload_flag +reload_cmds_CXX=$reload_cmds no_undefined_flag_CXX= whole_archive_flag_spec_CXX= enable_shared_with_static_runtimes_CXX=no @@ -12530,6 +12055,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -12547,6 +12073,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do @@ -12557,7 +12084,7 @@ $RM -r conftest* *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` if test -n "$compiler"; then @@ -12575,7 +12102,7 @@ cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -12584,7 +12111,7 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -12614,13 +12141,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -12651,18 +12178,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -12675,7 +12200,7 @@ case `$LD -v 2>&1 &5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -12688,8 +12213,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -12721,7 +12246,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -12730,7 +12255,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld fi # PORTME: fill in a description of your system's C++ link characteristics - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in @@ -12831,11 +12356,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -12846,55 +12373,35 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_link "$LINENO"; then : + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath__CXX +fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' @@ -12903,74 +12410,61 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath__CXX +fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + fi archive_cmds_need_lc_CXX=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -13000,28 +12494,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_CXX=' ' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=yes + file_list_spec_CXX='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' + enable_shared_with_static_runtimes_CXX=yes + # Don't use ranlib + old_postinstall_cmds_CXX='chmod 644 $oldlib' + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; + esac + ;; darwin* | rhapsody*) @@ -13029,7 +12570,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec_CXX='' + fi link_all_deplibs_CXX=yes allow_undefined_flag_CXX="$_lt_dar_allow_undefined" case $cc_basename in @@ -13037,7 +12583,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds_CXX="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}" @@ -13071,7 +12617,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -13090,6 +12636,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi gnu*) ;; + haiku*) + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs_CXX=yes + ;; + hpux9*) hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -13114,11 +12665,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13179,7 +12730,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -13189,10 +12740,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -13222,7 +12773,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -13233,9 +12784,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes @@ -13246,7 +12797,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -13264,7 +12815,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13301,26 +12852,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [1-5]* | *pgcpp\ [1-5]*) + *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -13328,7 +12879,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -13347,9 +12898,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13369,13 +12920,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -13444,7 +12995,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec_CXX='${wl}-E' whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else ld_shlibs_CXX=no fi @@ -13479,15 +13030,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host in osf3*) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; @@ -13503,17 +13054,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -13523,7 +13074,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -13559,7 +13110,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' @@ -13580,7 +13131,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac link_all_deplibs_CXX=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -13600,14 +13151,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -13618,7 +13169,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' @@ -13672,6 +13223,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi CC*) archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ + '"$old_archive_cmds_CXX" + reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ + '"$reload_cmds_CXX" ;; *) archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -13705,7 +13260,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac - { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no @@ -13733,11 +13288,19 @@ private: }; _LT_EOF -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -13746,7 +13309,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -13755,13 +13318,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + case ${prev} in + -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -13781,8 +13353,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -13818,6 +13392,7 @@ else fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken case $host_os in @@ -13853,7 +13428,7 @@ linux*) solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -13918,8 +13493,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -13969,6 +13542,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static_CXX= + ;; interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -14018,6 +13596,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; dgux*) case $cc_basename in ec++*) @@ -14074,7 +13657,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -14107,8 +13690,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-qpic' lt_prog_compiler_static_CXX='-qstaticlink' @@ -14170,7 +13753,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' @@ -14235,18 +13818,25 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then +if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_CXX=no @@ -14262,15 +13852,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14265: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14269: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works_CXX=yes @@ -14279,7 +13869,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then @@ -14296,13 +13886,15 @@ fi + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then +if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no @@ -14315,7 +13907,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works_CXX=yes @@ -14328,7 +13920,7 @@ else LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then @@ -14340,9 +13932,9 @@ fi - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -14361,16 +13953,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14364: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14368: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -14387,14 +13979,14 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -14413,16 +14005,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14416: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14420: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -14439,7 +14031,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } @@ -14448,7 +14040,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -14456,10 +14048,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; } touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -14469,33 +14061,43 @@ fi - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; + case $cc_basename in + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + ;; + esac + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no @@ -14523,46 +14125,52 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -$as_echo "$archive_cmds_need_lc_CXX" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc_CXX=no + else + lt_cv_archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } + archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ;; esac fi @@ -14630,9 +14238,7 @@ esac - - - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= @@ -14657,7 +14263,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -14666,7 +14272,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -14719,7 +14325,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - 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' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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' ;; esac ;; @@ -14731,7 +14337,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -14750,8 +14356,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -14772,36 +14379,82 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -14821,7 +14474,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -14829,10 +14482,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -14840,7 +14489,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -14858,7 +14507,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -14878,12 +14527,26 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -14929,12 +14592,14 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -14950,7 +14615,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -14987,9 +14652,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14997,16 +14662,17 @@ linux* | k*bsd*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -15017,43 +14683,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes +if ac_fn_cxx_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -15065,8 +14707,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - 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' ' '` + 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;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15097,7 +14740,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -15166,7 +14809,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15191,7 +14834,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15215,7 +14858,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -15246,7 +14889,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15256,7 +14899,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15266,7 +14909,7 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -15317,7 +14960,9 @@ fi - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || @@ -15342,7 +14987,7 @@ else # directories. hardcode_action_CXX=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 $as_echo "$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink || @@ -15364,6 +15009,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -15392,6 +15038,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + ac_config_commands="$ac_config_commands libtool" @@ -15404,14 +15052,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # Check whether --with-swigbin was given. -if test "${with_swigbin+set}" = set; then +if test "${with_swigbin+set}" = set; then : withval=$with_swigbin; SWIGBIN="$withval" else SWIGBIN= fi # Check whether --enable-swig was given. -if test "${enable_swig+set}" = set; then +if test "${enable_swig+set}" = set; then : enableval=$enable_swig; else enable_swig=no @@ -15421,9 +15069,9 @@ fi if test -z "$SWIGBIN"; then # Extract the first word of "swig", so it can be a program name with args. set dummy swig; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SWIG+set}" = set; then +if ${ac_cv_path_SWIG+:} false; then : $as_echo_n "(cached) " >&6 else case $SWIG in @@ -15436,14 +15084,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -15451,10 +15099,10 @@ esac fi SWIG=$ac_cv_path_SWIG if test -n "$SWIG"; then - { $as_echo "$as_me:$LINENO: result: $SWIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5 $as_echo "$SWIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -15462,9 +15110,9 @@ fi else # Extract the first word of "swig", so it can be a program name with args. set dummy swig; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SWIG+set}" = set; then +if ${ac_cv_path_SWIG+:} false; then : $as_echo_n "(cached) " >&6 else case $SWIG in @@ -15477,14 +15125,14 @@ for as_dir in $SWIGBIN do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_SWIG" && ac_cv_path_SWIG=""not found"" @@ -15493,10 +15141,10 @@ esac fi SWIG=$ac_cv_path_SWIG if test -n "$SWIG"; then - { $as_echo "$as_me:$LINENO: result: $SWIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5 $as_echo "$SWIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -15528,413 +15176,211 @@ fi # Check libraries # --------------------------------------------------------------------- -{ $as_echo "$as_me:$LINENO: checking for extra includes" >&5 -$as_echo_n "checking for extra includes... " >&6; } - -# Check whether --with-extra-includes was given. -if test "${with_extra_includes+set}" = set; then - withval=$with_extra_includes; kde_use_extra_includes="$withval" -else - kde_use_extra_includes=NONE - -fi - -kde_extra_includes= -if test -n "$kde_use_extra_includes" && \ - test "$kde_use_extra_includes" != "NONE"; then - - ac_save_ifs=$IFS - IFS=':' - for dir in $kde_use_extra_includes; do - kde_extra_includes="$kde_extra_includes $dir" - USER_INCLUDES="$USER_INCLUDES -I$dir" - done - IFS=$ac_save_ifs - kde_use_extra_includes="added" -else - kde_use_extra_includes="no" -fi - - -{ $as_echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5 -$as_echo "$kde_use_extra_includes" >&6; } - -kde_extra_libs= -{ $as_echo "$as_me:$LINENO: checking for extra libs" >&5 -$as_echo_n "checking for extra libs... " >&6; } -# Check whether --with-extra-libs was given. -if test "${with_extra_libs+set}" = set; then - withval=$with_extra_libs; kde_use_extra_libs=$withval -else - kde_use_extra_libs=NONE - -fi - -if test -n "$kde_use_extra_libs" && \ - test "$kde_use_extra_libs" != "NONE"; then - - ac_save_ifs=$IFS - IFS=':' - for dir in $kde_use_extra_libs; do - kde_extra_libs="$kde_extra_libs $dir" - KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir" - USER_LDFLAGS="$USER_LDFLAGS -L$dir" - done - IFS=$ac_save_ifs - kde_use_extra_libs="added" -else - kde_use_extra_libs="no" -fi -{ $as_echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5 -$as_echo "$kde_use_extra_libs" >&6; } - - -{ $as_echo "$as_me:$LINENO: checking for libz" >&5 -$as_echo_n "checking for libz... " >&6; } -if test "${ac_cv_lib_z+set}" = set; then +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -kde_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET" -kde_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include - -int -main () -{ -return (zlibVersion() == ZLIB_VERSION); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "ac_cv_lib_z='-lz'" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "ac_cv_lib_z=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS="$kde_save_LIBS" -CFLAGS="$kde_save_CFLAGS" - -fi -if test ! "$ac_cv_lib_z" = no; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_LIBZ 1 -_ACEOF - - LIBZ="$ac_cv_lib_z" - - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5 -$as_echo "$ac_cv_lib_z" >&6; } -else - { { $as_echo "$as_me:$LINENO: error: not found. Check your installation and look into config.log" >&5 -$as_echo "$as_me: error: not found. Check your installation and look into config.log" >&2;} - { (exit 1); exit 1; }; } - LIBZ="" - -fi - - - - -# Check whether --with-sword-dir was given. -if test "${with_sword_dir+set}" = set; then - withval=$with_sword_dir; - ac_sword_dir=$withval - -else - ac_sword_dir=/usr - -fi - - -# Check whether --enable-static-sword was given. -if test "${enable_static_sword+set}" = set; then - enableval=$enable_static_sword; ac_static_sword="YES" -else - ac_static_sword="" - + ;; +esac fi - - -{ $as_echo "$as_me:$LINENO: checking for Sword library files" >&5 -$as_echo_n "checking for Sword library files... " >&6; } - -ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" - -if test "$ac_static_sword" = "YES"; then - SEARCH_LIBS="libsword.a"; +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - SEARCH_LIBS="libsword.a libsword.so"; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test "${ac_cv_sword_libdir+set}" = set; then +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - -ac_cv_sword_libdir=NO -for i in $ac_sword_library_dirs; + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do - for j in $SEARCH_LIBS; - do - echo "configure: 15729: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - ac_cv_sword_libdir=$i - break 2 - fi - done + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS + ;; +esac fi - - -if test "$ac_cv_sword_libdir" = "NO"; then - { { $as_echo "$as_me:$LINENO: error: SWORD library not found. Try to use configure with --with-sword-dir=/your/SWORD/path!" >&5 -$as_echo "$as_me: error: SWORD library not found. Try to use configure with --with-sword-dir=/your/SWORD/path!" >&2;} - { (exit 1); exit 1; }; }; -fi - -if test "$ac_static_sword" = "YES"; then - LIB_SWORD="$ac_cv_sword_libdir/libsword.a"; +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - LIB_SWORD="-L$ac_cv_sword_libdir -lsword"; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -#AC_SUBST(SWORD_LIBRARY_PATH) - -all_libraries="$all_libraries -L$ac_cv_sword_libdir" - -if test "$ac_static_sword" = "YES"; then - MESSAGE="static library $ac_cv_sword_libdir/libsword.a"; + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi else - MESSAGE="$ac_cv_sword_libdir"; + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi -{ $as_echo "$as_me:$LINENO: result: $MESSAGE" >&5 -$as_echo "$MESSAGE" >&6; } - - - -{ $as_echo "$as_me:$LINENO: checking for Sword include files" >&5 -$as_echo_n "checking for Sword include files... " >&6; } -ac_sword_include_dirs="$ac_sword_dir/include/sword $ac_sword_dir/include /usr/include/sword /usr/include /usr/local/include/sword /usr/local/include /usr/local/sword/include /usr/local/sword/include/sword" - -if test "${ac_cv_sword_incdir+set}" = set; then - $as_echo_n "(cached) " >&6 -else - -ac_cv_sword_incdir=NO -for i in $ac_sword_include_dirs; -do - for j in swmgr.h; - do - echo "configure: 15780: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - ac_cv_sword_incdir=$i - break 2 - fi - done -done fi - - -if test "$ac_cv_sword_incdir" = "NO"; then - { { $as_echo "$as_me:$LINENO: error: The Sword include file files were not found. -Please try to use configure with --with-sword-dir=/your/SWORD/path ! -" >&5 -$as_echo "$as_me: error: The Sword include file files were not found. -Please try to use configure with --with-sword-dir=/your/SWORD/path ! -" >&2;} - { (exit 1); exit 1; }; } +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi fi -SWORD_INCLUDES="-I$ac_cv_sword_incdir" -SWORD_INCLUDE_DIR="$ac_cv_sword_incdir" - - -all_includes="$all_includes -I$ac_cv_sword_incdir" - -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sword_incdir" >&5 -$as_echo "$ac_cv_sword_incdir" >&6; } - - +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWORD" >&5 +$as_echo_n "checking for SWORD... " >&6; } -{ $as_echo "$as_me:$LINENO: checking if you have Sword 1.5.7 or later" >&5 -$as_echo_n "checking if you have Sword 1.5.7 or later... " >&6; } - -if test "${ac_cv_installed_sword_version+set}" = set; then - $as_echo_n "(cached) " >&6 +if test -n "$SWORD_CFLAGS"; then + pkg_cv_SWORD_CFLAGS="$SWORD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sword >= 1.5.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "sword >= 1.5.7") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SWORD_CFLAGS=`$PKG_CONFIG --cflags "sword >= 1.5.7" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SWORD_LIBS"; then + pkg_cv_SWORD_LIBS="$SWORD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sword >= 1.5.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "sword >= 1.5.7") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SWORD_LIBS=`$PKG_CONFIG --libs "sword >= 1.5.7" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else + pkg_failed=yes +fi + else + pkg_failed=untried +fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH -ac_LIBRARY_PATH="$LIBRARY_PATH" -ac_cxxflags_safe="$CXXFLAGS" -ac_ldflags_safe="$LDFLAGS" -ac_libs_safe="$LIBS" - -CXXFLAGS="$CXXFLAGS -I$" -LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir" -LIBS="$LIB_SWORD -lz" -LD_LIBRARY_PATH="$ac_cv_sword_libdir" -export LD_LIBRARY_PATH -LIBRARY_PATH= -export LIBRARY_PATH - -cat > conftest.$ac_ext < -#include -using std::cout; -using std::endl; -using sword::SWVersion; - -int main(int argc, char* argv) { - if (argc != 2) { - cout << SWVersion::currentVersion << endl; - } - else if (argc == 2) - { - if (SWVersion(&argv[1]) < SWVersion::currentVersion || SWVersion(&argv[1]) == SWVersion::currentVersion) - { - cout << 0 << endl; - return 0; - } - else - { - cout << 1 << endl; - return 1; //version not recent enough - } - } - return 0; -} -EOF +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -ac_link='${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest; then - if test -x conftest; then - eval ac_cv_installed_sword_version=`./conftest 2>&5` - echo "configure: ac_cv_installed_sword_version=$ac_cv_installed_sword_version" >&5 - eval sword_test_returncode=`./conftest 1.5.7 2>&5`; - echo "configure: sword_test_returncode=$sword_test_returncode" >&5 - fi +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + SWORD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sword >= 1.5.7" 2>&1` + else + SWORD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sword >= 1.5.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SWORD_PKG_ERRORS" >&5 -rm -f conftest* -CXXFLAGS="$ac_cxxflags_safe" -LDFLAGS="$ac_ldflags_safe" -LIBS="$ac_libs_safe" - -LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe" -export LD_LIBRARY_PATH -LIBRARY_PATH="$ac_LIBRARY_PATH" -export LIBRARY_PATH -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - + true +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + true +else + SWORD_CFLAGS=$pkg_cv_SWORD_CFLAGS + SWORD_LIBS=$pkg_cv_SWORD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - -right_version="ok"; -if test "x$sword_test_returncode" = "x1"; then - echo "configure: changing right_version" >&5 - right_version="wrong version"; -fi; - -{ $as_echo "$as_me:$LINENO: result: $ac_cv_installed_sword_version" >&5 -$as_echo "$ac_cv_installed_sword_version" >&6; } -echo "configure: right_version=$right_version" >&5 -if test "x$right_version" != "xok"; then - { { $as_echo "$as_me:$LINENO: error: Your Sword installation is not recent enough! $sword_test_returncode Please -upgrade to version 1.5.7!" >&5 -$as_echo "$as_me: error: Your Sword installation is not recent enough! $sword_test_returncode Please -upgrade to version 1.5.7!" >&2;} - { (exit 1); exit 1; }; }; -fi; - - - # --------------------------------------------------------------------- # Misc # --------------------------------------------------------------------- -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then +if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -15948,7 +15394,7 @@ fi # Check whether --enable-swig was given. -if test "${enable_swig+set}" = set; then +if test "${enable_swig+set}" = set; then : enableval=$enable_swig; enable_swig=$enableval else enable_swig=no @@ -15974,7 +15420,7 @@ PERLSWIG= # Check whether --with-perl was given. -if test "${with_perl+set}" = set; then +if test "${with_perl+set}" = set; then : withval=$with_perl; PERLBIN="$withval" else PERLBIN= @@ -15988,9 +15434,9 @@ for ac_prog in perl perl5.6.1 perl5.6.0 perl5.004 perl5.003 perl5.002 perl5.001 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then +if ${ac_cv_path_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -16003,14 +15449,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -16018,10 +15464,10 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 $as_echo "$PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -16032,9 +15478,9 @@ done else # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then +if ${ac_cv_path_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -16047,14 +15493,14 @@ for as_dir in $PERLBIN do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -16062,10 +15508,10 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 $as_echo "$PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -16074,7 +15520,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: checking for Perl5 header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl5 header files" >&5 $as_echo_n "checking for Perl5 header files... " >&6; } if test -n "$PERL"; then PERL5DIR=`($PERL -e 'use Config; print $Config{archlib};') 2>/dev/null` @@ -16084,7 +15530,7 @@ if test -n "$PERL"; then PERLBUILD=perl_make for i in $dirs; do if test -r $i/perl.h; then - { $as_echo "$as_me:$LINENO: result: $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5 $as_echo "$i" >&6; } PERL5EXT="$i" break; @@ -16092,27 +15538,27 @@ $as_echo "$i" >&6; } done if test "$PERL5EXT" = none; then PERL5EXT="$PERL5DIR/CORE" - { $as_echo "$as_me:$LINENO: result: could not locate perl.h...using $PERL5EXT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not locate perl.h...using $PERL5EXT" >&5 $as_echo "could not locate perl.h...using $PERL5EXT" >&6; } fi - { $as_echo "$as_me:$LINENO: checking for Perl5 library" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl5 library" >&5 $as_echo_n "checking for Perl5 library... " >&6; } PERL5LIB=`($PERL -e 'use Config; $_=$Config{libperl}; s/^lib//; s/$Config{_a}$//; print $_') 2>/dev/null` if test "$PERL5LIB" = "" ; then - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } else - { $as_echo "$as_me:$LINENO: result: $PERL5LIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL5LIB" >&5 $as_echo "$PERL5LIB" >&6; } fi else - { $as_echo "$as_me:$LINENO: result: unable to determine perl5 configuration" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to determine perl5 configuration" >&5 $as_echo "unable to determine perl5 configuration" >&6; } PERL5EXT=$PERL5DIR fi else - { $as_echo "$as_me:$LINENO: result: could not figure out how to run perl5" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not figure out how to run perl5" >&5 $as_echo "could not figure out how to run perl5" >&6; } # PERL5EXT="/usr/local/lib/perl/archname/5.003/CORE" fi @@ -16162,7 +15608,7 @@ PYTHONBUILD= # Check whether --with-python was given. -if test "${with_python+set}" = set; then +if test "${with_python+set}" = set; then : withval=$with_python; PYBIN="$withval" else PYBIN= @@ -16176,9 +15622,9 @@ for ac_prog in $prefix/bin/python python python2.4 python2.3 python2.2 python2.1 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PYTHON+set}" = set; then +if ${ac_cv_path_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else case $PYTHON in @@ -16191,14 +15637,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -16206,10 +15652,10 @@ esac fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then - { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 $as_echo "$PYTHON" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -16222,33 +15668,33 @@ PYTHON="$PYBIN" fi if test -n "$PYTHON"; then - { $as_echo "$as_me:$LINENO: checking for Python prefix" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python prefix" >&5 $as_echo_n "checking for Python prefix... " >&6; } PYPREFIX=`($PYTHON -c "import sys; print sys.prefix") 2>/dev/null` - { $as_echo "$as_me:$LINENO: result: $PYPREFIX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYPREFIX" >&5 $as_echo "$PYPREFIX" >&6; } - { $as_echo "$as_me:$LINENO: checking for Python exec-prefix" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python exec-prefix" >&5 $as_echo_n "checking for Python exec-prefix... " >&6; } PYEPREFIX=`($PYTHON -c "import sys; print sys.exec_prefix") 2>/dev/null` - { $as_echo "$as_me:$LINENO: result: $PYEPREFIX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYEPREFIX" >&5 $as_echo "$PYEPREFIX" >&6; } # Note: I could not think of a standard way to get the version string from different versions. # This trick pulls it out of the file location for a standard library file. - { $as_echo "$as_me:$LINENO: checking for Python version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python version" >&5 $as_echo_n "checking for Python version... " >&6; } # Need to do this hack since autoconf replaces __file__ with the name of the configure file filehack="file__" PYVERSION=`($PYTHON -c "import string,operator; print operator.getitem(string.split(string.__$filehack,'/'),-2)")` - { $as_echo "$as_me:$LINENO: result: $PYVERSION" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYVERSION" >&5 $as_echo "$PYVERSION" >&6; } # Set the include directory - { $as_echo "$as_me:$LINENO: checking for Python header files" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python header files" >&5 $as_echo_n "checking for Python header files... " >&6; } if test -r $PYPREFIX/include/$PYVERSION/Python.h; then PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/lib/$PYVERSION/config" @@ -16258,11 +15704,11 @@ $as_echo_n "checking for Python header files... " >&6; } PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/lib/python/lib" fi fi - { $as_echo "$as_me:$LINENO: result: $PYINCLUDE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYINCLUDE" >&5 $as_echo "$PYINCLUDE" >&6; } # Set the library directory blindly. This probably won't work with older versions - { $as_echo "$as_me:$LINENO: checking for Python library" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python library" >&5 $as_echo_n "checking for Python library... " >&6; } dirs="$PYVERSION/config $PYVERSION/lib python/lib" for i in $dirs; do @@ -16273,10 +15719,10 @@ $as_echo_n "checking for Python library... " >&6; } fi done if test -z "$PYLIB"; then - { $as_echo "$as_me:$LINENO: result: Not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not found" >&5 $as_echo "Not found" >&6; } else - { $as_echo "$as_me:$LINENO: result: $PYLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYLIB" >&5 $as_echo "$PYLIB" >&6; } fi @@ -16310,7 +15756,7 @@ PHP4BIN= # Check whether --with-php4 was given. -if test "${with_php4+set}" = set; then +if test "${with_php4+set}" = set; then : withval=$with_php4; PHP4BIN="$withval" else PHP4BIN= @@ -16322,9 +15768,9 @@ for ac_prog in php php4 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PHP4+set}" = set; then +if ${ac_cv_path_PHP4+:} false; then : $as_echo_n "(cached) " >&6 else case $PHP4 in @@ -16337,14 +15783,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PHP4="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -16352,10 +15798,10 @@ esac fi PHP4=$ac_cv_path_PHP4 if test -n "$PHP4"; then - { $as_echo "$as_me:$LINENO: result: $PHP4" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP4" >&5 $as_echo "$PHP4" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -16366,12 +15812,12 @@ done else PHP4="$PHP4BIN" fi -{ $as_echo "$as_me:$LINENO: checking for PHP4 header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PHP4 header files" >&5 $as_echo_n "checking for PHP4 header files... " >&6; } dirs="/usr/include/php /usr/local/include/php /usr/local/apache/php /usr/include/php4 /usr/local/include/php4 /usr/local/apache/php4" for i in $dirs; do if test -r $i/php_config.h -o -r $i/php_version.h; then - { $as_echo "$as_me:$LINENO: result: $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5 $as_echo "$i" >&6; } PHP4EXT="$i" PHP4INC="-I$PHP4EXT -I$PHP4EXT/Zend -I$PHP4EXT/main -I$PHP4EXT/TSRM" @@ -16379,7 +15825,7 @@ $as_echo "$i" >&6; } fi done if test -z "$PHP4INC"; then - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } fi @@ -16389,6 +15835,7 @@ fi + TCLINCLUDE= TCLLIB= TCLPACKAGE= @@ -16396,13 +15843,13 @@ TCLPACKAGE= # Check whether --with-tclconfig was given. -if test "${with_tclconfig+set}" = set; then +if test "${with_tclconfig+set}" = set; then : withval=$with_tclconfig; with_tclconfig="$withval" fi # Check whether --with-tcl was given. -if test "${with_tcl+set}" = set; then +if test "${with_tcl+set}" = set; then : withval=$with_tcl; TCLPACKAGE="$withval" else @@ -16411,7 +15858,7 @@ fi # Check whether --with-tclincl was given. -if test "${with_tclincl+set}" = set; then +if test "${with_tclincl+set}" = set; then : withval=$with_tclincl; TCLINCLUDE="-I$withval" else @@ -16420,7 +15867,7 @@ fi # Check whether --with-tcllib was given. -if test "${with_tcllib+set}" = set; then +if test "${with_tcllib+set}" = set; then : withval=$with_tcllib; TCLLIB="-L$withval" else @@ -16428,16 +15875,14 @@ else fi -{ $as_echo "$as_me:$LINENO: checking for Tcl configuration" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5 $as_echo_n "checking for Tcl configuration... " >&6; } # First check to see if --with-tclconfig was specified. if test x"${with_tclconfig}" != x ; then if test -f "${with_tclconfig}/tclConfig.sh" ; then TCLCONFIG=`(cd ${with_tclconfig}; pwd)` else - { { $as_echo "$as_me:$LINENO: error: ${with_tcl} directory doesn't contain tclConfig.sh" >&5 -$as_echo "$as_me: error: ${with_tcl} directory doesn't contain tclConfig.sh" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "${with_tcl} directory doesn't contain tclConfig.sh" "$LINENO" 5 fi fi # check in a few common install locations @@ -16452,10 +15897,10 @@ if test x"${TCLCONFIG}" = x ; then done fi if test x"${TCLCONFIG}" = x ; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - { $as_echo "$as_me:$LINENO: result: found $TCLCONFIG/tclConfig.sh" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $TCLCONFIG/tclConfig.sh" >&5 $as_echo "found $TCLCONFIG/tclConfig.sh" >&6; } . $TCLCONFIG/tclConfig.sh TCLINCLUDE=-I$TCL_PREFIX/include @@ -16474,48 +15919,24 @@ if test -z "$TCLLIB"; then fi fi -{ $as_echo "$as_me:$LINENO: checking for Tcl header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl header files" >&5 $as_echo_n "checking for Tcl header files... " >&6; } if test -z "$TCLINCLUDE"; then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_cpp "$LINENO"; then : +else TCLINCLUDE="" fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext if test -z "$TCLINCLUDE"; then dirs="$prefix/include /usr/local/include /usr/include /opt/local/include" for i in $dirs ; do if test -r $i/tcl.h; then - { $as_echo "$as_me:$LINENO: result: $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5 $as_echo "$i" >&6; } TCLINCLUDE="-I$i" break @@ -16524,33 +15945,33 @@ $as_echo "$i" >&6; } fi if test -z "$TCLINCLUDE"; then # TCLINCLUDE="-I/usr/local/include" - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } fi else - { $as_echo "$as_me:$LINENO: result: $TCLINCLUDE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLINCLUDE" >&5 $as_echo "$TCLINCLUDE" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking for Tcl library" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl library" >&5 $as_echo_n "checking for Tcl library... " >&6; } if test -z "$TCLLIB"; then dirs="$prefix/lib /usr/local/lib /usr/lib /opt/local/lib" for i in $dirs ; do if test -r $i/libtcl.a; then - { $as_echo "$as_me:$LINENO: result: $i" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5 $as_echo "$i" >&6; } TCLLIB="-L$i -ltcl" break fi done if test -z "$TCLLIB"; then - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } # TCLLIB="-L/usr/local/lib" fi else -{ $as_echo "$as_me:$LINENO: result: $TCLLIB" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLLIB" >&5 $as_echo "$TCLLIB" >&6; } fi @@ -16599,13 +16020,13 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -16613,8 +16034,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -16636,12 +16057,23 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -16691,20 +16123,29 @@ DEFS=`sed -n "$ac_script" confdefs.h` ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -16714,62 +16155,38 @@ else fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${RUNSWIG_TRUE}" && test -z "${RUNSWIG_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"RUNSWIG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"RUNSWIG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"RUNSWIG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${RUNSWIG_TRUE}" && test -z "${RUNSWIG_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"RUNSWIG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"RUNSWIG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"RUNSWIG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -16779,17 +16196,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -16797,23 +16215,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -16821,7 +16231,13 @@ export as_nl as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -16832,7 +16248,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -16855,13 +16271,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -16871,15 +16280,16 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -16891,12 +16301,16 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -16908,7 +16322,89 @@ export LC_ALL LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -16922,8 +16418,12 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -16943,76 +16443,25 @@ $as_echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -17027,49 +16476,85 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -17079,13 +16564,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by swordbindings $as_me 1.6.1+svn$Rev: 2541 $, which was -generated by GNU Autoconf 2.63. Invocation command line was +This file was extended by swordbindings $as_me 1.6.2, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -17113,13 +16604,15 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -17133,16 +16626,17 @@ $config_files Configuration commands: $config_commands -Report bugs to ." +Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -swordbindings config.status 1.6.1+svn$Rev: 2541 $ -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +swordbindings config.status 1.6.2 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -17160,11 +16654,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -17178,14 +16677,17 @@ do ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -17194,11 +16696,10 @@ do ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -17215,7 +16716,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -17249,184 +16750,208 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' -macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' -host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' -host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' -host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' -build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' -build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' -build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' -SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' -Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' -GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' -EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' -FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' -LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' -NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' -LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' -ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' -exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' -lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' -reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' -AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' -STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' -RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' -compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' -GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' -SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' -ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' -need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' -LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' -libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' -version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' -runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' -libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' -soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' -old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' -striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' +predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' +predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' +postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' +reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' +reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + # Quote evaled strings. -for var in SED \ +for var in SHELL \ +ECHO \ +PATH_SEPARATOR \ +SED \ GREP \ EGREP \ FGREP \ @@ -17439,8 +16964,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -17450,14 +16980,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -SHELL \ -ECHO \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -17471,9 +17001,7 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -17481,6 +17009,7 @@ variables_saved_for_relink \ libname_spec \ library_names_spec \ soname_spec \ +install_override_mode \ finish_eval \ old_striplib \ striplib \ @@ -17491,10 +17020,11 @@ predeps \ postdeps \ compiler_lib_search_path \ LD_CXX \ +reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_wl_CXX \ lt_prog_compiler_pic_CXX \ +lt_prog_compiler_wl_CXX \ lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ @@ -17504,9 +17034,7 @@ with_gnu_ld_CXX \ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ -fix_srcfile_path_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ @@ -17516,9 +17044,9 @@ postdep_objects_CXX \ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17540,11 +17068,13 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec \ +reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ old_archive_from_expsyms_cmds_CXX \ @@ -17553,10 +17083,11 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ -prelink_cmds_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in +prelink_cmds_CXX \ +postlink_cmds_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17564,12 +17095,6 @@ prelink_cmds_CXX; do esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` - ;; -esac - ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -17604,9 +17129,7 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -17628,26 +17151,24 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -17655,7 +17176,13 @@ $debug || if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' @@ -17663,7 +17190,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -17672,24 +17199,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -17697,7 +17218,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -17711,7 +17232,7 @@ s/'"$ac_delim"'$// t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -17725,7 +17246,7 @@ s/.\{148\}// t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -17745,7 +17266,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -17777,23 +17298,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -17811,9 +17338,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -17832,7 +17357,7 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -17841,12 +17366,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -17857,7 +17380,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -17869,10 +17392,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -17900,47 +17421,7 @@ $as_echo X"$ac_file" | q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -17997,7 +17478,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -18007,12 +17487,11 @@ ac_sed_dataroot=' /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -18022,7 +17501,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -18050,31 +17529,28 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -18082,7 +17558,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -18095,7 +17571,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -18129,21 +17605,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -18169,47 +17643,7 @@ $as_echo X"$file" | q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -18237,7 +17671,8 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;} # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -18285,6 +17720,15 @@ pic_mode=$pic_mode # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -18334,9 +17778,11 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -18344,13 +17790,30 @@ OBJDUMP=$lt_OBJDUMP # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == "file_magic". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -18359,6 +17822,9 @@ RANLIB=$lt_RANLIB old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + # A C compiler. LTCC=$lt_CC @@ -18377,14 +17843,14 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -# The name of the directory that contains temporary libtool files. -objdir=$objdir +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot -# An echo program that does not interpret backslashes. -ECHO=$lt_ECHO +# The name of the directory that contains temporary libtool files. +objdir=$objdir # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD @@ -18392,6 +17858,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -18448,6 +17917,9 @@ library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -18487,6 +17959,10 @@ striplib=$lt_striplib # The linker used to build libraries. LD=$lt_LD +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -18499,12 +17975,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -18554,10 +18030,6 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -18591,9 +18063,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -18609,6 +18078,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -18655,212 +18127,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac - - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi + + + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -18872,6 +18301,10 @@ _LT_EOF # The linker used to build libraries. LD=$lt_LD_CXX +# How to create reloadable object files. +reload_flag=$lt_reload_flag_CXX +reload_cmds=$lt_reload_cmds_CXX + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds_CXX @@ -18884,12 +18317,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic_CXX +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX @@ -18939,10 +18372,6 @@ no_undefined_flag=$lt_no_undefined_flag_CXX # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX @@ -18976,9 +18405,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path_CXX - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -18994,6 +18420,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds_CXX + # Specify filename containing input files. file_list_spec=$lt_file_list_spec_CXX @@ -19023,15 +18452,12 @@ _LT_EOF done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -19052,10 +18478,10 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff --git a/bindings/swig/package/configure.ac b/bindings/swig/package/configure.ac index df7fc84..a8e1806 100644 --- a/bindings/swig/package/configure.ac +++ b/bindings/swig/package/configure.ac @@ -1,11 +1,12 @@ # --------------------------------------------------------------------- # Initialisation # --------------------------------------------------------------------- -AC_INIT([swordbindings],[1.6.1+svn$Rev: 2541 $],[sword-bugs@crosswire.org]) +AC_INIT([swordbindings],[1.6.2]) AC_CONFIG_SRCDIR(sword.i) AC_PREREQ(2.59) -AC_REVISION($Revision: 2541 $) -AM_INIT_AUTOMAKE(swordbindings,1.5.11) +AC_REVISION($Revision: 2875 $) +AM_INIT_AUTOMAKE +AC_CONFIG_MACRO_DIR([m4]) # --------------------------------------------------------------------- # Check Programs @@ -20,7 +21,8 @@ SW_PROG_SWIG # --------------------------------------------------------------------- # Check libraries # --------------------------------------------------------------------- -SW_CHECK_SWORD(1.5.7) +PKG_PROG_PKG_CONFIG +PKG_CHECK_MODULES([SWORD], [sword >= 1.5.7],,true) # --------------------------------------------------------------------- # Misc diff --git a/bindings/swig/package/depcomp b/bindings/swig/package/depcomp index df8eea7..4ebd5b3 100755 --- a/bindings/swig/package/depcomp +++ b/bindings/swig/package/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ scriptversion=2009-04-28.21; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ icc) sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ makedepend) touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/bindings/swig/package/deprecations.i b/bindings/swig/package/deprecations.i new file mode 100644 index 0000000..bab0381 --- /dev/null +++ b/bindings/swig/package/deprecations.i @@ -0,0 +1,62 @@ +/* Methods that are deprecated in SWORD and should be ignored. */ + +/* These are all together */ +%ignore sword::SWModule::operator const char *; +%ignore sword::SWVersion::operator const char *; +%ignore sword::ListKey::operator const char *; +%ignore sword::VerseKey::operator const char *; +%ignore sword::TreeKey::operator const char *; +%ignore sword::TreeKeyIdx::operator const char *; +%ignore sword::VerseTreeKey::operator const char *; +%ignore sword::XMLTag::operator const char *; + +%ignore sword::StatusReporter::statusUpdate; + +%ignore sword::SWDisplay::Display(SWModule&); + +%ignore sword::SWKey::Error(); +%ignore sword::SWKey::Persist() const; +%ignore sword::SWKey::Persist(signed char); + +%ignore sword::SWModule::AddEncodingFilter(SWFilter*); +%ignore sword::SWModule::AddOptionFilter(SWOptionFilter*); +%ignore sword::SWModule::AddRawFilter(SWFilter*); +%ignore sword::SWModule::AddRenderFilter(SWFilter*); +%ignore sword::SWModule::AddStripFilter(SWFilter*); +%ignore sword::SWModule::CreateKey; +%ignore sword::SWModule::Description; +%ignore sword::SWModule::Direction; +%ignore sword::SWModule::Disp; +%ignore sword::SWModule::Display(); +%ignore sword::SWModule::Encoding; +%ignore sword::SWModule::Error(); +%ignore sword::SWModule::getSkipConsecutiveLinks(); +%ignore sword::SWModule::Index; +%ignore sword::SWModule::Key; +%ignore sword::SWModule::KeyText; +%ignore sword::SWModule::Lang; +%ignore sword::SWModule::Markup; +%ignore sword::SWModule::Name; +%ignore sword::SWModule::processEntryAttributes(bool) const; +%ignore sword::SWModule::ReplaceEncodingFilter(SWFilter*, SWFilter*); +%ignore sword::SWModule::RemoveEncodingFilter(SWFilter*); +%ignore sword::SWModule::RenderText; +%ignore sword::SWModule::ReplaceRenderFilter(SWFilter*, SWFilter*); +%ignore sword::SWModule::RemoveRenderFilter(SWFilter*); +%ignore sword::SWModule::SetKey; +%ignore sword::SWModule::setKey(SWKey const &); +%ignore sword::SWModule::StripText; +%ignore sword::SWModule::Type; + +%ignore sword::VerseKey::AutoNormalize; +%ignore sword::VerseKey::Book; +%ignore sword::VerseKey::Chapter; +%ignore sword::VerseKey::ClearBounds(); +%ignore sword::VerseKey::Headings; +%ignore sword::VerseKey::LowerBound; +%ignore sword::VerseKey::Normalize; +%ignore sword::VerseKey::ParseVerseList; +%ignore sword::VerseKey::Testament; +%ignore sword::VerseKey::TestamentIndex() const; +%ignore sword::VerseKey::UpperBound; +%ignore sword::VerseKey::Verse; diff --git a/bindings/swig/package/ftptrans.i b/bindings/swig/package/ftptrans.i deleted file mode 100644 index 923cebc..0000000 --- a/bindings/swig/package/ftptrans.i +++ /dev/null @@ -1,6 +0,0 @@ -%{ -#include "ftptrans.h" -%} - -%include "ftptrans.h" - diff --git a/bindings/swig/package/install-sh b/bindings/swig/package/install-sh index 6781b98..377bb86 100755 --- a/bindings/swig/package/install-sh +++ b/bindings/swig/package/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ fi for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ do echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ do case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ do for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff --git a/bindings/swig/package/listkey.i b/bindings/swig/package/listkey.i index 3c91343..deaeac2 100644 --- a/bindings/swig/package/listkey.i +++ b/bindings/swig/package/listkey.i @@ -3,6 +3,11 @@ %} %ignore sword::ListKey::operator<<; +%ignore sword::ListKey::ClearList; +%ignore sword::ListKey::Count; +%ignore sword::ListKey::Remove; +%ignore sword::ListKey::SetToElement; +%ignore sword::ListKey::GetElement; %include "listkey.h" @@ -18,4 +23,4 @@ static sword::ListKey *castTo(sword::SWKey *o) { return dynamic_cast(o); } -} \ No newline at end of file +} diff --git a/bindings/swig/package/ltmain.sh b/bindings/swig/package/ltmain.sh old mode 100755 new mode 100644 index a72f2fd..63ae69d --- a/bindings/swig/package/ltmain.sh +++ b/bindings/swig/package/ltmain.sh @@ -1,9 +1,9 @@ -# Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6b +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -32,50 +32,57 @@ # # Provide generalized library-building support services. # -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print informational messages (default) -# --version print version information -# -h, --help print short or long help message +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --no-warn don't display warning messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message # # MODE must be one of the following: # -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory # -# MODE-ARGS vary depending on the MODE. +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.4.2 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . -PROGRAM=ltmain.sh +PROGRAM=libtool PACKAGE=libtool -VERSION=2.2.6b +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3017 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -91,10 +98,15 @@ fi BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + # NLS nuisances: We save the old values to restore during execute mode. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -107,24 +119,28 @@ do lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL $lt_unset CDPATH +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" : ${CP="cp -f"} -: ${ECHO="echo"} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -144,6 +160,27 @@ IFS=" $lt_nl" dirname="s,/[^/]*$,," basename="s,^.*/,," +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -158,33 +195,183 @@ basename="s,^.*/,," # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation + + +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result } -# Generated shell functions inserted here. +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} # The name of this program: -# In the unlikely event $progname began with a '-', it would play havoc with -# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result -case $progname in - -*) progname=./$progname ;; -esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -196,7 +383,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -215,6 +402,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -243,7 +439,7 @@ opt_warning=: # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: $*" + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } # func_verbose arg... @@ -258,18 +454,25 @@ func_verbose () : } +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + # func_error arg... # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -326,9 +529,9 @@ func_mkdir_p () case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` done - my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -378,7 +581,7 @@ func_mktempdir () func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "X$my_tmpdir" | $Xsed + $ECHO "$my_tmpdir" } @@ -392,7 +595,7 @@ func_quote_for_eval () { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -419,7 +622,7 @@ func_quote_for_expand () { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "X$1" | $Xsed \ + my_arg=`$ECHO "$1" | $SED \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -488,15 +691,39 @@ func_show_eval_locale () fi } - - +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} # func_version # Echo version message to standard output and exit. func_version () { - $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + $opt_debug + + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -509,22 +736,28 @@ func_version () # Echo short help message to standard output and exit. func_usage () { - $SED -n '/^# Usage:/,/# -h/ { + $opt_debug + + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - $ECHO + echo $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help -# Echo long help message to standard output and exit. +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. func_help () { + $opt_debug + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -534,11 +767,18 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p - }' < "$progpath" - exit $? + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret + fi } # func_missing_arg argname @@ -546,63 +786,106 @@ func_help () # exit_cmd. func_missing_arg () { - func_error "missing argument for $1" + $opt_debug + + func_error "missing argument for $1." exit_cmd=exit } -exit_cmd=: +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation + +exit_cmd=: -# Check that we have a working $ECHO. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell, and then maybe $ECHO will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -636,16 +919,16 @@ func_config () # Display the features supported by this script. func_features () { - $ECHO "host: $host" + echo "host: $host" if test "$build_libtool_libs" = yes; then - $ECHO "enable shared libraries" + echo "enable shared libraries" else - $ECHO "disable shared libraries" + echo "disable shared libraries" fi if test "$build_old_libs" = yes; then - $ECHO "enable static libraries" + echo "enable static libraries" else - $ECHO "disable static libraries" + echo "disable static libraries" fi exit $? @@ -692,117 +975,209 @@ func_enable_tag () esac } -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () { + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac + + + +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_warning=: +opt_verbose=: +opt_silent=false +opt_verbose=false - # Shorthand for --mode=foo, only valid as the first argument - case $1 in - clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; - compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; - execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; - finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; - install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; - link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac - # Parse non-mode specific arguments: - while test "$#" -gt 0; do +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do opt="$1" shift - case $opt in - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" + --debug|-x) opt_debug='set -x' func_echo "enabling shell trace mode" - opt_debug='set -x' $opt_debug ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift + --dry-run|--dryrun|-n) + opt_dry_run=: ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - case $1 in - # Valid mode arguments: - clean) ;; - compile) ;; - execute) ;; - finish) ;; - install) ;; - link) ;; - relink) ;; - uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; - esac - - mode="$1" + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" shift ;; - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: + opt_preserve_dup_deps=: ;; - - --verbose| -v) preserve_args="$preserve_args $opt" + --features) + opt_features=: +func_features + ;; + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) opt_silent=false +func_append preserve_args " $opt" ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; + --no-verbose) + opt_verbose=false +func_append preserve_args " $opt" + ;; + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" shift ;; + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + # Separate optargs to long options: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} shift ;; - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; esac done + # Validate options: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi + + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -810,82 +1185,44 @@ func_enable_tag () opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps ;; esac - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} + $opt_help || { + # Sanity checks first: + func_check_version_match -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi - exit $EXIT_MISMATCH - fi -} - - -## ----------- ## -## Main. ## -## ----------- ## - -$opt_help || { - # Sanity checks first: - func_check_version_match + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi - test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$mode' for more information." -} +## ----------- ## +## Main. ## +## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -950,12 +1287,9 @@ func_ltwrapper_executable_p () # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" } # func_ltwrapper_p file @@ -1001,6 +1335,37 @@ func_source () } +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1013,13 +1378,15 @@ func_infer_tag () if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1030,11 +1397,13 @@ func_infer_tag () CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1097,6 +1466,486 @@ EOF } } + +################################################## +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # +################################################## + +# func_convert_core_file_wine_to_w32 ARG +# Helper function used by file name conversion functions when $build is *nix, +# and $host is mingw, cygwin, or some other w32 environment. Relies on a +# correctly configured wine environment available, with the winepath program +# in $build's $PATH. +# +# ARG is the $build file name to be converted to w32 format. +# Result is available in $func_convert_core_file_wine_to_w32_result, and will +# be empty on error (or when ARG is empty) +func_convert_core_file_wine_to_w32 () +{ + $opt_debug + func_convert_core_file_wine_to_w32_result="$1" + if test -n "$1"; then + # Unfortunately, winepath does not exit with a non-zero error code, so we + # are forced to check the contents of stdout. On the other hand, if the + # command is not found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both error code of + # zero AND non-empty stdout, which explains the odd construction: + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_nix_to_cygwin + + # func_mode_compile arg... func_mode_compile () { @@ -1137,12 +1986,12 @@ func_mode_compile () ;; -pie | -fpie | -fPIE) - pie_flag="$pie_flag $arg" + func_append pie_flag " $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" + func_append later " $arg" continue ;; @@ -1163,15 +2012,14 @@ func_mode_compile () save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" - func_quote_for_eval "$arg" - lastarg="$lastarg $func_quote_for_eval_result" + func_append_quoted lastarg "$arg" done IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" + func_append base_compile " $lastarg" continue ;; @@ -1187,8 +2035,7 @@ func_mode_compile () esac # case $arg_mode # Aesthetically quote the previous argument. - func_quote_for_eval "$lastarg" - base_compile="$base_compile $func_quote_for_eval_result" + func_append_quoted base_compile "$lastarg" done # for arg case $arg_mode in @@ -1213,7 +2060,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -1288,7 +2135,7 @@ func_mode_compile () # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" else output_obj= @@ -1319,17 +2166,16 @@ compiler." $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - removelist="$removelist $output_obj" + func_append removelist " $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" + func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -1349,7 +2195,7 @@ compiler." if test -z "$output_obj"; then # Place PIC objects in $objdir - command="$command -o $lobj" + func_append command " -o $lobj" fi func_show_eval_locale "$command" \ @@ -1396,11 +2242,11 @@ compiler." command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - command="$command -o $obj" + func_append command " -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" + func_append command "$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -1445,13 +2291,13 @@ compiler." } $opt_help || { -test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $mode in + case $opt_mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -1482,10 +2328,11 @@ This mode accepts the following additional options: -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -1538,7 +2385,7 @@ either the \`install' or \`cp' program. The following components of INSTALL-COMMAND are treated specially: - -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -1558,6 +2405,8 @@ The following components of LINK-COMMAND are treated specially: -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) @@ -1586,6 +2435,11 @@ The following components of LINK-COMMAND are treated specially: -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -1619,18 +2473,44 @@ Otherwise, only FILE itself is deleted using RM." ;; *) - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac - $ECHO + echo $ECHO "Try \`$progname --help' for more information about other modes." - - exit $? } - # Now that we've collected a possible --mode arg, show help if necessary - $opt_help && func_mode_help +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test "$opt_help" = :; then + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi # func_mode_execute arg... @@ -1643,13 +2523,16 @@ func_mode_execute () func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do + for file in $opt_dlopen; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -1671,7 +2554,7 @@ func_mode_execute () dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" + func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -1712,7 +2595,7 @@ func_mode_execute () for file do case $file in - -*) ;; + -* | *.la | *.lo ) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -1728,8 +2611,7 @@ func_mode_execute () ;; esac # Quote arguments (to preserve shell metacharacters). - func_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" + func_append_quoted args "$file" done if test "X$opt_dry_run" = Xfalse; then @@ -1754,29 +2636,66 @@ func_mode_execute () # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - $ECHO "export $shlibpath_var" + echo "export $shlibpath_var" fi $ECHO "$cmd$args" exit $EXIT_SUCCESS fi } -test "$mode" = execute && func_mode_execute ${1+"$@"} +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libdirs="$nonopt" + libs= + libdirs= admincmds= - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -1786,7 +2705,7 @@ func_mode_finish () if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $opt_dry_run || eval "$cmds" || func_append admincmds " $cmds" fi done @@ -1795,53 +2714,55 @@ func_mode_finish () # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - $ECHO "X----------------------------------------------------------------------" | $Xsed - $ECHO "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - $ECHO - $ECHO "If you ever happen to want to link against installed libraries" - $ECHO "in a given directory, LIBDIR, you must either use libtool, and" - $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" - $ECHO "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" - $ECHO " during execution" - fi - if test -n "$runpath_var"; then - $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" - $ECHO " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $ECHO + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo - $ECHO "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" - $ECHO "pages." - ;; - *) - $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - $ECHO "X----------------------------------------------------------------------" | $Xsed + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi exit $EXIT_SUCCESS } -test "$mode" = finish && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -1852,7 +2773,7 @@ func_mode_install () # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - $ECHO "X$nonopt" | $GREP shtool >/dev/null; then + case $nonopt in *shtool*) :;; *) false;; esac; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -1866,7 +2787,12 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - install_prog="$install_prog$func_quote_for_eval_result" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac # We need to accept at least all the BSD install flags. dest= @@ -1876,10 +2802,12 @@ func_mode_install () install_type= isdir=no stripme= + no_mode=: for arg do + arg2= if test -n "$dest"; then - files="$files $dest" + func_append files " $dest" dest=$arg continue fi @@ -1887,10 +2815,9 @@ func_mode_install () case $arg in -d) isdir=yes ;; -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac + if $install_cp; then :; else + prev=$arg + fi ;; -g | -m | -o) prev=$arg @@ -1904,6 +2831,10 @@ func_mode_install () *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi prev= else dest=$arg @@ -1914,7 +2845,11 @@ func_mode_install () # Aesthetically quote the argument. func_quote_for_eval "$arg" - install_prog="$install_prog $func_quote_for_eval_result" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -1923,6 +2858,13 @@ func_mode_install () test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -1977,10 +2919,13 @@ func_mode_install () case $file in *.$libext) # Do the static libraries later. - staticlibs="$staticlibs $file" + func_append staticlibs " $file" ;; *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -1994,23 +2939,23 @@ func_mode_install () if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + *) func_append current_libdirs " $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + *) func_append future_libdirs " $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - dir="$dir$objdir" + func_append dir "$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2023,9 +2968,9 @@ func_mode_install () if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2043,7 +2988,7 @@ func_mode_install () test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -2083,7 +3028,7 @@ func_mode_install () func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + test -n "$old_library" && func_append staticlibs " $dir/$old_library" ;; *.lo) @@ -2183,7 +3128,7 @@ func_mode_install () if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -2202,7 +3147,7 @@ func_mode_install () file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -2221,7 +3166,7 @@ func_mode_install () } else # Install the binary that we compiled earlier. - file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -2257,11 +3202,13 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -2280,7 +3227,7 @@ func_mode_install () fi } -test "$mode" = install && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -2323,6 +3270,22 @@ func_generate_dlsyms () extern \"C\" { #endif +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + /* External symbol declarations for the compiler. */\ " @@ -2332,10 +3295,11 @@ extern \"C\" { $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -2371,7 +3335,7 @@ extern \"C\" { eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin | *mingw* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -2384,10 +3348,52 @@ extern \"C\" { func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac done $opt_dry_run || { @@ -2415,36 +3421,19 @@ extern \"C\" { if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { const char *name; void *address; } lt_dlsymlist; -" - case $host in - *cygwin* | *mingw* | *cegcc* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - $ECHO >> "$output_objdir/$my_dlsyms" "\ -extern $lt_dlsym_const lt_dlsymlist +extern LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -$lt_dlsym_const lt_dlsymlist +LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -2457,7 +3446,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] = eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -2484,7 +3473,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -2500,7 +3489,7 @@ static const void *lt_preloaded_setup() { for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -2515,16 +3504,16 @@ static const void *lt_preloaded_setup() { case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -2538,8 +3527,8 @@ static const void *lt_preloaded_setup() { # really was required. # Nullify the symbol file. - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` fi } @@ -2549,6 +3538,7 @@ static const void *lt_preloaded_setup() { # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -2559,9 +3549,11 @@ func_win32_libid () win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | $SED -n -e ' 1,100{ / I /{ @@ -2590,6 +3582,131 @@ func_win32_libid () $ECHO "$win32_libid_type" } +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} # func_extract_an_archive dir oldlib @@ -2598,7 +3715,18 @@ func_extract_an_archive () $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' + if test "$lock_old_archive_extraction" = yes; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -2669,7 +3797,7 @@ func_extract_archives () darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -2684,25 +3812,30 @@ func_extract_archives () func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done func_extract_archives_result="$my_oldobjs" } - -# func_emit_wrapper_part1 [arg=no] +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. # -# Emit the first part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part1 () +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () { - func_emit_wrapper_part1_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part1_arg1=$1 - fi + func_emit_wrapper_arg1=${1-no} $ECHO "\ #! $SHELL @@ -2718,7 +3851,6 @@ func_emit_wrapper_part1 () # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # Be Bourne compatible @@ -2749,31 +3881,135 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then else # When we are sourced in execute mode, \$file and \$ECHO are already set. if test \"\$libtool_execute_magic\" != \"$magic\"; then - ECHO=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$ECHO works! - : - else - # Restart under the correct shell, and then maybe \$ECHO will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ " - $ECHO "\ + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} # Find the directory that this script lives in. - thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -2783,30 +4019,13 @@ else esac fi - file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` done -" -} -# end: func_emit_wrapper_part1 - -# func_emit_wrapper_part2 [arg=no] -# -# Emit the second part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part2 () -{ - func_emit_wrapper_part2_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part2_arg1=$1 - fi - - $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -2814,7 +4033,7 @@ func_emit_wrapper_part2 () fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -2869,6 +4088,18 @@ func_emit_wrapper_part2 () if test -f \"\$progdir/\$program\"; then" + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -2877,253 +4108,28 @@ func_emit_wrapper_part2 () # Some systems cannot cope with colon-terminated $shlibpath_var # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` export $shlibpath_var " fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 + func_exec_program \${1+\"\$@\"} fi else # The program doesn't exist. \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ " } -# end: func_emit_wrapper_part2 - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=no - if test -n "$1" ; then - func_emit_wrapper_arg1=$1 - fi - - # split this up so that func_emit_cwrapperexe_src - # can call each part independently. - func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" - func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" -} - - -# func_to_host_path arg -# -# Convert paths to host format when used with build tools. -# Intended for use with "native" mingw (where libtool itself -# is running under the msys shell), or in the following cross- -# build environments: -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# where wine is equipped with the `winepath' executable. -# In the native mingw case, the (msys) shell automatically -# converts paths for any non-msys applications it launches, -# but that facility isn't available from inside the cwrapper. -# Similar accommodations are necessary for $host mingw and -# $build cygwin. Calling this function does no harm for other -# $host/$build combinations not listed above. -# -# ARG is the path (on $build) that should be converted to -# the proper representation for $host. The result is stored -# in $func_to_host_path_result. -func_to_host_path () -{ - func_to_host_path_result="$1" - if test -n "$1" ; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in - *mingw* ) # actually, msys - # awkward: cmd appends spaces to result - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_path_tmp1=`( cmd //c echo "$1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_path_tmp1=`cygpath -w "$1"` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # Unfortunately, winepath does not exit with a non-zero - # error code, so we are forced to check the contents of - # stdout. On the other hand, if the command is not - # found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both - # error code of zero AND non-empty stdout, which explains - # the odd construction: - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - else - # Allow warning below. - func_to_host_path_result="" - fi - ;; - esac - if test -z "$func_to_host_path_result" ; then - func_error "Could not determine host path corresponding to" - func_error " '$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_path_result="$1" - fi - ;; - esac - fi -} -# end: func_to_host_path -# func_to_host_pathlist arg -# -# Convert pathlists to host format when used with build tools. -# See func_to_host_path(), above. This function supports the -# following $build/$host combinations (but does no harm for -# combinations not listed here): -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# -# Path separators are also converted from $build format to -# $host format. If ARG begins or ends with a path separator -# character, it is preserved (but converted to $host format) -# on output. -# -# ARG is a pathlist (on $build) that should be converted to -# the proper representation on $host. The result is stored -# in $func_to_host_pathlist_result. -func_to_host_pathlist () -{ - func_to_host_pathlist_result="$1" - if test -n "$1" ; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_to_host_pathlist_tmp2="$1" - # Once set for this call, this variable should not be - # reassigned. It is used in tha fallback case. - func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e 's|^:*||' -e 's|:*$||'` - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # unfortunately, winepath doesn't convert pathlists - func_to_host_pathlist_result="" - func_to_host_pathlist_oldIFS=$IFS - IFS=: - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do - IFS=$func_to_host_pathlist_oldIFS - if test -n "$func_to_host_pathlist_f" ; then - func_to_host_path "$func_to_host_pathlist_f" - if test -n "$func_to_host_path_result" ; then - if test -z "$func_to_host_pathlist_result" ; then - func_to_host_pathlist_result="$func_to_host_path_result" - else - func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" - fi - fi - fi - IFS=: - done - IFS=$func_to_host_pathlist_oldIFS - ;; - esac - if test -z "$func_to_host_pathlist_result" ; then - func_error "Could not determine the host path(s) corresponding to" - func_error " '$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This may break if $1 contains DOS-style drive - # specifications. The fix is not to complicate the expression - # below, but for the user to provide a working wine installation - # with winepath so that path translation in the cross-to-mingw - # case works properly. - lt_replace_pathsep_nix_to_dos="s|:|;|g" - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_replace_pathsep_nix_to_dos"` - fi - # Now, add the leading and trailing path separators back - case "$1" in - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" - ;; - esac - case "$1" in - *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" - ;; - esac - ;; - esac - fi -} -# end: func_to_host_pathlist # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout @@ -3141,31 +4147,23 @@ func_emit_cwrapperexe_src () This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. - - Currently, it simply execs the wrapper *script* "$SHELL $output", - but could eventually absorb all of the scripts functionality and - exec $objdir/$outputname directly. */ EOF cat <<"EOF" +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE 1 +#endif #include #include #ifdef _MSC_VER # include # include # include -# define setmode _setmode #else # include # include # ifdef __CYGWIN__ # include -# define HAVE_SETENV -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif # endif #endif #include @@ -3177,6 +4175,44 @@ int setenv (const char *, const char *, int); #include #include +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined (other platforms) ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ +#endif + #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX #elif defined(MAXPATHLEN) @@ -3192,14 +4228,7 @@ int setenv (const char *, const char *, int); # define S_IXGRP 0 #endif -#ifdef _MSC_VER -# define S_IXUSR _S_IEXEC -# define stat _stat -# ifndef _INTPTR_T_DEFINED -# define intptr_t int -# endif -#endif - +/* path handling portability macros */ #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -3230,10 +4259,6 @@ int setenv (const char *, const char *, int); # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ -#ifdef __CYGWIN__ -# define FOPEN_WB "wb" -#endif - #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -3246,22 +4271,13 @@ int setenv (const char *, const char *, int); if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#undef LTWRAPPER_DEBUGPRINTF -#if defined DEBUGWRAPPER -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args -static void -ltwrapper_debugprintf (const char *fmt, ...) -{ - va_list args; - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); -} +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; #else -# define LTWRAPPER_DEBUGPRINTF(args) +static int lt_debug = 0; #endif -const char *program_name = NULL; +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -3271,41 +4287,27 @@ char *chase_symlinks (const char *pathspec); int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_fatal (const char *message, ...); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); void lt_setenv (const char *name, const char *value); char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_opt_process_env_set (const char *arg); -void lt_opt_process_env_prepend (const char *arg); -void lt_opt_process_env_append (const char *arg); -int lt_split_name_value (const char *arg, char** name, char** value); void lt_update_exe_path (const char *name, const char *value); void lt_update_lib_path (const char *name, const char *value); - -static const char *script_text_part1 = -EOF - - func_emit_wrapper_part1 yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ "/' -e 's/$/\\n"/' - echo ";" - cat <"))); + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", + nonnull (lt_argv_zero)); for (i = 0; i < newargc; i++) { - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", + i, nonnull (newargz[i])); } EOF @@ -3560,11 +4523,14 @@ EOF mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ + newargz = prepare_spawn (newargz); rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); + lt_debugprintf (__FILE__, __LINE__, + "(main) failed to launch target \"%s\": %s\n", + lt_argv_zero, nonnull (strerror (errno))); return 127; } return rval; @@ -3586,7 +4552,7 @@ xmalloc (size_t num) { void *p = (void *) malloc (num); if (!p) - lt_fatal ("Memory exhausted"); + lt_fatal (__FILE__, __LINE__, "memory exhausted"); return p; } @@ -3620,8 +4586,8 @@ check_executable (const char *path) { struct stat st; - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3638,8 +4604,8 @@ make_executable (const char *path) int rval = 0; struct stat st; - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3665,8 +4631,8 @@ find_executable (const char *wrapper) int tmp_len; char *concat_name; - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -3719,7 +4685,8 @@ find_executable (const char *wrapper) { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -3744,7 +4711,8 @@ find_executable (const char *wrapper) } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -3770,8 +4738,9 @@ chase_symlinks (const char *pathspec) int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", - tmp_pathspec)); + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); if (lstat (tmp_pathspec, &s) == 0) { if (S_ISLNK (s.st_mode) != 0) @@ -3793,8 +4762,9 @@ chase_symlinks (const char *pathspec) } else { - char *errstr = strerror (errno); - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); } } XFREE (tmp_pathspec); @@ -3807,7 +4777,8 @@ chase_symlinks (const char *pathspec) tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal ("Could not follow symlinks for %s", pathspec); + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -3833,11 +4804,25 @@ strendzap (char *str, const char *pat) return str; } +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + static void -lt_error_core (int exit_status, const char *mode, +lt_error_core (int exit_status, const char *file, + int line, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s: %s: ", program_name, mode); + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -3846,20 +4831,32 @@ lt_error_core (int exit_status, const char *mode, } void -lt_fatal (const char *message, ...) +lt_fatal (const char *file, int line, const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); va_end (ap); } +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + void lt_setenv (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ @@ -3904,95 +4901,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) return new_value; } -int -lt_split_name_value (const char *arg, char** name, char** value) -{ - const char *p; - int len; - if (!arg || !*arg) - return 1; - - p = strchr (arg, (int)'='); - - if (!p) - return 1; - - *value = xstrdup (++p); - - len = strlen (arg) - strlen (*value); - *name = XMALLOC (char, len); - strncpy (*name, arg, len-1); - (*name)[len - 1] = '\0'; - - return 0; -} - -void -lt_opt_process_env_set (const char *arg) -{ - char *name = NULL; - char *value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); - } - - lt_setenv (name, value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_prepend (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_append (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 1); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - void lt_update_exe_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4011,9 +4925,9 @@ lt_update_exe_path (const char *name, const char *value) void lt_update_lib_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4023,11 +4937,158 @@ lt_update_lib_path (const char *name, const char *value) } } +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' + cat <<"EOF" +} EOF } # end: func_emit_cwrapperexe_src +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + # func_mode_link arg... func_mode_link () { @@ -4072,6 +5133,7 @@ func_mode_link () new_inherited_linker_flags= avoid_version=no + bindir= dlfiles= dlprefiles= dlself=no @@ -4164,6 +5226,11 @@ func_mode_link () esac case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -4195,9 +5262,9 @@ func_mode_link () ;; *) if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" + func_append dlfiles " $arg" else - dlprefiles="$dlprefiles $arg" + func_append dlprefiles " $arg" fi prev= continue @@ -4221,7 +5288,7 @@ func_mode_link () *-*-darwin*) case "$deplibs " in *" $qarg.ltframework "*) ;; - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later + *) func_append deplibs " $qarg.ltframework" # this is fixed later ;; esac ;; @@ -4240,7 +5307,7 @@ func_mode_link () moreargs= for fil in `cat "$save_arg"` do -# moreargs="$moreargs $fil" +# func_append moreargs " $fil" arg=$fil # A libtool-controlled object. @@ -4269,7 +5336,7 @@ func_mode_link () if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -4281,7 +5348,7 @@ func_mode_link () # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" + func_append dlprefiles " $pic_object" prev= fi @@ -4351,12 +5418,12 @@ func_mode_link () if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; - *) rpath="$rpath $arg" ;; + *) func_append rpath " $arg" ;; esac else case "$xrpath " in *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; + *) func_append xrpath " $arg" ;; esac fi prev= @@ -4368,28 +5435,28 @@ func_mode_link () continue ;; weak) - weak_libs="$weak_libs $arg" + func_append weak_libs " $arg" prev= continue ;; xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xcompiler) - compiler_flags="$compiler_flags $qarg" + func_append compiler_flags " $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" prev= func_append compile_command " $wl$qarg" func_append finalize_command " $wl$qarg" @@ -4425,6 +5492,11 @@ func_mode_link () continue ;; + -bindir) + prev=bindir + continue + ;; + -dlopen) prev=dlfiles continue @@ -4475,15 +5547,16 @@ func_mode_link () ;; -L*) - func_stripname '-L' '' "$arg" - dir=$func_stripname_result - if test -z "$dir"; then + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then if test "$#" -gt 0; then func_fatal_error "require no space between \`-L' and \`$1'" else func_fatal_error "need path for \`-L' option" fi fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -4495,24 +5568,30 @@ func_mode_link () ;; esac case "$deplibs " in - *" -L$dir "*) ;; + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" ;; esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; - *) dllsearchpath="$dllsearchpath:$dir";; + *) func_append dllsearchpath ":$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -4522,7 +5601,7 @@ func_mode_link () -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; @@ -4536,7 +5615,7 @@ func_mode_link () ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs System.ltframework" + func_append deplibs " System.ltframework" continue ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -4556,7 +5635,7 @@ func_mode_link () ;; esac fi - deplibs="$deplibs $arg" + func_append deplibs " $arg" continue ;; @@ -4568,21 +5647,22 @@ func_mode_link () # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot) - compiler_flags="$compiler_flags $arg" + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" prev=xcompiler continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" case "$new_inherited_linker_flags " in *" $arg "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; + * ) func_append new_inherited_linker_flags " $arg" ;; esac continue ;; @@ -4649,13 +5729,17 @@ func_mode_link () # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; *) func_fatal_error "only absolute run-paths are allowed" ;; esac case "$xrpath " in *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; + *) func_append xrpath " $dir" ;; esac continue ;; @@ -4708,8 +5792,8 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $func_quote_for_eval_result" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -4724,9 +5808,9 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" - linker_flags="$linker_flags $func_quote_for_eval_result" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -4754,23 +5838,27 @@ func_mode_link () arg="$func_quote_for_eval_result" ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" func_append finalize_command " $arg" - compiler_flags="$compiler_flags $arg" + func_append compiler_flags " $arg" continue ;; @@ -4782,7 +5870,7 @@ func_mode_link () *.$objext) # A standard object. - objs="$objs $arg" + func_append objs " $arg" ;; *.lo) @@ -4813,7 +5901,7 @@ func_mode_link () if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -4825,7 +5913,7 @@ func_mode_link () # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" + func_append dlprefiles " $pic_object" prev= fi @@ -4870,24 +5958,25 @@ func_mode_link () *.$libext) # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" + func_append deplibs " $arg" + func_append old_deplibs " $arg" continue ;; *.la) # A libtool-controlled library. + func_resolve_sysroot "$arg" if test "$prev" = dlfiles; then # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" + func_append dlfiles " $func_resolve_sysroot_result" prev= elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" + func_append dlprefiles " $func_resolve_sysroot_result" prev= else - deplibs="$deplibs $arg" + func_append deplibs " $func_resolve_sysroot_result" fi continue ;; @@ -4925,7 +6014,7 @@ func_mode_link () if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi @@ -4934,6 +6023,8 @@ func_mode_link () func_dirname "$output" "/" "" output_objdir="$func_dirname_result$objdir" + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result # Create the object directory. func_mkdir_p "$output_objdir" @@ -4954,12 +6045,12 @@ func_mode_link () # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - libs="$libs $deplib" + func_append libs " $deplib" done if test "$linkmode" = lib; then @@ -4972,9 +6063,9 @@ func_mode_link () if $opt_duplicate_compiler_generated_deps; then for pre_post_dep in $predeps $postdeps; do case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; esac - pre_post_deps="$pre_post_deps $pre_post_dep" + func_append pre_post_deps " $pre_post_dep" done fi pre_post_deps= @@ -5041,17 +6132,19 @@ func_mode_link () for lib in $dlprefiles; do # Ignore non-libtool-libs dependency_libs= + func_resolve_sysroot "$lib" case $lib in - *.la) func_source "$lib" ;; + *.la) func_source "$func_resolve_sysroot_result" ;; esac # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` + func_basename "$deplib" + deplib_base=$func_basename_result case " $weak_libs " in *" $deplib_base "*) ;; - *) deplibs="$deplibs $deplib" ;; + *) func_append deplibs " $deplib" ;; esac done done @@ -5067,16 +6160,17 @@ func_mode_link () lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - compiler_flags="$compiler_flags $deplib" + func_append compiler_flags " $deplib" if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -5161,7 +6255,7 @@ func_mode_link () if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -5174,7 +6268,8 @@ func_mode_link () test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) if test "$pass" = conv; then @@ -5188,7 +6283,8 @@ func_mode_link () finalize_deplibs="$deplib $finalize_deplibs" fi func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) func_warning "\`-L' is ignored for archives/objects" @@ -5199,17 +6295,21 @@ func_mode_link () -R*) if test "$pass" = link; then func_stripname '-R' '' "$deplib" - dir=$func_stripname_result + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; + *) func_append xrpath " $dir" ;; esac fi deplibs="$deplib $deplibs" continue ;; - *.la) lib="$deplib" ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" @@ -5227,7 +6327,7 @@ func_mode_link () match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -5237,15 +6337,15 @@ func_mode_link () ;; esac if test "$valid_a_lib" != yes; then - $ECHO + echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because the file extensions .$libext of this argument makes me believe" - $ECHO "*** that it is just a static archive that I should not use here." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -5272,11 +6372,11 @@ func_mode_link () if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. - newdlprefiles="$newdlprefiles $deplib" + func_append newdlprefiles " $deplib" compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - newdlfiles="$newdlfiles $deplib" + func_append newdlfiles " $deplib" fi fi continue @@ -5318,20 +6418,20 @@ func_mode_link () # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; esac done fi - dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi if test "$pass" = conv; then @@ -5342,20 +6442,20 @@ func_mode_link () func_fatal_error "cannot find name of link library for \`$lib'" fi # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $deplib" done continue fi # $pass = conv @@ -5363,9 +6463,15 @@ func_mode_link () # Get the name of the library we link against. linklib= - for l in $old_library $library_names; do - linklib="$l" - done + if test -n "$old_library" && + { test "$prefer_static_libs" = yes || + test "$prefer_static_libs,$installed" = "built,no"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do + linklib="$l" + done + fi if test -z "$linklib"; then func_fatal_error "cannot find name of link library for \`$lib'" fi @@ -5382,9 +6488,9 @@ func_mode_link () # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" + func_append dlprefiles " $lib $dependency_libs" else - newdlfiles="$newdlfiles $lib" + func_append newdlfiles " $lib" fi continue fi # $pass = dlopen @@ -5406,14 +6512,14 @@ func_mode_link () # Find the relevant object directory and library name. if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then func_warning "library \`$lib' was moved." dir="$ladir" absdir="$abs_ladir" libdir="$abs_ladir" else - dir="$libdir" - absdir="$libdir" + dir="$lt_sysroot$libdir" + absdir="$lt_sysroot$libdir" fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -5421,12 +6527,12 @@ func_mode_link () dir="$ladir" absdir="$abs_ladir" # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + func_append notinst_path " $abs_ladir" else dir="$ladir/$objdir" absdir="$abs_ladir/$objdir" # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + func_append notinst_path " $abs_ladir" fi fi # $installed = yes func_stripname 'lib' '.la' "$laname" @@ -5437,20 +6543,46 @@ func_mode_link () if test -z "$libdir" && test "$linkmode" = prog; then func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi + case "$host" in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac fi # $pass = dlpreopen if test -z "$libdir"; then @@ -5468,7 +6600,7 @@ func_mode_link () if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" + func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" linkalldeplibs=no @@ -5481,7 +6613,8 @@ func_mode_link () for deplib in $dependency_libs; do case $deplib in -L*) func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; esac # Need to link against all dependency_libs? @@ -5492,12 +6625,12 @@ func_mode_link () # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $deplib" done # for deplib continue fi # $linkmode = prog... @@ -5512,7 +6645,7 @@ func_mode_link () # Make sure the rpath contains only unique directories. case "$temp_rpath:" in *"$absdir:"*) ;; - *) temp_rpath="$temp_rpath$absdir:" ;; + *) func_append temp_rpath "$absdir:" ;; esac fi @@ -5524,7 +6657,7 @@ func_mode_link () *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -5533,7 +6666,7 @@ func_mode_link () *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -5558,12 +6691,12 @@ func_mode_link () case $host in *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=no ;; *) if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=yes fi ;; @@ -5580,7 +6713,7 @@ func_mode_link () fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - $ECHO + echo if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -5598,7 +6731,7 @@ func_mode_link () *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -5607,7 +6740,7 @@ func_mode_link () *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -5661,7 +6794,7 @@ func_mode_link () linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$mode" != relink; then + if test "$linkmode" = prog || test "$opt_mode" != relink; then add_shlibpath= add_dir= add= @@ -5683,9 +6816,9 @@ func_mode_link () if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" if test -z "$old_library" ; then - $ECHO - $ECHO "*** And there doesn't seem to be a static archive available" - $ECHO "*** The link will probably fail, sorry" + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" else add="$dir/$old_library" fi @@ -5712,12 +6845,12 @@ func_mode_link () test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -5739,7 +6872,7 @@ func_mode_link () if test -n "$add_shlibpath"; then case :$compile_shlibpath: in *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi if test "$linkmode" = prog; then @@ -5753,13 +6886,13 @@ func_mode_link () test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac fi fi fi - if test "$linkmode" = prog || test "$mode" = relink; then + if test "$linkmode" = prog || test "$opt_mode" = relink; then add_shlibpath= add_dir= add= @@ -5773,7 +6906,7 @@ func_mode_link () elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -5790,7 +6923,7 @@ func_mode_link () if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -5825,21 +6958,21 @@ func_mode_link () # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - $ECHO + echo $ECHO "*** Warning: This system can not link to static lib archive $lib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - $ECHO "*** But as you try to build a module library, libtool will still create " - $ECHO "*** a static module, that should work as long as the dlopening application" - $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -5867,37 +7000,46 @@ func_mode_link () temp_xrpath=$func_stripname_result case " $xrpath " in *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; + *) func_append xrpath " $temp_xrpath";; esac;; - *) temp_deplibs="$temp_deplibs $libdir";; + *) func_append temp_deplibs " $libdir";; esac done dependency_libs="$temp_deplibs" fi - newlib_search_path="$newlib_search_path $absdir" + func_append newlib_search_path " $absdir" # Link against this library test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" - if $opt_duplicate_deps ; then + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $func_resolve_sysroot_result" done if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result func_dirname "$deplib" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; @@ -5924,8 +7066,8 @@ func_mode_link () if test -z "$darwin_install_name"; then darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi @@ -5958,7 +7100,7 @@ func_mode_link () compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -5975,7 +7117,7 @@ func_mode_link () for dir in $newlib_search_path; do case "$lib_search_path " in *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; + *) func_append lib_search_path " $dir" ;; esac done newlib_search_path= @@ -6033,10 +7175,10 @@ func_mode_link () -L*) case " $tmp_libs " in *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac ;; - *) tmp_libs="$tmp_libs $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac done eval $var=\"$tmp_libs\" @@ -6052,7 +7194,7 @@ func_mode_link () ;; esac if test -n "$i" ; then - tmp_libs="$tmp_libs $i" + func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs @@ -6093,7 +7235,7 @@ func_mode_link () # Now set the variables for building old libraries. build_libtool_libs=no oldlibs="$output" - objs="$objs$old_deplibs" + func_append objs "$old_deplibs" ;; lib) @@ -6126,10 +7268,10 @@ func_mode_link () if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" - libobjs="$libobjs $objs" + func_append libobjs " $objs" fi fi @@ -6188,13 +7330,14 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + freebsd-aout|freebsd-elf|qnx|sunos) current="$number_major" revision="$number_minor" age="0" @@ -6304,7 +7447,7 @@ func_mode_link () versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -6327,7 +7470,7 @@ func_mode_link () done # Make executables depend on our current version. - verstring="$verstring:${current}.0" + func_append verstring ":${current}.0" ;; qnx) @@ -6395,10 +7538,10 @@ func_mode_link () fi func_generate_dlsyms "$libname" "$libname" "yes" - libobjs="$libobjs $symfileobj" + func_append libobjs " $symfileobj" test "X$libobjs" = "X " && libobjs= - if test "$mode" != relink; then + if test "$opt_mode" != relink; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -6414,7 +7557,7 @@ func_mode_link () continue fi fi - removelist="$removelist $p" + func_append removelist " $p" ;; *) ;; esac @@ -6425,27 +7568,28 @@ func_mode_link () # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" + func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` - # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` - # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. temp_xrpath= for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -6459,7 +7603,7 @@ func_mode_link () for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; + *) func_append dlfiles " $lib" ;; esac done @@ -6469,19 +7613,19 @@ func_mode_link () for lib in $old_dlprefiles; do case "$dlprefiles " in *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; + *) func_append dlprefiles " $lib" ;; esac done if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework - deplibs="$deplibs System.ltframework" + func_append deplibs " System.ltframework" ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. @@ -6498,7 +7642,7 @@ func_mode_link () *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" + func_append deplibs " -lc" fi ;; esac @@ -6547,7 +7691,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" i="" ;; esac @@ -6558,21 +7702,21 @@ EOF set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which I believe you do not have" - $ECHO "*** because a test_compile did reveal that the linker did not use it for" - $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which I believe you do not have" + echo "*** because a test_compile did reveal that the linker did not use it for" + echo "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; *) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" ;; esac done @@ -6590,7 +7734,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" i="" ;; esac @@ -6601,29 +7745,29 @@ EOF set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because a test_compile did reveal that the linker did not use this one" - $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because a test_compile did reveal that the linker did not use this one" + echo "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning! Library $i is needed by this library but I was not able to" - $ECHO "*** make it link in! You will probably need to install it or some" - $ECHO "*** library that it depends on before this library will be fully" - $ECHO "*** functional. Installing it before continuing would be even better." + echo "*** make it link in! You will probably need to install it or some" + echo "*** library that it depends on before this library will be fully" + echo "*** functional. Installing it before continuing would be even better." fi ;; *) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" ;; esac done @@ -6640,15 +7784,27 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac fi if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` + if test -n "$file_magic_glob"; then + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` + else + libnameglob=$libname + fi + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + if test "$want_nocaseglob" = yes; then + shopt -s nocaseglob + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -6665,13 +7821,13 @@ EOF potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -6680,12 +7836,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else @@ -6696,7 +7852,7 @@ EOF ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -6712,7 +7868,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -6723,9 +7879,9 @@ EOF potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -6734,12 +7890,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else @@ -6750,32 +7906,32 @@ EOF ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ - -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` done fi - if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | - $GREP . >/dev/null; then - $ECHO + case $tmp_deplibs in + *[!\ \ ]*) + echo if test "X$deplibs_check_method" = "Xnone"; then - $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + echo "*** Warning: inter-library dependencies are not supported in this platform." else - $ECHO "*** Warning: inter-library dependencies are not known to be supported." + echo "*** Warning: inter-library dependencies are not known to be supported." fi - $ECHO "*** All declared inter-library dependencies are being dropped." + echo "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - fi + ;; + esac ;; esac versuffix=$versuffix_save @@ -6787,23 +7943,23 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - $ECHO - $ECHO "*** Warning: libtool could not satisfy all declared inter-library" + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - $ECHO "*** a static module, that should work as long as the dlopening" - $ECHO "*** application is linked with the -dlopen flag." + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -6813,16 +7969,16 @@ EOF build_libtool_libs=no fi else - $ECHO "*** The inter-library dependencies that have been dropped here will be" - $ECHO "*** automatically added whenever a program is linked with this library" - $ECHO "*** or is declared to -dlopen it." + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." if test "$allow_undefined" = no; then - $ECHO - $ECHO "*** Since this library must not contain undefined symbols," - $ECHO "*** because either the platform does not support them or" - $ECHO "*** it was explicitly requested with -no-undefined," - $ECHO "*** libtool will only create a static version of it." + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -6839,9 +7995,9 @@ EOF # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -6854,7 +8010,7 @@ EOF *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -6864,10 +8020,10 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done deplibs="$new_libs" @@ -6879,15 +8035,22 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -6896,18 +8059,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" + func_append dep_rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -6915,17 +8078,13 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -6933,7 +8092,7 @@ EOF fi shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -6959,18 +8118,18 @@ EOF linknames= for link do - linknames="$linknames $link" + func_append linknames " $link" done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - delfiles="$delfiles $export_symbols" + func_append delfiles " $export_symbols" fi orig_export_symbols= @@ -7001,13 +8160,45 @@ EOF $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do + for cmd1 in $cmds; do IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -7029,7 +8220,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -7041,7 +8232,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7051,7 +8242,7 @@ EOF case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -7071,21 +8262,21 @@ EOF test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" + func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -7130,7 +8321,8 @@ EOF save_libobjs=$libobjs fi save_output=$output - output_la=`$ECHO "X$output" | $Xsed -e "$basename"` + func_basename "$output" + output_la=$func_basename_result # Clear the reloadable object creation command queue and # initialize k to one. @@ -7143,13 +8335,16 @@ EOF if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - $ECHO 'INPUT (' > $output + echo 'INPUT (' > $output for obj in $save_libobjs do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - $ECHO ')' >> $output - delfiles="$delfiles $output" + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -7163,10 +8358,12 @@ EOF fi for obj do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -7190,17 +8387,19 @@ EOF # command to the queue. if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" else # All subsequent reloadable object files will link in # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=$obj + objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -7210,11 +8409,12 @@ EOF # reloadable object file. All subsequent reloadable object # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles="$delfiles $output" + func_append delfiles " $output" else output= @@ -7248,7 +8448,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7269,7 +8469,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -7281,7 +8481,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7322,10 +8522,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -7341,7 +8541,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7353,7 +8553,7 @@ EOF IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -7434,18 +8634,21 @@ EOF if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -7505,8 +8708,8 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac @@ -7517,14 +8720,14 @@ EOF if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -7538,7 +8741,7 @@ EOF *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7548,17 +8751,17 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done compile_deplibs="$new_libs" - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -7566,7 +8769,7 @@ EOF # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done fi @@ -7585,18 +8788,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi case $host in @@ -7605,12 +8808,12 @@ EOF case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) dllsearchpath="$dllsearchpath:$libdir";; + *) func_append dllsearchpath ":$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -7636,18 +8839,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + *) func_append finalize_perm_rpath " $libdir" ;; esac fi done @@ -7661,8 +8864,8 @@ EOF if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. - compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -7674,15 +8877,15 @@ EOF wrappers_required=yes case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi ;; - *cegcc) - # Disable wrappers for cegcc, we are cross compiling anyway. - wrappers_required=no - ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -7691,13 +8894,19 @@ EOF esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. exit_status=0 func_show_eval "$link_command" 'exit_status=$?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -7720,7 +8929,7 @@ EOF # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -7728,7 +8937,7 @@ EOF # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -7738,11 +8947,18 @@ EOF # We don't need to create a wrapper script. link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + exit $EXIT_SUCCESS fi @@ -7757,7 +8973,7 @@ EOF if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -7769,13 +8985,19 @@ EOF fi # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname func_show_eval "$link_command" 'exit $?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Now create the wrapper script. func_verbose "creating $output" @@ -7793,18 +9015,7 @@ EOF fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $ECHO for shipping. - if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -7884,7 +9095,7 @@ EOF else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs="$oldobjs $symfileobj" + func_append oldobjs " $symfileobj" fi fi addlibs="$old_convenience" @@ -7892,10 +9103,10 @@ EOF if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # Do each command in the archive commands. @@ -7906,10 +9117,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -7925,9 +9136,9 @@ EOF done | sort | sort -uc >/dev/null 2>&1); then : else - $ECHO "copying selected object files to avoid basename conflicts..." + echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -7951,18 +9162,30 @@ EOF esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" ;; - *) oldobjs="$oldobjs $obj" ;; + *) func_append oldobjs " $obj" ;; esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -8036,7 +9259,7 @@ EOF done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -8056,12 +9279,23 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs="$newdependency_libs $libdir/$name" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -8075,9 +9309,9 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles="$newdlfiles $libdir/$name" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; - *) newdlfiles="$newdlfiles $lib" ;; + *) func_append newdlfiles " $lib" ;; esac done dlfiles="$newdlfiles" @@ -8094,7 +9328,7 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles="$newdlprefiles $libdir/$name" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done @@ -8106,7 +9340,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles="$newdlfiles $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -8115,15 +9349,33 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles="$newdlprefiles $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi $RM $output # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; esac $ECHO > $output "\ # $outputname - a libtool library file @@ -8182,7 +9434,7 @@ relink_command=\"$relink_command\"" exit $EXIT_SUCCESS } -{ test "$mode" = link || test "$mode" = relink; } && +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && func_mode_link ${1+"$@"} @@ -8202,9 +9454,9 @@ func_mode_uninstall () for arg do case $arg in - -f) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done @@ -8213,24 +9465,23 @@ func_mode_uninstall () rmdirs= - origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - objdir="$origobjdir" + odir="$objdir" else - objdir="$dir/$origobjdir" + odir="$dir/$objdir" fi func_basename "$file" name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" + test "$opt_mode" = uninstall && odir="$dir" - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; esac fi @@ -8256,18 +9507,17 @@ func_mode_uninstall () # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$mode" in + case "$opt_mode" in clean) - case " $library_names " in - # " " in the beginning catches empty $dlname + case " $library_names " in *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -8295,19 +9545,19 @@ func_mode_uninstall () # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" + func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" + func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$mode" = clean ; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) @@ -8317,7 +9567,7 @@ func_mode_uninstall () noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles="$rmfiles $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. @@ -8326,7 +9576,7 @@ func_mode_uninstall () func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + func_append rmfiles " $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -8334,12 +9584,12 @@ func_mode_uninstall () # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -8347,7 +9597,6 @@ func_mode_uninstall () esac func_show_eval "$RM $rmfiles" 'exit_status=1' done - objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -8359,16 +9608,16 @@ func_mode_uninstall () exit $exit_status } -{ test "$mode" = uninstall || test "$mode" = clean; } && +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$mode" && { +test -z "$opt_mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff --git a/bindings/swig/package/m4/libtool.m4 b/bindings/swig/package/m4/libtool.m4 new file mode 100644 index 0000000..126202f --- /dev/null +++ b/bindings/swig/package/m4/libtool.m4 @@ -0,0 +1,7992 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +]) + +# serial 57 LT_INIT + + +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) + + +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) + + +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +_LT_SETUP + +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) + + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +m4_defun([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + +_LT_CHECK_OBJDIR + +m4_require([_LT_TAG_COMPILER])dnl + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + _LT_PATH_MAGIC + fi + ;; +esac + +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP + + +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from `configure', and `config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# `config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain="$ac_aux_dir/ltmain.sh" +])# _LT_PROG_LTMAIN + + +## ------------------------------------- ## +## Accumulate code for creating libtool. ## +## ------------------------------------- ## + +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the `libtool' +# label. + + +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) + + + +## ------------------------ ## +## FIXME: Eliminate VARNAME ## +## ------------------------ ## + + +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) + + +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) + + +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) + + +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to `config.status' so that its +# declaration there will have the same value as in `configure'. VARNAME +# must have a single quote delimited value for this to work. +m4_define([_LT_CONFIG_STATUS_DECLARE], +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) + + +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags="_LT_TAGS"dnl +]) + + +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) + + +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _LT_CONFIG_COMMANDS +# ------------------- +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into `config.status', and then the shell code to quote escape them in +# for loops in `config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +_LT_OUTPUT_LIBTOOL_INIT +]) + +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test $lt_write_fail = 0 && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT + +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) + +cat >>"$CONFIG_LT" <<\_LTEOF +lt_cl_silent=false +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +\`$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2011 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." + +while test $[#] != 0 +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try \`$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try \`$[0] --help' for more information.]) ;; + esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null +fi +_LTEOF + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) +])# LT_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +_LT_COPYING +_LT_LIBTOOL_TAGS + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + _LT_PROG_REPLACE_SHELLFNS + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG + + +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG + + +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG + + +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) + + +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE + +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) + + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +]) + + +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + _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}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _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}" + _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}" + m4_if([$1], [CXX], +[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _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}" + _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}" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi +])# _LT_SYS_MODULE_PATH_AIX + + +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + + + +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac + +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) + +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) +])# _LT_PROG_ECHO_BACKSLASH + + +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and in which our libraries should be installed.])]) + +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + powerpcle-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks="$enable_libtool_lock" +])# _LT_ENABLE_LOCK + + +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[_LT_PROG_AR + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) +])# _LT_CMD_OLD_ARCHIVE + + +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* +]) + +if test x"[$]$2" = xyes; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) +fi +])# _LT_COMPILER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" +]) + +if test x"[$]$2" = xyes; then + m4_if([$4], , :, [$4]) +else + m4_if([$5], , :, [$5]) +fi +])# _LT_LINKER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + + +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac +]) +if test -n $lt_cv_sys_max_cmd_len ; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN + +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + + +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN + + +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "$cross_compiling" = yes; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi +fi +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF + + +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O + + +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) + +hard_links="nottested" +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test "$hard_links" = no; then + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS + + +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", + [Define to the sub-directory in which libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR + + +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH + + +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB + + +# _LT_SYS_DYNAMIC_LINKER([TAG]) +# ----------------------------- +# PORTME Fill in your ld.so characteristics +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) +m4_if([$1], + [], [ +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[[4-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[[3-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + 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;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], + [Run-time system search path for libraries]) +])# _LT_SYS_DYNAMIC_LINKER + + +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# find a file program which can recognize shared library +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$1; then + lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac]) +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX + +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + + +# _LT_PATH_MAGIC +# -------------- +# find a file program which can recognize a shared library +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC + + +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD + + +# LT_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} +fi]) +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi + AC_SUBST([DUMPBIN]) + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) + +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + + +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M + +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) + + +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl + +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test "$GCC" = yes; then + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac + + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI + + +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl + +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) +]) # _LT_CMD_GLOBAL_SYMBOLS + + +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= + +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC + + +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac + ;; + + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + ;; + esac + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld + +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) + +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + ;; + esac + fi + ;; +esac + +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting ${shlibpath_var} if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS + + +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC="$CC" +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_CONFIG($1) +fi +AC_LANG_POP +CC="$lt_save_CC" +])# _LT_LANG_C_CONFIG + + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi + + if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + gnu*) + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + + _LT_TAGVAR(GCC, $1)="$GXX" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= + +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF +]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + fi + + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test "$pre_test_object_deps_done" = no; then + case ${prev} in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)="${prev}${p}" + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi + prev= + ;; + + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)="$p" + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)="$p" + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling $1 test program" +fi + +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS + + +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_F77" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} + CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$G77" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" +fi # test "$_lt_disable_F77" != yes + +AC_LANG_POP +])# _LT_LANG_F77_CONFIG + + +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_FC" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test "$_lt_disable_FC" != yes + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG + + +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE + +# Source file extension for Java test sources. +ac_ext=java + +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG + + +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) + + +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) + +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef + +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) + + +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +AC_MSG_RESULT([$xsi_shell]) +_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) + +AC_MSG_CHECKING([whether the shell understands "+="]) +lt_shell_append=no +( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +AC_MSG_RESULT([$lt_shell_append]) +_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES + + +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) + + +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi + +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) + +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/bindings/swig/package/m4/ltoptions.m4 b/bindings/swig/package/m4/ltoptions.m4 new file mode 100644 index 0000000..5d9acd8 --- /dev/null +++ b/bindings/swig/package/m4/ltoptions.m4 @@ -0,0 +1,384 @@ +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 7 ltoptions.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + + +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option `$2'])])[]dnl +]) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) + + +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + ]) +])# _LT_SET_OPTIONS + + +## --------------------------------- ## +## Macros to handle LT_INIT options. ## +## --------------------------------- ## + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `dlopen' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac + +test -z "$AS" && AS=as +_LT_DECL([], [AS], [1], [Assembler program])dnl + +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl + +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +])# win32-dll + +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `win32-dll' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the `shared' and +# `disable-shared' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) + +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) + +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the `static' and +# `disable-static' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the `fast-install' +# and `disable-fast-install' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `fast-install' option into LT_INIT's first parameter.]) +]) + +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `disable-fast-install' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# LT_INIT options. +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [pic_mode=default]) + +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `pic-only' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + +## ----------------- ## +## LTDL_INIT Options ## +## ----------------- ## + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) diff --git a/bindings/swig/package/m4/ltsugar.m4 b/bindings/swig/package/m4/ltsugar.m4 new file mode 100644 index 0000000..9000a05 --- /dev/null +++ b/bindings/swig/package/m4/ltsugar.m4 @@ -0,0 +1,123 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + + +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + + +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59 which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + + + +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) diff --git a/bindings/swig/package/m4/ltversion.m4 b/bindings/swig/package/m4/ltversion.m4 new file mode 100644 index 0000000..07a8602 --- /dev/null +++ b/bindings/swig/package/m4/ltversion.m4 @@ -0,0 +1,23 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# @configure_input@ + +# serial 3337 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.4.2' +macro_revision='1.3337' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) diff --git a/bindings/swig/package/m4/lt~obsolete.m4 b/bindings/swig/package/m4/lt~obsolete.m4 new file mode 100644 index 0000000..c573da9 --- /dev/null +++ b/bindings/swig/package/m4/lt~obsolete.m4 @@ -0,0 +1,98 @@ +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/bindings/swig/package/missing b/bindings/swig/package/missing index 28055d2..cdea514 100755 --- a/bindings/swig/package/missing +++ b/bindings/swig/package/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,272 +70,141 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/bindings/swig/package/multimapwdef.i b/bindings/swig/package/multimapwdef.i new file mode 100644 index 0000000..ac25ae9 --- /dev/null +++ b/bindings/swig/package/multimapwdef.i @@ -0,0 +1,11 @@ +%{ +#include "multimapwdef.h" +%} + +%ignore sword::multimapwithdefault::operator []; + +%include "multimapwdef.h" + +%extend sword::multimapwithdefault { +} + diff --git a/bindings/swig/package/osishtmlhref.i b/bindings/swig/package/osishtmlhref.i index d721b0c..a3ae458 100755 --- a/bindings/swig/package/osishtmlhref.i +++ b/bindings/swig/package/osishtmlhref.i @@ -1,7 +1,6 @@ %{ #include #include -#include #include #include #include "utf8html.h" @@ -9,7 +8,6 @@ %include %include "osishtmlhref.h" -%include "plainhtml.h" %include "thmlhtmlhref.h" %include "gbfhtmlhref.h" %include "utf8html.h" diff --git a/bindings/swig/package/perl.m4 b/bindings/swig/package/perl.m4 index 9add0b3..36a3f01 100644 --- a/bindings/swig/package/perl.m4 +++ b/bindings/swig/package/perl.m4 @@ -2,7 +2,7 @@ # Look for Perl5 #---------------------------------------------------------------- -AC_DEFUN(SW_FIND_PERL, +AC_DEFUN([SW_FIND_PERL], [ diff --git a/bindings/swig/package/php4.m4 b/bindings/swig/package/php4.m4 index d184ec2..3b5ea8b 100644 --- a/bindings/swig/package/php4.m4 +++ b/bindings/swig/package/php4.m4 @@ -2,7 +2,7 @@ # Look for Php4 #------------------------------------------------------------------------- -AC_DEFUN(SW_FIND_PHP4, +AC_DEFUN([SW_FIND_PHP4], [ PHP4BIN= diff --git a/bindings/swig/package/python.m4 b/bindings/swig/package/python.m4 index a047ea4..7d517fa 100644 --- a/bindings/swig/package/python.m4 +++ b/bindings/swig/package/python.m4 @@ -2,7 +2,7 @@ # Look for Python #---------------------------------------------------------------- -AC_DEFUN(SW_FIND_PYTHON, +AC_DEFUN([SW_FIND_PYTHON], [ PYINCLUDE= diff --git a/bindings/swig/package/remotetrans.i b/bindings/swig/package/remotetrans.i new file mode 100644 index 0000000..6024765 --- /dev/null +++ b/bindings/swig/package/remotetrans.i @@ -0,0 +1,6 @@ +%{ +#include "remotetrans.h" +%} + +%include "remotetrans.h" + diff --git a/bindings/swig/package/rendercallback.h b/bindings/swig/package/rendercallback.h index d2a68e3..bfb54fc 100755 --- a/bindings/swig/package/rendercallback.h +++ b/bindings/swig/package/rendercallback.h @@ -18,9 +18,9 @@ class ReturnSuccess { public: ReturnSuccess(): data(""), success(FAILED) {} - ReturnSuccess(char* data, int success): data(data), success(success) {} + ReturnSuccess(const char* data, int success): data(data), success(success) {} virtual ~ReturnSuccess() {} - char* data; + const char* data; int success; }; diff --git a/bindings/swig/package/swbuf.i b/bindings/swig/package/swbuf.i index 6ae7bd0..ada600f 100644 --- a/bindings/swig/package/swbuf.i +++ b/bindings/swig/package/swbuf.i @@ -2,7 +2,7 @@ #include "swbuf.h" %} -%ignore sword::SWBuf::operator const char *; +%rename(__str__) sword::SWBuf::operator const char *; %ignore sword::SWBuf::operator[]; %ignore sword::SWBuf::operator+; %ignore sword::SWBuf::operator==; diff --git a/bindings/swig/package/swig.m4 b/bindings/swig/package/swig.m4 index 9ff89d7..49f1fdc 100644 --- a/bindings/swig/package/swig.m4 +++ b/bindings/swig/package/swig.m4 @@ -2,7 +2,7 @@ # Look for SWIG #---------------------------------------------------------------- -AC_DEFUN(SW_PROG_SWIG, +AC_DEFUN([SW_PROG_SWIG], [ AC_ARG_WITH(swigbin,[ --with-swigbin=path Set location of swig executable],[ SWIGBIN="$withval"], [SWIGBIN=]) diff --git a/bindings/swig/package/swkey.i b/bindings/swig/package/swkey.i index 77412c1..ebbd934 100644 --- a/bindings/swig/package/swkey.i +++ b/bindings/swig/package/swkey.i @@ -3,7 +3,13 @@ %} %ignore sword::SWKey::userData; +%ignore sword::SWKey::Index; +%ignore sword::SWKey::Traversable; %rename (getPosition) sword::SW_POSITION::operator char; %include "swkey.h" + +#ifndef SWIGPERL +%rename(__str__) sword::SWKey::operator const char *; +#endif diff --git a/bindings/swig/package/swmodule.i b/bindings/swig/package/swmodule.i index c9cce5e..d9417db 100644 --- a/bindings/swig/package/swmodule.i +++ b/bindings/swig/package/swmodule.i @@ -2,8 +2,8 @@ #include "swmodule.h" %} -%ignore sword::SWModule::operator sword::SWKey &; -%ignore sword::SWModule::operator sword::SWKey *; +%ignore sword::SWModule::operator SWKey &; +%ignore sword::SWModule::operator SWKey *; %ignore sword::SWModule::Search; diff --git a/bindings/swig/package/sword.i b/bindings/swig/package/sword.i index e0fe6c3..a963fa1 100644 --- a/bindings/swig/package/sword.i +++ b/bindings/swig/package/sword.i @@ -6,21 +6,30 @@ /* Ignore warnings about Unknown base class */ %warnfilter(401); +%include "deprecations.i" + #ifdef SWIGPYTHON %include "directors.i" #endif +/* Some renames for sanity */ +%ignore *::operator SWBuf; + /* Some generic ignores. These don't map into any Python operators */ %ignore *::operator=; %ignore *::operator++; %ignore *::operator--; -%ignore *::operator const char *; %ignore *::operator sword::SWKey &; %ignore *::operator sword::SWKey *; +/* An ignore for missing wchar_t compatibility */ +%ignore sword::SWBuf::append(wchar_t); %include "defs.i" %include "swbuf.i" +%include "multimapwdef.i" + + /* Now include all the STL templates we are going to use */ %include "templates.i" @@ -89,7 +98,7 @@ %include "swlog.i" #ifndef EXCLUDE_FTP -%include "ftptrans.i" +%include "remotetrans.i" #ifndef EXCLUDE_INSTALLMGR %include "installmgr.i" diff --git a/bindings/swig/package/sword.m4 b/bindings/swig/package/sword.m4 index 206c794..97f06bb 100644 --- a/bindings/swig/package/sword.m4 +++ b/bindings/swig/package/sword.m4 @@ -7,7 +7,7 @@ dnl Check wheter to use static linking dnl first parameter is the required version dnl second is whether to use static sword library dnl ---------------------------------------------------------------------- -AC_DEFUN(SW_CHECK_SWORD, +AC_DEFUN([SW_CHECK_SWORD], [ dnl AC_MSG_CHECKING([for a Sword installation]) @@ -28,7 +28,7 @@ AC_ARG_ENABLE(static-sword, dnl try to find Sword library files AC_MSG_CHECKING([for Sword library files]) AC_REQUIRE([AC_FIND_ZLIB]) -ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" +ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib64 /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" if test "$ac_static_sword" = "YES"; then SEARCH_LIBS="libsword.a"; diff --git a/bindings/swig/package/tcl.m4 b/bindings/swig/package/tcl.m4 index 9b99c7f..9d9cee2 100644 --- a/bindings/swig/package/tcl.m4 +++ b/bindings/swig/package/tcl.m4 @@ -2,7 +2,7 @@ # Try to locate the Tcl package #-------------------------------------------------------------------- -AC_DEFUN(SW_FIND_TCL, +AC_DEFUN([SW_FIND_TCL], [ diff --git a/bindings/swig/package/versekey.i b/bindings/swig/package/versekey.i index b396c5a..539989d 100644 --- a/bindings/swig/package/versekey.i +++ b/bindings/swig/package/versekey.i @@ -1,6 +1,6 @@ %{ #include "versekey.h" -#include "versemgr.h" +#include "versificationmgr.h" %} @@ -12,6 +12,7 @@ %ignore sword::VerseKey::builtin_books; %ignore sword::VerseKey::BMAX; %ignore sword::VerseKey::books; +%ignore sword::VerseKey::VerseKey(SWKey const &); %immutable sword::VerseKey::builtin_abbrevs; %immutable sword::sbook::name; @@ -19,7 +20,7 @@ %immutable sword::abbrev::ab; %include "versekey.h" -%include "versemgr.h" +%include "versificationmgr.h" %extend sword::abbrev { int getAbbrevCount() { @@ -66,7 +67,7 @@ const int getBookCount(){ - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); return system->getBookCount(); @@ -86,7 +87,7 @@ return 0; } - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); @@ -94,7 +95,7 @@ (testament == 2) ? self->BMAX[0] : 0 ); - const sword::VerseMgr::Book* b = system->getBook(book_num); + const sword::VersificationMgr::Book* b = system->getBook(book_num); if(!b) { fprintf(stderr, "b is null for %d?!?\n", book_num); return 0; @@ -105,14 +106,14 @@ }; int getBookNumberByOSISName( const char* bookname ) { - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); return system->getBookNumberByOSISName(bookname); } const char* getOSISBookName( const int book ) { - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); if ( (book < 0) || (book >= system->getBookCount())) @@ -135,7 +136,7 @@ return 0; } - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); @@ -143,7 +144,7 @@ (testament == 2) ? self->BMAX[0] : 0 ); - const sword::VerseMgr::Book* b = system->getBook(book_num); + const sword::VersificationMgr::Book* b = system->getBook(book_num); if(!b) { fprintf(stderr, "b is null for %d?!?\n", book_num); return 0; @@ -164,7 +165,7 @@ return 0; } - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); @@ -172,7 +173,7 @@ (testament == 2) ? self->BMAX[0] : 0 ); - const sword::VerseMgr::Book* b = system->getBook(book_num); + const sword::VersificationMgr::Book* b = system->getBook(book_num); if(!b) { fprintf(stderr, "b is null for %d?!?\n", book_num); return 0; diff --git a/bindings/swig/package/zlib.m4 b/bindings/swig/package/zlib.m4 index 952e5bd..11e38e7 100644 --- a/bindings/swig/package/zlib.m4 +++ b/bindings/swig/package/zlib.m4 @@ -1,7 +1,7 @@ ## -*- autoconf -*- -AC_DEFUN(AC_FIND_ZLIB, +AC_DEFUN([AC_FIND_ZLIB], [ AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) AC_MSG_CHECKING([for libz]) @@ -34,7 +34,7 @@ else fi ]) -AC_DEFUN(KDE_CHECK_EXTRA_LIBS, +AC_DEFUN([KDE_CHECK_EXTRA_LIBS], [ AC_MSG_CHECKING(for extra includes) AC_ARG_WITH(extra-includes, [ --with-extra-includes=DIR @@ -93,7 +93,7 @@ dnl ------------------------------------------------------------------------ dnl Find a file (or one of more files in a list of dirs) dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_FIND_FILE, +AC_DEFUN([AC_FIND_FILE], [ $3=NO for i in $2; diff --git a/bindings/swig/perl/CMakeLists.txt b/bindings/swig/perl/CMakeLists.txt new file mode 100644 index 0000000..3e2e2e9 --- /dev/null +++ b/bindings/swig/perl/CMakeLists.txt @@ -0,0 +1,68 @@ +# This method works but there is no good way to install the results of it +#FIND_PACKAGE(PerlLibs REQUIRED) +#INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH}) +# +#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES CPLUSPLUS ON) +#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES SWIG_FLAGS "") +# +#SWIG_ADD_MODULE(Sword perl +# "../sword.i" +#) +# +#SWIG_LINK_LIBRARIES(Sword ${PERL_LIBRARY} ${SWORD_LINK_NAME}) + +FIND_PACKAGE(Perl REQUIRED) + +SET(PERL_MAKEFILE "#!${PERL_EXECUTABLE} + +use ExtUtils::MakeMaker; + +# See lib/ExtUtils/MakeMaker.pm for details of how to influence +# the contents of the Makefile that is written +WriteMakefile( + 'NAME' => 'Sword', + 'VERSION' => '${SWORD_VERSION}', + 'INC' => '-I${CMAKE_SOURCE_DIR}/include -I${CMAKE_CURRENT_SOURCE_DIR}/..', + 'DEFINE' => '-DSWIG', + 'LIBS' => '-L${CMAKE_BINARY_DIR} -lsword -lz', + 'FIRST_MAKEFILE' => 'Makefile.perlswig', + 'PREREQ_PM' => {}, + ($] >= 5.005 ? ## Add these new keywords supported since 5.005 + (ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module + AUTHOR => 'Sword Project ') : ()), +); + +rename 'Makefile.perlswig', 'Makefile.perlswig.old' or die \"Can't rename Makefile\"; +open(INPUT, 'Makefile.perlswig') or die \"Can't open output Makefile\"; +while () { + s/\\-lsword/\\-lsword \\-lstdc\\+\\+/; + print OUTPUT \"$_\"; +} + +close INPUT; +close OUTPUT;") +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.PL "${PERL_MAKEFILE}") + +SET(SKIP_MAKEFILE "\\.old +~$ +\\.bak +^CVS +Makefile$") +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.SKIP "${SKIP_MAKEFILE}") + +SWORD_SWIG_GENERATE(perl) + +ADD_CUSTOM_COMMAND(OUTPUT MANIFEST Makefile.perlswig + COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig clean + COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig manifest + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + +ADD_CUSTOM_TARGET(perlswig ALL + COMMAND make -f Makefile.perlswig + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx ${CMAKE_CURRENT_BINARY_DIR}/Makefile.perlswig ${SWORD_LINK_NAME} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + +INSTALL(SCRIPT install.cmake) + +MESSAGE(STATUS "Perl: yes") diff --git a/bindings/swig/perl/install.cmake b/bindings/swig/perl/install.cmake new file mode 100644 index 0000000..5ba23e5 --- /dev/null +++ b/bindings/swig/perl/install.cmake @@ -0,0 +1,3 @@ +EXECUTE_PROCESS(COMMAND + make -f Makefile.perlswig install + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bindings/swig/perl/) diff --git a/bindings/swig/python/CMakeLists.txt b/bindings/swig/python/CMakeLists.txt new file mode 100644 index 0000000..b661654 --- /dev/null +++ b/bindings/swig/python/CMakeLists.txt @@ -0,0 +1,58 @@ +# This method works, but there is no established way to do the installation +#FIND_PACKAGE(PythonLibs REQUIRED) +#INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS}) +# +#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES CPLUSPLUS ON) +#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES SWIG_FLAGS "") +# +#SWIG_ADD_MODULE(Sword python +# "../sword.i" +#) +# +#SWIG_LINK_LIBRARIES(Sword ${PYTHON_LIBRARIES} ${SWORD_LINK_NAME}) + +FIND_PACKAGE(PythonInterp REQUIRED) +FIND_PACKAGE(PythonLibs) + +IF(NOT PYTHONLIBS_FOUND) + MESSAGE(FATAL_ERROR "Failed to locate Python.h header.") +ENDIF(NOT PYTHONLIBS_FOUND) + +SET(PY_SCRIPT "#!${PYTHON_EXECUTABLE} + +from distutils.core import setup, Extension +setup(name='sword',version='${SWORD_VERSION}', +maintainer='Sword Developers', +maintainer_email='sword-devel@crosswire.org', +url='http://www.crosswire.org/sword', +py_modules=['Sword'], +include_dirs=['${CMAKE_CURRENT_SOURCE_DIR}', '${CMAKE_SOURCE_DIR}/include', '${CMAKE_CURRENT_SOURCE_DIR}/..', '${CMAKE_CURRENT_SOURCE_DIR}../../'], +ext_modules = [Extension('_Sword',['Sword.cxx'], +libraries=[('sword')], +library_dirs=[('${CMAKE_BINARY_DIR}')], +)] +,)" +) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/setup.py "${PY_SCRIPT}") + +SWORD_SWIG_GENERATE(python) + +ADD_CUSTOM_TARGET(swordswig ALL + COMMAND python setup.py build + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx ${SWORD_LINK_NAME} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + +# Allow user installation to custom directory +IF(SWORD_PYTHON_INSTALL_DIR) + SET(SETUP_ARGS "--home=${SWORD_PYTHON_INSTALL_DIR}") +ELSE(SWORD_PYTHON_INSTALL_DIR) + SET(SETUP_ARGS "--home=${CMAKE_INSTALL_PREFIX}") +ENDIF(SWORD_PYTHON_INSTALL_DIR) +CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/install.cmake") + +# Run external installation script +INSTALL(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install.cmake") + +MESSAGE(STATUS "Python: yes") diff --git a/bindings/swig/python/install.cmake.in b/bindings/swig/python/install.cmake.in new file mode 100644 index 0000000..5dbd52e --- /dev/null +++ b/bindings/swig/python/install.cmake.in @@ -0,0 +1,4 @@ +EXECUTE_PROCESS(COMMAND + python setup.py install @SETUP_ARGS@ + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" +) diff --git a/bindings/swig/remotetrans.i b/bindings/swig/remotetrans.i new file mode 100644 index 0000000..6024765 --- /dev/null +++ b/bindings/swig/remotetrans.i @@ -0,0 +1,6 @@ +%{ +#include "remotetrans.h" +%} + +%include "remotetrans.h" + diff --git a/bindings/swig/rendercallback.h b/bindings/swig/rendercallback.h index d2a68e3..bfb54fc 100755 --- a/bindings/swig/rendercallback.h +++ b/bindings/swig/rendercallback.h @@ -18,9 +18,9 @@ class ReturnSuccess { public: ReturnSuccess(): data(""), success(FAILED) {} - ReturnSuccess(char* data, int success): data(data), success(success) {} + ReturnSuccess(const char* data, int success): data(data), success(success) {} virtual ~ReturnSuccess() {} - char* data; + const char* data; int success; }; diff --git a/bindings/swig/swbuf.i b/bindings/swig/swbuf.i index 6ae7bd0..ada600f 100644 --- a/bindings/swig/swbuf.i +++ b/bindings/swig/swbuf.i @@ -2,7 +2,7 @@ #include "swbuf.h" %} -%ignore sword::SWBuf::operator const char *; +%rename(__str__) sword::SWBuf::operator const char *; %ignore sword::SWBuf::operator[]; %ignore sword::SWBuf::operator+; %ignore sword::SWBuf::operator==; diff --git a/bindings/swig/swkey.i b/bindings/swig/swkey.i index 77412c1..ebbd934 100644 --- a/bindings/swig/swkey.i +++ b/bindings/swig/swkey.i @@ -3,7 +3,13 @@ %} %ignore sword::SWKey::userData; +%ignore sword::SWKey::Index; +%ignore sword::SWKey::Traversable; %rename (getPosition) sword::SW_POSITION::operator char; %include "swkey.h" + +#ifndef SWIGPERL +%rename(__str__) sword::SWKey::operator const char *; +#endif diff --git a/bindings/swig/swmodule.i b/bindings/swig/swmodule.i index c9cce5e..d9417db 100644 --- a/bindings/swig/swmodule.i +++ b/bindings/swig/swmodule.i @@ -2,8 +2,8 @@ #include "swmodule.h" %} -%ignore sword::SWModule::operator sword::SWKey &; -%ignore sword::SWModule::operator sword::SWKey *; +%ignore sword::SWModule::operator SWKey &; +%ignore sword::SWModule::operator SWKey *; %ignore sword::SWModule::Search; diff --git a/bindings/swig/sword.i b/bindings/swig/sword.i index e0fe6c3..a963fa1 100644 --- a/bindings/swig/sword.i +++ b/bindings/swig/sword.i @@ -6,21 +6,30 @@ /* Ignore warnings about Unknown base class */ %warnfilter(401); +%include "deprecations.i" + #ifdef SWIGPYTHON %include "directors.i" #endif +/* Some renames for sanity */ +%ignore *::operator SWBuf; + /* Some generic ignores. These don't map into any Python operators */ %ignore *::operator=; %ignore *::operator++; %ignore *::operator--; -%ignore *::operator const char *; %ignore *::operator sword::SWKey &; %ignore *::operator sword::SWKey *; +/* An ignore for missing wchar_t compatibility */ +%ignore sword::SWBuf::append(wchar_t); %include "defs.i" %include "swbuf.i" +%include "multimapwdef.i" + + /* Now include all the STL templates we are going to use */ %include "templates.i" @@ -89,7 +98,7 @@ %include "swlog.i" #ifndef EXCLUDE_FTP -%include "ftptrans.i" +%include "remotetrans.i" #ifndef EXCLUDE_INSTALLMGR %include "installmgr.i" diff --git a/bindings/swig/sword.pl b/bindings/swig/sword.pl index fed3b40..29310ab 100755 --- a/bindings/swig/sword.pl +++ b/bindings/swig/sword.pl @@ -1,12 +1,12 @@ #!/usr/bin/perl + #****************************************************************************** # -# This looks like a test program to check binding functionality :) -# Someone update me otherwise +# sword.pl - This looks like a test program to check binding functionality # -# $Id: sword.pl 2539 2010-08-23 04:02:31Z greg.hellings $ +# $Id: sword.pl 2960 2013-08-13 15:49:39Z greg.hellings $ # -# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) +# Copyright 2002-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society # P. O. Box 2528 # Tempe, AZ 85280-2528 @@ -51,30 +51,30 @@ print "init ... "; #$module = $mgr->module("GerLut1545-temp"); $module = $mgr->getModule("WEB"); print "Printing WEB Module information: \n"; -print "Name:\t", $module->Name(),"\nDescription:\t", $module->Description(), "\nLang:\t", $module->Lang(), "\n"; +print "Name:\t", $module->getName(),"\nDescription:\t", $module->getDescription(), "\nLang:\t", $module->getLanguage(), "\n"; $key = new Sword::VerseKey("Matthew 3:16"); #$key->setPersist(1); -$module->SetKey($key); +$module->setKey($key); for ($i = 0; $i < 15; $i++) { - print "(", $module->KeyText() ,")\t", $module->StripText(), "\n"; + print "(", $module->getKeyText() ,")\t", $module->stripText(), "\n"; $key->increment(); - $module->SetKey($key); + $module->setKey($key); } $key->increment(103); -$module->SetKey($key); -print "(", $module->KeyText() ,")\t", $module->StripText(), "\n"; +$module->setKey($key); +print "(", $module->getKeyText() ,")\t", $module->stripText(), "\n"; #testing write interface $key->setText("John 3:16"); -$module->SetKey($key); +$module->setKey($key); $module->setEntry("This is a test entry! This tests the write abilities of the Sword Perl classes", 78); -print "(", $module->KeyText() ,")\t", $module->StripText(), "\n"; +print "(", $module->getKeyText() ,")\t", $module->stripText(), "\n"; print "Searching for God: "; $list = $module->doSearch("God"); -print $list->Count(), " entries found!\n"; +print $list->getCount(), " entries found!\n"; #for ( $i = 0; $i < $list->Count(); $i++) { # print "(", $i, ")\t", $list->GetElement()->getText(), "\n"; # $list->next(); @@ -106,22 +106,22 @@ $newmod = new Sword::zText("ldmod/"); print "Created module;\n"; -$newkey = $newmod->CreateKey(); +$newkey = $newmod->createKey(); #$newkey->setPersist(1); $newkey->setText(" "); -$module->SetKey($newkey); +$module->setKey($newkey); print "Loop! \n"; -for ($i = 0; $i < $list->Count(); $i++) { - print $list->GetElement()->getText() . "\n"; +for ($i = 0; $i < $list->getCount(); $i++) { + print $list->getElement()->getText() . "\n"; - $key->setText($list->GetElement()->getText()); - $newkey->setText($list->GetElement()->getText()); + $key->setText($list->getElement()->getText()); + $newkey->setText($list->getElement()->getText()); - $newmod->SetKey($newkey); + $newmod->setKey($newkey); - $entry = $module->StripText(); + $entry = $module->stripText(); $newmod->setEntry( $entry, length $entry ); $list->increment(); } diff --git a/bindings/swig/versekey.i b/bindings/swig/versekey.i index b396c5a..539989d 100644 --- a/bindings/swig/versekey.i +++ b/bindings/swig/versekey.i @@ -1,6 +1,6 @@ %{ #include "versekey.h" -#include "versemgr.h" +#include "versificationmgr.h" %} @@ -12,6 +12,7 @@ %ignore sword::VerseKey::builtin_books; %ignore sword::VerseKey::BMAX; %ignore sword::VerseKey::books; +%ignore sword::VerseKey::VerseKey(SWKey const &); %immutable sword::VerseKey::builtin_abbrevs; %immutable sword::sbook::name; @@ -19,7 +20,7 @@ %immutable sword::abbrev::ab; %include "versekey.h" -%include "versemgr.h" +%include "versificationmgr.h" %extend sword::abbrev { int getAbbrevCount() { @@ -66,7 +67,7 @@ const int getBookCount(){ - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); return system->getBookCount(); @@ -86,7 +87,7 @@ return 0; } - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); @@ -94,7 +95,7 @@ (testament == 2) ? self->BMAX[0] : 0 ); - const sword::VerseMgr::Book* b = system->getBook(book_num); + const sword::VersificationMgr::Book* b = system->getBook(book_num); if(!b) { fprintf(stderr, "b is null for %d?!?\n", book_num); return 0; @@ -105,14 +106,14 @@ }; int getBookNumberByOSISName( const char* bookname ) { - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); return system->getBookNumberByOSISName(bookname); } const char* getOSISBookName( const int book ) { - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); if ( (book < 0) || (book >= system->getBookCount())) @@ -135,7 +136,7 @@ return 0; } - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); @@ -143,7 +144,7 @@ (testament == 2) ? self->BMAX[0] : 0 ); - const sword::VerseMgr::Book* b = system->getBook(book_num); + const sword::VersificationMgr::Book* b = system->getBook(book_num); if(!b) { fprintf(stderr, "b is null for %d?!?\n", book_num); return 0; @@ -164,7 +165,7 @@ return 0; } - const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem( + const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem( self->getVersificationSystem() ); @@ -172,7 +173,7 @@ (testament == 2) ? self->BMAX[0] : 0 ); - const sword::VerseMgr::Book* b = system->getBook(book_num); + const sword::VersificationMgr::Book* b = system->getBook(book_num); if(!b) { fprintf(stderr, "b is null for %d?!?\n", book_num); return 0; diff --git a/bindings/swig/vstudio/libsword_csharpsword.vcproj b/bindings/swig/vstudio/libsword_csharpsword.vcproj index 20aedf7..4d69c39 100644 --- a/bindings/swig/vstudio/libsword_csharpsword.vcproj +++ b/bindings/swig/vstudio/libsword_csharpsword.vcproj @@ -571,14 +571,6 @@ RelativePath="..\..\..\include\papyriplain.h" > - - - - @@ -759,10 +751,6 @@ RelativePath="..\..\..\include\swtext.h" > - - diff --git a/buildtest.cpp b/buildtest.cpp index 5285dd7..010d1a6 100644 --- a/buildtest.cpp +++ b/buildtest.cpp @@ -1,10 +1,12 @@ /****************************************************************************** - * This is a dumby program which does nothing useful but links to the - * SWORD engine to confirm basic things were built ok. * - * $Id: buildtest.cpp 2327 2009-04-22 11:42:33Z scribe $ + * buildtest.cpp - This is a dumby program which does nothing useful but + * links to the SWORD engine to confirm basic things were + * built ok. * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: buildtest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -50,13 +52,13 @@ int main(int argc, char **argv) if (argc > 3) - mykey.AutoNormalize(0); // Turn off autonormalize if 3 args to allow for intros + mykey.setAutoNormalize(false); // Turn off autonormalize if 3 args to allow for intros // This is kludgy but at lease you can try it // with something like: sword "Matthew 1:0" 1 1 mykey = (argc < 2) ? "James 1:19" : argv[1]; - mykey.Persist(1); + mykey.setPersist(true); text.setKey(mykey); commentary.setKey(mykey); @@ -69,10 +71,10 @@ int main(int argc, char **argv) for (loop = 0; loop < max; loop++) { cout << (SWKey &)text << ":\n"; - text.Display(); + text.display(); cout << "\n"; cout << "-------------\n"; - commentary.Display(); + commentary.display(); cout << "\n"; cout << "==========================\n"; mykey++; diff --git a/cmake/FindCLucene.cmake b/cmake/FindCLucene.cmake index c5a6450..00d2055 100644 --- a/cmake/FindCLucene.cmake +++ b/cmake/FindCLucene.cmake @@ -62,18 +62,11 @@ SET(TRIAL_INCLUDE_PATHS FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY NAMES clucene clucene-core PATHS ${TRIAL_LIBRARY_PATHS}) -IF (CLUCENE_LIBRARY) - MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}") -ENDIF (CLUCENE_LIBRARY) FIND_PATH(CLUCENE_INCLUDE_DIR NAMES CLucene.h PATHS ${TRIAL_INCLUDE_PATHS} ONLY_CMAKE_FIND_ROOT_PATH) -IF (CLUCENE_INCLUDE_DIR) - MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}") -ENDIF (CLUCENE_INCLUDE_DIR) - IF(WIN32) SET(TRIAL_LIBRARY_PATHS ${CLUCENE_INCLUDE_DIR}) ENDIF(WIN32) @@ -83,22 +76,29 @@ SET(CLUCENE_GOOD_VERSION TRUE) FIND_PATH(CLUCENE_LIBRARY_DIR NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH) IF (CLUCENE_LIBRARY_DIR) - MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}") + SET(CLUCENE_INCLUDE_DIR ${CLUCENE_INCLUDE_DIR} ${CLUCENE_LIBRARY_DIR}) + #MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}") FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT) STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT}) IF (CLMATCH) STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH}) - IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}") - MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}") + IF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}") + MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}") SET(CLUCENE_GOOD_VERSION FALSE) - ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}") - IF (CLUCENE_VERSION STREQUAL "0.9.17") - MESSAGE(ERROR "CLucene version 0.9.17 is not supported.") + ENDIF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}") + IF (CLUCENE_VERSION STREQUAL "0.9.17") + MESSAGE(ERROR "CLucene version 0.9.17 is not supported.") SET(CLUCENE_GOOD_VERSION FALSE) - ENDIF (CLUCENE_VERSION STREQUAL "0.9.17") + ENDIF (CLUCENE_VERSION STREQUAL "0.9.17") + IF (CLUCENE_VERSION VERSION_GREATER "2.0") + MESSAGE (STATUS "Found CLucene 2, enabling compatibility mode") + SET(CLUCENE2 TRUE) + ELSE (CLUCENE_VERSION VERSION_GREATER "2.0") + SET(CLUCENE2 FALSE) + ENDIF (CLUCENE_VERSION VERSION_GREATER "2.0") ENDIF (CLMATCH) ELSE (CLUCENE_LIBRARY_DIR) - MESSAGE(STATUS "CLucene library dir not found.") + #MESSAGE(STATUS "CLucene library dir not found.") ENDIF (CLUCENE_LIBRARY_DIR) IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION) @@ -107,11 +107,11 @@ ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCEN IF(CLucene_FOUND) IF(NOT CLucene_FIND_QUIETLY) - MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}") + MESSAGE(STATUS "CLucene: Yes ${CLUCENE_LIBRARY}") ENDIF(NOT CLucene_FIND_QUIETLY) ELSE(CLucene_FOUND) IF(CLucene_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find CLucene.") + MESSAGE(FATAL_ERROR "CLucene: No") ENDIF(CLucene_FIND_REQUIRED) ENDIF(CLucene_FOUND) diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake index 7b84bed..9dff9f3 100644 --- a/cmake/FindICU.cmake +++ b/cmake/FindICU.cmake @@ -9,66 +9,19 @@ # ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation # (note: in addition to ICU_LIBRARIES) -# Our first goal is to find the icu-config script, if possible -find_program( - ICU_CONFIG_BIN - icu-config -) -find_program( - ICU_GENRB - genrb -) - -if(ICU_CONFIG_BIN) - MESSAGE(STATUS "icu-config found at ${ICU_CONFIG_BIN}: Using that for configuration") - MESSAGE(STATUS "genrb found at ${ICU_GENRB}: Using that for generating transliteration data") - - # Get include directories - execute_process(COMMAND "${ICU_CONFIG_BIN}" "--cppflags" - OUTPUT_VARIABLE ICU_INCLUDE_DIR - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - # Sanitize output - string(REPLACE "-I" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR}) - string(REGEX REPLACE "^[ ]+" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR}) - - # Try to get the Libraries we need - execute_process(COMMAND "${ICU_CONFIG_BIN}" "--ldflags" - OUTPUT_VARIABLE ICU_LIBRARY_RAW - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - execute_process(COMMAND "${ICU_CONFIG_BIN}" "--ldflags-icuio" - OUTPUT_VARIABLE ICU_LIBRARY_IO_RAW - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - string(REGEX REPLACE "^[ ]+" "" ICU_LIBRARY ${ICU_LIBRARY_RAW}) - string(REGEX REPLACE "^[ ]+" "" ICU_LIBRARY_IO ${ICU_LIBRARY_IO_RAW}) - # Combine them - set(ICU_LIBRARY "${ICU_LIBRARY} ${ICU_LIBRARY_IO_RAW}") - - # Get the version - execute_process(COMMAND "${ICU_CONFIG_BIN}" "--version" - OUTPUT_VARIABLE ICU_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) -else(ICU_CONFIG_BIN) - - # Look for the header file. - find_path( - ICU_INCLUDE_DIR - NAMES unicode/utypes.h - DOC "Include directory for the ICU library") - mark_as_advanced(ICU_INCLUDE_DIR) - - # Look for the library. - find_library( - ICU_LIBRARY - NAMES icuuc cygicuuc cygicuuc32 - DOC "Libraries to link against for the common parts of ICU") - mark_as_advanced(ICU_LIBRARY) -endif(ICU_CONFIG_BIN) +# Look for the header file. +find_path( + ICU_INCLUDE_DIR + NAMES unicode/utypes.h + DOC "Include directory for the ICU library") +mark_as_advanced(ICU_INCLUDE_DIR) + +# Look for the library. +find_library( + ICU_LIBRARY + NAMES icuuc cygicuuc cygicuuc32 + DOC "Libraries to link against for the common parts of ICU") +mark_as_advanced(ICU_LIBRARY) # Copy the results to the output variables. if(ICU_INCLUDE_DIR AND ICU_LIBRARY) diff --git a/cmake/FindRegex.cmake b/cmake/FindRegex.cmake index 8973d8d..cd04ec9 100644 --- a/cmake/FindRegex.cmake +++ b/cmake/FindRegex.cmake @@ -27,8 +27,14 @@ IF(NOT REGEX_INCLUDE_DIR) ) ENDIF(NOT REGEX_INCLUDE_DIR) +FIND_LIBRARY(REGEX_LIBRARY + NAMES regex gnurx) + IF(REGEX_INCLUDE_DIR) SET(REGEX_FOUND 1) + MESSAGE(STATUS "System regex.h: Yes") +ELSE(REGEX_INCLUDE_DIR) + MESSAGE(STATUS "System regex.h: No") ENDIF(REGEX_INCLUDE_DIR) MARK_AS_ADVANCED( diff --git a/cmake/bindings.cmake b/cmake/bindings.cmake deleted file mode 100644 index 8704390..0000000 --- a/cmake/bindings.cmake +++ /dev/null @@ -1,135 +0,0 @@ -##################################################################################################### -# -# A system to, hopefully, build the Sword bindings which are asked for. Currently I only know and -# therefore only support Python & Perl bindings. YMMV for it, please submit patches or suggestions. -# I will try to get them integrated into the system if I can. If there are bindings that you need -# other than the Python|Perl/Swig bindings, then you should probably speak up now. - -##################################################################################################### -# SWIG -# We need to find the SWIG executable in order to be able to do this, right? -FIND_PACKAGE(SWIG) - -IF(NOT SWIG_FOUND) - MESSAGE(FATAL_ERROR "Swig not found. Bindings will not be built.") -ELSE(NOT SWIG_FOUND) - MESSAGE(STATUS "Swig found at ${SWIG_EXECUTABLE}") - - SET(SWORD_SWIG_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/bindings/swig") - SET(SWORD_SWIG_BINARY "${CMAKE_CURRENT_BINARY_DIR}/bindings/swig") - - # This code that is commented out is basically how CMake suggests that you do it. I, on the - # other hand, can't seem to get it to do that. The manual seems to work though, so go with that - # instead. - #INCLUDE(${SWIG_USE_FILE}) - - #FIND_PACKAGE(PythonLibs) - #INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) - #INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/bindings/swig) - - #SET(CMAKE_SWIG_FLAGS "") - - #SET_SOURCE_FILES_PROPERTIES(sword.i PROPERTIES CPLUSPLUS ON) - #SET_SOURCE_FILES_PROPERTIES(sword.i PROPERTIES SWIG_FLAGS "-shadow") - - #SWIG_ADD_MODULE(sword python - # "${CMAKE_CURRENT_SOURCE_DIR}/bindings/swig/sword.i" - #"${CMAKE_CURRENT_SOURCE_DIR}/bindings/swig/python/Sword.cxx" - # ) - #SWIG_LINK_LIBRARIES(sword ${PYTHON_LIBRARIES}) - - # Borrowed this from the CMake UseSWIG.cmake file - GET_DIRECTORY_PROPERTY(cmake_include_directories INCLUDE_DIRECTORIES) - SET(SWIG_INCLUDES) - FOREACH(direct ${cmake_include_directories}) - SET(SWIG_INCLUDES ${SWIG_INCLUDES} "-I${direct}") - ENDFOREACH(direct ${cmake_include_directories}) -# MESSAGE(STATUS "${SWIG_INCLUDES} include directories") - - IF(SWORD_BINDINGS MATCHES ".*Python.*") - # This should add the pythonswig target to be built when the "make" command is executed - ADD_CUSTOM_TARGET(pythonswig ALL - mkdir -p "${SWORD_SWIG_BINARY}/python" - COMMAND ${SWIG_EXECUTABLE} "-w503,+509" -python -c++ -shadow -o "${SWORD_SWIG_BINARY}/python/Sword.cxx" "-I${SWORD_SWIG_SOURCE}" ${SWIG_INCLUDES} "${SWORD_SWIG_SOURCE}/sword.i" - COMMAND echo "#! /usr/bin/python" > ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo "" >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo "from distutils.core import setup, Extension" >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo "setup (name = \"sword\"," >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo " version = \"${SWORD_VERSION}\"," >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo " maintainer = \"Sword Developers\"," >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo " maintainer_email = \"sword-devel@crosswire.org\"," >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo " url = \"http://www.crosswire.org/sword\"," >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo " py_modules = [\"Sword\"]," >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo " include_dirs=['${SWORD_SWIG_SOURCE}', '${CMAKE_CURRENT_SOURCE_DIR}/include', '${SWORD_SWIG_SOURCE}/..', '${SWORD_SWIG_SOURCE}/../..']," >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo " ext_modules = [Extension(\"_Sword\", [\"Sword.cxx\"]," >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo " libraries=[('sword')], " >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo " library_dirs=[('${CMAKE_CURRENT_BINARY_DIR}')], " >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo " )], " >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo ")" >> ${SWORD_SWIG_BINARY}/python/setup.py - COMMAND echo "Python bindings built, to install change into ${SWORD_SWIG_BINARY}/python and type 'python setup.py install'" - DEPENDS sword - WORKING_DIRECTORY "${SWORD_SWIG_SOURCE}" - VERBATIM - ) - - MESSAGE(STATUS "Configured for building Python bindings.") - ENDIF(SWORD_BINDINGS MATCHES ".*Python.*") - - IF(SWORD_BINDINGS MATCHES ".*Perl.*") - FIND_PACKAGE(Perl REQUIRED) - IF(PERL_FOUND) - # This is a terrible hack. Don't leave it stay here. It's ugly - SET(LIB_SWORD "${CMAKE_CURRENT_BINARY_DIR}/libsword.a") -# MESSAGE(STATUS "LIB_SWORD is ${LIB_SWORD}") - # This should add the perlswig target to be build with the "make" command is executed - ADD_CUSTOM_TARGET(perlswig ALL - mkdir -p "${SWORD_SWIG_BINARY}/perl" - COMMAND ${SWIG_EXECUTABLE} "-w503,+509" -perl -c++ -shadow -o "${SWORD_SWIG_BINARY}/perl/Sword.cxx" "-I${SWORD_SWIG_SOURCE}" ${SWIG_INCLUDES} "${SWORD_SWIG_SOURCE}/sword.i" - COMMAND echo "Writing ${SWORD_SWIG_BINARY}/perl/Makefile.PL" - COMMAND echo "#! /usr/bin/perl" > ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "use ExtUtils::MakeMaker;" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "# See lib/ExtUtils/MakeMaker.pm for details of how to influence" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "# the contents of the Makefile that is written." >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "WriteMakefile(" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " 'NAME' => 'Sword'," >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " 'VERSION' => '${SWORD_VERSION}'," >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " 'INC' => '-I${CMAKE_CURRENT_SOURCE_DIR}/include -I${SWORD_SWIG_SOURCE}'," >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " 'DEFINE' => '-DSWIG'," >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " 'LIBS' => '-lsword -lz'," >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " ($] >= 5.005 ? ## Add these new keywords supported since 5.005" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " (ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " AUTHOR => 'Sword Project ') : ())," >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo ");" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "rename 'Makefile', 'Makefile.old' or die \"can't rename Makefile\";" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "open(INPUT, '> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "open(OUTPUT, '>Makefile') or die \"can't open output Makefile\";" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "while () {" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " s/\\-lsword/\\-lsword \\-lstdc\\+\\+/;" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo " print OUTPUT \"$_\";" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "}" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "close INPUT;" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND echo "close OUTPUT;" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL - COMMAND cd ${SWORD_SWIG_BINARY}/perl && ${PERL_EXECUTABLE} Makefile.PL && make clean - COMMAND echo "\\.old" > ${SWORD_SWIG_BINARY}/perl/MANIFEST.SKIP - COMMAND echo "~$" >> ${SWORD_SWIG_BINARY}/perl/MANIFEST.SKIP - COMMAND echo "\\.bak" >> ${SWORD_SWIG_BINARY}/perl/MANIFEST.SKIP - COMMAND echo "^CVS" >> ${SWORD_SWIG_BINARY}/perl/MANIFEST.SKIP - COMMAND echo "Makefile$" >> ${SWORD_SWIG_BINARY}/perl/MANIFEST.SKIP - COMMAND cd ${SWORD_SWIG_BINARY}/perl && ${PERL_EXECUTABLE} Makefile.PL && make manifest - COMMAND echo "Perl bindings built, to install change into ${SWORD_SWIG_BINARY}/perl and type 'make install'" - DEPENDS sword - WORKING_DIRECTORY "${SWORD_SWIG_SOURCE}" - VERBATIM - ) - - MESSAGE(STATUS "Configured for building Perl bindings.") - ELSE(PERL_FOUND) - MESSAGE(FATAL_ERROR "Perl not found. Can't create perl bindings without Perl to bind") - ENDIF(PERL_FOUND) - ENDIF(SWORD_BINDINGS MATCHES ".*Perl.*") -ENDIF(NOT SWIG_FOUND) diff --git a/cmake/build-debug.sh b/cmake/build-debug.sh new file mode 100755 index 0000000..16c6669 --- /dev/null +++ b/cmake/build-debug.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# +# A sample script showing how to build most of the options available to this system. +# Invoke it from the top directory of SWORD by calling $ cmake/build-debug.sh +# + +mkdir -p build +cd build +# Configure with Python and Perl bindings, examples, tests and a debug build into +# a shared library +cmake -DSWORD_BINDINGS="Python Perl" \ + -DSWORD_BUILD_EXAMPLES="Yes" \ + -DSWORD_BUILD_TESTS="Yes" \ + -DLIBSWORD_LIBRARY_TYPE="Shared" \ + -DCMAKE_BUILD_TYPE="Debug" .. \ + -DCMAKE_INSTALL_PREFIX="~/" +make -j10 +cd .. + +echo "Now the library has been built, along with the Perl and Python bindings. \ +Both will be installed to the the user's home directory if you are building \ +under Linux or a similar Unix-like environment if you execute the command \ +'make install' from the build directory with privileges to write into the \ +~/ directory." diff --git a/cmake/build-release.sh b/cmake/build-release.sh new file mode 100755 index 0000000..f278c9f --- /dev/null +++ b/cmake/build-release.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# +# A sample script showing how to build most of the options available to this system. +# Invoke it from the top directory of SWORD by calling $ cmake/build-release.sh +# + +mkdir -p build +cd build +# Configure with Python and Perl bindings, examples, tests and a debug build into +# a shared library, plus static option as well. They will be installed to the +# /opt/sword directory +cmake -DSWORD_BINDINGS="Python Perl" \ + -DSWORD_BUILD_EXAMPLES="Yes" \ + -DSWORD_BUILD_TESTS="Yes" \ + -DLIBSWORD_LIBRARY_TYPE="Shared Static" \ + -DCMAKE_BUILD_TYPE="Release" \ + -DCMAKE_INSTALL_PREFIX="/opt/sword" .. +make -j10 +cd .. + +echo "Now the library has been built, along with the Perl and Python bindings. \ +If you now execute 'make install' from the build directory you will \ +install the library to /opt/sword if you have privileges to write there \ +with the account you execute the install from." diff --git a/cmake/install.cmake b/cmake/install.cmake index a34381d..fd79545 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -1,44 +1,37 @@ ##################################################################### # First, install the library itself # -IF(NOT CMAKE_INSTALL_PREFIX) - IF(APPLE) - SET(SWORD_INSTALL_DIR "/opt/local") - ELSEIF(MSVC) - SET(SWORD_INSTALL_DIR "C:\\Program Files (x86)\\libsword\\") - ELSE(APPLE) - SET(SWORD_INSTALL_DIR "/usr/local") - ENDIF(APPLE) -ELSE(NOT CMAKE_INSTALL_PREFIX) - SET(SWORD_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}) -ENDIF(NOT CMAKE_INSTALL_PREFIX) +MESSAGE(STATUS "\n-- CONFIGURING INSTALLATION DESTINATIONS") +# Configuration files, of course +SET(prefix "${PREFIX}") +SET(exec_prefix "${PREFIX}") +SET(libdir "${LIBDIR}") +SET(includedir "${INCLUDEDIR}") # Install the library IF(BUILDING_SHARED) INSTALL(TARGETS sword - DESTINATION ${SWORD_INSTALL_DIR}/lib) + DESTINATION "${LIBDIR}") ENDIF(BUILDING_SHARED) IF(BUILDING_STATIC) INSTALL(TARGETS sword_static - DESTINATION ${SWORD_INSTALL_DIR}/lib) + DESTINATION "${LIBDIR}") ENDIF(BUILDING_STATIC) +# Install the locales +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/locales.d + DESTINATION "${PREFIX}/share/sword") # Install the headers INSTALL(FILES ${SWORD_INSTALL_HEADERS} - DESTINATION "${SWORD_INSTALL_DIR}/include/sword") + DESTINATION "${INCLUDEDIR}/sword") IF(SWORD_INTERNAL_REGEX) INSTALL(FILES ${INTERNAL_REGEX_HEADER} - DESTINATION "${SWORD_INSTALL_DIR}/include/sword") + DESTINATION "${INCLUDEDIR}/sword") ENDIF(SWORD_INTERNAL_REGEX) -MESSAGE(STATUS "Installation destination: ${SWORD_INSTALL_DIR}") +MESSAGE(STATUS "Destination: ${PREFIX}") -# Configuration files, of course -SET(prefix ${SWORD_INSTALL_DIR}) -SET(exec_prefix ${SWORD_INSTALL_DIR}) -SET(libdir ${SWORD_INSTALL_DIR}/lib) -SET(includedir ${SWORD_INSTALL_DIR}/include) SET(VERSION ${SWORD_VERSION}) IF(WITH_CURL) SET(CURL_LIBS ${CURL_LIBRARY}) @@ -57,35 +50,7 @@ ELSE(LIBSWORD_LIBRARY_TYPE STREQUAL "Static") ENDIF(LIBSWORD_LIBRARY_TYPE STREQUAL "Static") # The @ONLY restricts it because our ${variable} which are left there as part of pkg-config CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/sword.pc.in ${CMAKE_CURRENT_BINARY_DIR}/sword.pc @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/sword.pc - DESTINATION "${SWORD_INSTALL_DIR}/lib/pkgconfig") +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/swversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/swversion.h @ONLY) -# Need to build/install the -IF(WITH_ICU AND ICU_GENRB) - ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}") - FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu") - FOREACH(translit ${translit_SOURCES}) - STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit}) - # Only needs to be run once, really, so we'll hook it to the end of either - IF(BUILDING_SHARED) - ADD_CUSTOM_COMMAND(TARGET sword - POST_BUILD - COMMAND ${ICU_GENRB} -s . -d "${CMAKE_CURRENT_BINARY_DIR}/icu" ${translit} - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/icu" - COMMENT "Converting ${translit}" - VERBATIM - ) - ELSE(BUILDING_SHARED) - ADD_CUSTOM_COMMAND(TARGET sword_static - POST_BUILD - COMMAND ${ICU_GENRB} -s . -d "${CMAKE_CURRENT_BINARY_DIR}/icu" ${translit} - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/icu" - COMMENT "Converting ${translit}" - VERBATIM - ) - ENDIF(BUILDING_SHARED) - - INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}" - DESTINATION "${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}") - ENDFOREACH(translit ${translit_SOURCES}) -ENDIF(WITH_ICU AND ICU_GENRB) \ No newline at end of file +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/sword.pc + DESTINATION "${LIBDIR}/pkgconfig") diff --git a/cmake/muxsources.cmake b/cmake/muxsources.cmake index 423dd2c..cf60af6 100644 --- a/cmake/muxsources.cmake +++ b/cmake/muxsources.cmake @@ -10,73 +10,74 @@ SET(sword_SOURCES ${sword_base_SOURCES}) # a ZLIB at all, and allowing a user to disable it does not bring about use # of some internal fall-back but just leaves the ability to read ZLIB files # out of the library altogether +MESSAGE(STATUS "\n-- CONFIGURING SOURCE LIST") IF(SWORD_NO_ZLIB STREQUAL "Yes") - MESSAGE(STATUS "ZLib support excluded") + MESSAGE(STATUS "ZLib: excluded by use option") ADD_DEFINITIONS(-DEXCLUDEZLIB) SET(WITH_ZLIB 0) ELSE(SWORD_NO_ZLIB STREQUAL "Yes") SET(sword_SOURCES ${sword_SOURCES} ${sword_zlib_used_SOURCES}) IF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes") - MESSAGE(STATUS "No system ZLib found or user forcing internal") + MESSAGE(STATUS "ZLib: internal") SET(sword_SOURCES ${sword_SOURCES} ${sword_zlib_nofound_SOURCES}) SET(WITH_INTERNAL_ZLIB 1) ELSE(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes") - MESSAGE(STATUS "Using system ZLib: ${ZLIB_LIBRARY}") + MESSAGE(STATUS "ZLib: system ${ZLIB_LIBRARY}") SET(WITH_ZLIB 1) ENDIF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes") ENDIF(SWORD_NO_ZLIB STREQUAL "Yes") -# Check for if we've found ICU +# Check for if we've found cURL IF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes") - MESSAGE(STATUS "cURL found , using ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}") + MESSAGE(STATUS "cURL: system ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}") ADD_DEFINITIONS(-DCURLAVAILABLE) SET(sword_SOURCES ${sword_SOURCES} ${sword_curl_found_SOURCES}) SET(WITH_CURL 1) ELSE(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes") - MESSAGE(STATUS "cURL not found or being ignored") + MESSAGE(STATUS "cURL: no") SET(sword_SOURCES ${sword_SOURCES} ${sword_curl_nofound_SOURCES}) SET(WITH_CURL 0) ENDIF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes") # And for CLucene IF(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes") - MESSAGE(STATUS "CLucene found, using ${CLUCENE_LIBRARY} in ${CLUCENE_LIBRARY_DIR} and ${CLUCENE_INCLUDE_DIR}") + MESSAGE(STATUS "CLucene: yes ${CLUCENE_LIBRARY} in ${CLUCENE_LIBRARY_DIR} and ${CLUCENE_INCLUDE_DIR}") SET(sword_SOURCES ${sword_SOURCES} ${sword_clucene_found_SOURCES}) SET(WITH_CLUCENE 1) ELSE(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes") - MESSAGE(STATUS "CLucene not found or being ignored") + MESSAGE(STATUS "CLucene: no") SET(sword_SOURCES ${sword_SOURCES} ${sword_clucene_nofound_SOURCES}) SET(WITH_CLUCENE 0) ENDIF(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes") # Alert the user if PkgConfig is unavailalbe IF(NOT PKG_CONFIG_FOUND) - MESSAGE(STATUS "PkgConfig not found on the system. Proceeding without it.") + MESSAGE(STATUS "PkgConfig: no") SET(WITH_PKG_CONFIG 1) ELSE(NOT PKG_CONFIG_FOUND) - MESSAGE(STATUS "PkgConfig found. Using.") + MESSAGE(STATUS "PkgConfig: yes") SET(WITH_PKG_CONFIG 0) ENDIF(NOT PKG_CONFIG_FOUND) # ICU needs some lovin' too IF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No") - MESSAGE(STATUS "ICU Found, using ${ICU_LIBRARY} and ${ICU_INCLUDE_DIRS}") + MESSAGE(STATUS "ICU: yes ${ICU_LIBRARY} and ${ICU_INCLUDE_DIRS}") ADD_DEFINITIONS(-D_ICU_) SET(sword_SOURCES ${sword_SOURCES} ${sword_icu_found_SOURCES}) SET(WITH_ICU 1) ELSE(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No") - MESSAGE(STATUS "ICU not found or ignored.") + MESSAGE(STATUS "ICU: no") SET(WITH_ICU 0) ENDIF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No") # Internal or external regex.h IF(REGEX_FOUND) - MESSAGE(STATUS "System Regex found: ${REGEX_INCLUDE_DIR}") + MESSAGE(STATUS "Regex.h: system ${REGEX_INCLUDE_DIR}") INCLUDE_DIRECTORIES(${REGEX_INCLUDE_DIR}) SET(sword_SOURCES ${sword_SOURCES} ${sword_external_regex_SOURCES}) SET(WITH_REGEX 1) ELSE(REGEX_FOUND) - MESSAGE(STATUS "Using internal regex") + MESSAGE(STATUS "Regex.h: internal") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include/internal/regex) SET(sword_SOURCES ${sword_SOURCES} ${sword_internal_regex_SOURCES}) SET(WITH_REGEX 0) diff --git a/cmake/options.cmake b/cmake/options.cmake new file mode 100644 index 0000000..3e07128 --- /dev/null +++ b/cmake/options.cmake @@ -0,0 +1,52 @@ +# A list of the options that the library supports +SET(SWORD_PYTHON_INSTALL_DIR "" CACHE STRING "Directory where the Python bindings will be installed. Defaults to default Python path.") + +# Installation options +IF(APPLE) + SET(SWORD_INSTALL_DIR "/opt/local") +ELSEIF(MSVC) + SET(SWORD_INSTALL_DIR "C:\\Program Files (x86)\\libsword\\") +ELSE(APPLE) + SET(SWORD_INSTALL_DIR "/usr/local") +ENDIF(APPLE) + +IF(CMAKE_INSTALL_PREFIX) + SET(PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Directory into which to install architecture-dependent files. Defaults to ${SWORD_INSTALL_DIR}.") +ELSE(CMAKE_INSTALL_PREFIX) + SET(PREFIX "${SWORD_INSTALL_DIR}" CACHE STRING "Directory into which to install architecture-dependent files. Defaults to ${SWORD_INSTALL_DIR}") +ENDIF(CMAKE_INSTALL_PREFIX) + +SET(LIBDIR "${PREFIX}/lib" CACHE STRING "Object code library install directory. Defaults to ${SWORD_INSTALL_DIR}/lib") + +SET(INCLUDEDIR "${PREFIX}/include" CACHE STRING "C Header files install directory. Defaults to ${SWORD_INSTALL_DIR}/include.") + +SET(BINDIR "${PREFIX}/bin" CACHE STRING "Directory to install binary executable files. Defaults to ${SWORD_INSTALL_DIR}/bin.") + +# Post-processing of variables +MACRO(PROCESS_VERSION LEVEL VALUE) + SET(SWORD_VERSION_${LEVEL} ${VALUE}) + IF(${VALUE} LESS 10) + SET(${LEVEL} "00${VALUE}") + ELSEIF(${VALUE} LESS 100) + SET(${LEVEL} "0${VALUE}") + ELSE() + SET(${LEVEL} "${VALUE}") + ENDIF() +ENDMACRO() + +STRING(REGEX MATCHALL "^([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.?([0-9]+)?$" + SWORD_VERSION_PARTS "${SWORD_VERSION}") +# We don't always have a nano version +IF("${CMAKE_MATCH_4}" STREQUAL "") + SET(CMAKE_MATCH_4 "0") +ENDIF("${CMAKE_MATCH_4}" STREQUAL "") + +SET(SWORD_VERSION_MAJOR ${CMAKE_MATCH_1}) # No post-processing on this, so it's not octal +PROCESS_VERSION("MINOR" ${CMAKE_MATCH_2}) +PROCESS_VERSION("MICRO" ${CMAKE_MATCH_3}) +PROCESS_VERSION("NANO" ${CMAKE_MATCH_4}) + +SET(SWORD_VERSION_STR "${SWORD_VERSION}") +SET(SWORD_VERSION_NUM "${SWORD_VERSION_MAJOR}${MINOR}${MICRO}${NANO}") + +MESSAGE(STATUS "SWORD Version ${SWORD_VERSION_NUM}") diff --git a/cmake/sources.cmake b/cmake/sources.cmake index 0465509..1be2264 100644 --- a/cmake/sources.cmake +++ b/cmake/sources.cmake @@ -29,8 +29,8 @@ SET(sword_base_mgr_SOURCES src/mgr/encfiltmgr.cpp src/mgr/markupfiltmgr.cpp src/mgr/filemgr.cpp - src/mgr/versemgr.cpp - src/mgr/ftptrans.cpp + src/mgr/versificationmgr.cpp + src/mgr/remotetrans.cpp src/mgr/swlocale.cpp src/mgr/localemgr.cpp src/mgr/swcacher.cpp @@ -63,6 +63,7 @@ SET(sword_base_module_SOURCES src/modules/filters/swoptfilter.cpp src/modules/filters/gbfhtml.cpp + src/modules/filters/gbfxhtml.cpp src/modules/filters/gbfhtmlhref.cpp src/modules/filters/gbfwebif.cpp src/modules/filters/gbfplain.cpp @@ -84,12 +85,14 @@ SET(sword_base_module_SOURCES src/modules/filters/thmlgbf.cpp src/modules/filters/thmlrtf.cpp src/modules/filters/thmlhtml.cpp + src/modules/filters/thmlxhtml.cpp src/modules/filters/thmlhtmlhref.cpp src/modules/filters/thmlwebif.cpp src/modules/filters/thmlwordjs.cpp src/modules/filters/teiplain.cpp src/modules/filters/teirtf.cpp + src/modules/filters/teixhtml.cpp src/modules/filters/teihtmlhref.cpp src/modules/filters/gbfthml.cpp @@ -98,9 +101,13 @@ SET(sword_base_module_SOURCES src/modules/filters/thmlplain.cpp src/modules/filters/osisosis.cpp + src/modules/filters/osisenum.cpp + src/modules/filters/osisglosses.cpp + src/modules/filters/osisxlit.cpp src/modules/filters/osisheadings.cpp src/modules/filters/osisfootnotes.cpp src/modules/filters/osishtmlhref.cpp + src/modules/filters/osisxhtml.cpp src/modules/filters/osiswebif.cpp src/modules/filters/osismorph.cpp src/modules/filters/osisstrongs.cpp @@ -112,7 +119,7 @@ SET(sword_base_module_SOURCES src/modules/filters/osisvariants.cpp src/modules/filters/osiswordjs.cpp src/modules/filters/osismorphsegmentation.cpp - src/modules/filters/osisruby.cpp + src/modules/filters/osisreferencelinks.cpp src/modules/filters/latin1utf8.cpp src/modules/filters/latin1utf16.cpp @@ -120,6 +127,8 @@ SET(sword_base_module_SOURCES src/modules/filters/utf16utf8.cpp src/modules/filters/utf8html.cpp src/modules/filters/utf8latin1.cpp + src/modules/filters/unicodertf.cpp + src/modules/filters/scsuutf8.cpp src/modules/filters/utf8cantillation.cpp src/modules/filters/utf8hebrewpoints.cpp @@ -129,10 +138,7 @@ SET(sword_base_module_SOURCES src/modules/filters/cipherfil.cpp src/modules/filters/rtfhtml.cpp - src/modules/filters/plainfootnotes.cpp - src/modules/filters/plainhtml.cpp src/modules/filters/greeklexattribs.cpp - src/modules/filters/unicodertf.cpp src/modules/filters/papyriplain.cpp src/modules/genbook/swgenbook.cpp @@ -154,7 +160,6 @@ SET(sword_base_utilfns_SOURCES src/utilfuns/swobject.cpp src/utilfuns/utilstr.cpp src/utilfuns/utilxml.cpp - src/utilfuns/swunicod.cpp src/utilfuns/swversion.cpp src/utilfuns/swbuf.cpp src/utilfuns/ftpparse.c @@ -180,24 +185,26 @@ SET(sword_base_SOURCES # Sources relying on ZLib SET(sword_zlib_used_SOURCES src/modules/common/zipcomprs.cpp + src/modules/common/bz2comprs.cpp + src/modules/common/xzcomprs.cpp src/utilfuns/zlib/untgz.c ) SET(sword_zlib_nofound_SOURCES - src/utilfuns/zlib/gzio.c - src/utilfuns/zlib/zutil.c - src/utilfuns/zlib/uncompr.c - src/utilfuns/zlib/trees.c - src/utilfuns/zlib/maketree.c - src/utilfuns/zlib/infutil.c + src/utilfuns/zlib/adler32.c + src/utilfuns/zlib/compress.c + src/utilfuns/zlib/crc32.c + src/utilfuns/zlib/deflate.c + src/utilfuns/zlib/gzclose.c + src/utilfuns/zlib/gzlib.c + src/utilfuns/zlib/gzread.c + src/utilfuns/zlib/gzwrite.c + src/utilfuns/zlib/infback.c src/utilfuns/zlib/inftrees.c src/utilfuns/zlib/inflate.c src/utilfuns/zlib/inffast.c - src/utilfuns/zlib/infcodes.c - src/utilfuns/zlib/infblock.c - src/utilfuns/zlib/deflate.c - src/utilfuns/zlib/crc32.c - src/utilfuns/zlib/compress.c - src/utilfuns/zlib/adler32.c + src/utilfuns/zlib/trees.c + src/utilfuns/zlib/uncompr.c + src/utilfuns/zlib/zutil.c ) # Sources relying on cURL @@ -231,8 +238,6 @@ SET(sword_icu_found_SOURCES # Headers SET(SWORD_INSTALL_HEADERS - include/Greek2Greek.h - include/GreekChars.h include/canon.h include/canon_abbrevs.h include/cipherfil.h @@ -244,16 +249,17 @@ SET(SWORD_INSTALL_HEADERS include/entriesblk.h include/femain.h include/filemgr.h - include/versemgr.h + include/versificationmgr.h include/flatapi.h include/ftpparse.h - include/ftptrans.h + include/remotetrans.h include/ftplibftpt.h include/ftplib.h include/gbffootnotes.h include/gbfheadings.h include/gbfhtml.h + include/gbfxhtml.h include/gbfhtmlhref.h include/gbfwebif.h include/gbfmorph.h @@ -278,8 +284,12 @@ SET(SWORD_INSTALL_HEADERS include/multimapwdef.h include/nullim.h + include/osisenum.h + include/osisglosses.h + include/osisxlit.h include/osisheadings.h include/osishtmlhref.h + include/osisxhtml.h include/osiswebif.h include/osismorph.h include/osismorphsegmentation.h @@ -293,10 +303,9 @@ SET(SWORD_INSTALL_HEADERS include/osisscripref.h include/osiswordjs.h include/osisvariants.h + include/osisreferencelinks.h include/papyriplain.h - include/plainfootnotes.h - include/plainhtml.h include/rawcom.h include/rawfiles.h include/rawgenbook.h @@ -310,6 +319,7 @@ SET(SWORD_INSTALL_HEADERS include/roman.h include/rtfhtml.h include/sapphire.h + include/scsuutf8.h include/strkey.h include/swbasicfilter.h include/swbuf.h @@ -335,14 +345,14 @@ SET(SWORD_INSTALL_HEADERS include/swobject.h include/swsearchable.h include/swtext.h - include/swunicod.h - include/swversion.h + "${CMAKE_CURRENT_BINARY_DIR}/include/swversion.h" include/sysdata.h include/thmlfootnotes.h include/thmlgbf.h include/thmlheadings.h include/thmlhtml.h + include/thmlxhtml.h include/thmlhtmlhref.h include/thmlwebif.h include/thmllemma.h @@ -357,6 +367,7 @@ SET(SWORD_INSTALL_HEADERS include/teiplain.h include/teirtf.h + include/teixhtml.h include/teihtmlhref.h include/treekey.h @@ -400,21 +411,11 @@ SET(SWORD_INSTALL_HEADERS include/canon_german.h include/canon_luther.h include/canon_null.h + include/canon_lxx.h + include/canon_orthodox.h + include/canon_synodalprot.h ) SET(INTERNAL_REGEX_HEADER include/internal/regex/regex.h ) - -SET(translit_SOURCES - translit_Any_Latex.txt - translit_Any_Latin1.txt - translit_BETA_Greek.txt - translit_BGreek_Greek.txt - translit_CCAT_Hebrew.txt - translit_CCAT_Syriac.txt - translit_Latin_Coptic.txt - translit_Latin_Gothic.txt - translit_Latin_Ugaritic.txt - translit_swordindex.txt -) \ No newline at end of file diff --git a/cmake/toolchains/Toolchain-mingw32.cmake b/cmake/toolchains/Toolchain-mingw32.cmake new file mode 100644 index 0000000..0f7ed9e --- /dev/null +++ b/cmake/toolchains/Toolchain-mingw32.cmake @@ -0,0 +1,36 @@ +SET(MINGW32_ROOT "/usr/i686-pc-mingw32/sys-root/mingw") + +SET(CMAKE_SYSTEM_NAME Windows) + +# specify the cross compiler +SET(CMAKE_C_COMPILER /usr/bin/i686-pc-mingw32-gcc) +SET(CMAKE_CXX_COMPILER /usr/bin/i686-pc-mingw32-g++) + +# where is the target environment +SET(CMAKE_FIND_ROOT_PATH "${MINGW32_ROOT}" /usr/local/i686-pc-mingw32) + +# search for programs in the build host directories +SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +# for libraries and headers in the target directories +SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + +# FindQt4.cmake queries qmake to get information, +# which doesn't work when crosscompiling +SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include) +SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) + +# set the resource compiler (RHBZ #652435) +SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres) + +# override boost library suffix which defaults to -mgw +SET(Boost_COMPILER -gcc45) + +# Since ICU is all strange and smart and stuff, let's do this +SET(ICU_CONFIG_BIN_PATH "${MINGW32_ROOT}/bin/") +SET(ICU_CONFIG_OPTS "--noverify") + +INCLUDE_DIRECTORIES("${MINGW32_ROOT}/include/glib-2.0") +INCLUDE_DIRECTORIES("${MINGW32_ROOT}/lib/glib-2.0/include") + +SET(CROSS_COMPILE_MINGW32 TRUE) diff --git a/cmake/toolchains/Toolchain-mingw64-x64.cmake b/cmake/toolchains/Toolchain-mingw64-x64.cmake new file mode 100644 index 0000000..53a1bee --- /dev/null +++ b/cmake/toolchains/Toolchain-mingw64-x64.cmake @@ -0,0 +1,37 @@ +SET(MINGW32_ROOT "/usr/x86_64-w64-mingw32/sys-root/mingw") + +SET(CMAKE_SYSTEM_NAME Windows) + +# specify the cross compiler +SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc) +SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++) + +# where is the target environment +SET(CMAKE_FIND_ROOT_PATH "${MINGW32_ROOT}" /usr/local/x86_64-w64-mingw32) + +# search for programs in the build host directories +SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +# for libraries and headers in the target directories +SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + +# FindQt4.cmake queries qmake to get information, +# which doesn't work when crosscompiling +SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include) +SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) + +# set the resource compiler (RHBZ #652435) +SET(CMAKE_RC_COMPILER /usr/bin/x86_64-w64-mingw32-windres) + +# override boost library suffix which defaults to -mgw +SET(Boost_COMPILER -gcc45) + +# Since ICU is all strange and smart and stuff, let's do this +SET(ICU_CONFIG_BIN_PATH "${MINGW32_ROOT}/bin/") +SET(ICU_CONFIG_OPTS "--noverify") + +INCLUDE_DIRECTORIES("${MINGW32_ROOT}/include/glib-2.0") +INCLUDE_DIRECTORIES("${MINGW32_ROOT}/lib/glib-2.0/include") + +SET(CROSS_COMPILE_MINGW32 TRUE) + diff --git a/cmake/toolchains/Toolchain-mingw64-x86.cmake b/cmake/toolchains/Toolchain-mingw64-x86.cmake new file mode 100644 index 0000000..6c2ddbe --- /dev/null +++ b/cmake/toolchains/Toolchain-mingw64-x86.cmake @@ -0,0 +1,36 @@ +SET(MINGW32_ROOT "/usr/i686-w64-mingw32/sys-root/mingw") + +SET(CMAKE_SYSTEM_NAME Windows) + +# specify the cross compiler +SET(CMAKE_C_COMPILER /usr/bin/i686-w64-mingw32-gcc) +SET(CMAKE_CXX_COMPILER /usr/bin/i686-w64-mingw32-g++) + +# where is the target environment +SET(CMAKE_FIND_ROOT_PATH "${MINGW32_ROOT}" /usr/local/i686-w64-mingw32) + +# search for programs in the build host directories +SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +# for libraries and headers in the target directories +SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + +# FindQt4.cmake queries qmake to get information, +# which doesn't work when crosscompiling +SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include) +SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) + +# set the resource compiler (RHBZ #652435) +SET(CMAKE_RC_COMPILER /usr/bin/i686-w64-mingw32-windres) + +# override boost library suffix which defaults to -mgw +SET(Boost_COMPILER -gcc45) + +# Since ICU is all strange and smart and stuff, let's do this +SET(ICU_CONFIG_BIN_PATH "${MINGW32_ROOT}/bin/") +SET(ICU_CONFIG_OPTS "--noverify") + +INCLUDE_DIRECTORIES("${MINGW32_ROOT}/include/glib-2.0") +INCLUDE_DIRECTORIES("${MINGW32_ROOT}/lib/glib-2.0/include") + +SET(CROSS_COMPILE_MINGW32 TRUE) diff --git a/config.guess b/config.guess index dc84c68..b79252d 100755 --- a/config.guess +++ b/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ timestamp='2009-11-20' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -394,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +501,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +515,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +572,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +615,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +751,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +790,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,30 +809,35 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -848,15 +874,22 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,52 +899,56 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -930,51 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1032,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1068,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1096,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1137,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1181,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1210,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1178,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1204,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1230,7 +1284,10 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1275,13 +1332,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,11 +1356,11 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/config.sub b/config.sub index 2a55a50..c765b34 100755 --- a/config.sub +++ b/config.sub @@ -1,38 +1,31 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2013-04-24' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,8 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,13 +115,18 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -152,12 +149,12 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +170,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -221,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -245,20 +248,27 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,34 +286,45 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ - | nios | nios2 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +334,21 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,25 +363,30 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -363,29 +404,34 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ - | nios-* | nios2-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +456,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +526,20 @@ case $basic_machine in basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +571,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +729,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,9 +786,13 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -771,10 +829,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +905,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +993,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -933,7 +1006,7 @@ case $basic_machine in ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -948,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1017,6 +1094,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1153,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1224,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1324,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1281,20 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1413,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1462,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1426,15 +1498,14 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1528,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1543,20 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1576,11 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1509,6 +1589,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1527,7 +1610,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff --git a/configure b/configure index ecad737..4f8ab3e 100755 --- a/configure +++ b/configure @@ -1,21 +1,23 @@ #! /bin/sh # From configure.ac Revision: 1.45 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for sword 1.6.2. +# Generated by GNU Autoconf 2.69 for sword 1.7.2. # # Report bugs to . # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -23,23 +25,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -47,7 +41,13 @@ export as_nl as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -58,7 +58,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -81,13 +81,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -97,15 +90,16 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -117,12 +111,16 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -134,7 +132,302 @@ export LC_ALL LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: sword-bugs@crosswire.org about your system, including +$0: any error possibly output before this message. Then +$0: install a modern shell, or manually run the script +$0: under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -148,8 +441,12 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -169,566 +466,115 @@ $as_echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit } -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac -if as_func_ret_success; then - : +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file else - exitcode=1 - echo as_func_ret_success failed. + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' else - exitcode=1 - echo positional parameters were not saved. + test -d ./-p && rmdir ./-p + as_mkdir_p=false fi -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS +as_test_x='test -x' +as_executable_p=as_fn_executable_p +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -fi +SHELL=${CONFIG_SHELL-/bin/sh} -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac +test -n "$DJDIR" || exec 7<&0 &1 -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -$* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - - -exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` # # Initializations. @@ -741,14 +587,14 @@ cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='sword' PACKAGE_TARNAME='sword' -PACKAGE_VERSION='1.6.2' -PACKAGE_STRING='sword 1.6.2' +PACKAGE_VERSION='1.7.2' +PACKAGE_STRING='sword 1.7.2' PACKAGE_BUGREPORT='sword-bugs@crosswire.org' +PACKAGE_URL='http://crosswire.org/sword' ac_unique_file="sword.bmp" # Factoring default headers for most tests. @@ -805,8 +651,12 @@ USE_INTERNAL_REGEX_FALSE USE_INTERNAL_REGEX_TRUE INTERNALFTPLIB_FALSE INTERNALFTPLIB_TRUE +WITHCURLSFTP_FALSE +WITHCURLSFTP_TRUE WITHCURL_FALSE WITHCURL_TRUE +USECXX11REGEX_FALSE +USECXX11REGEX_TRUE INSTCONF_FALSE INSTCONF_TRUE SHAREDLIB_FALSE @@ -826,6 +676,7 @@ ICU_LIBS CURL_LIBS target_mingw32 target_system +AM_CFLAGS AM_CXXFLAGS enable_profile enable_debug @@ -835,13 +686,14 @@ with_conf with_icusword with_icu with_zlib +SWORD_VERSION_NANO +SWORD_VERSION_MICRO +SWORD_VERSION_MINOR +SWORD_VERSION_MAJOR +SWORD_VERSION_STR +SWORD_VERSION_NUM CURL_CONFIG ICU_CONFIG -GENRB -GENCMN -GENCCODE -PKGDATA -PKG_CONFIG HAVE_CPPUNIT_FALSE HAVE_CPPUNIT_TRUE CPPUNIT_LIBS @@ -852,6 +704,11 @@ MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE CLUCENE_CXXFLAGS CLUCENE_LIBS +CLUCENE2_LIBS +CLUCENE2_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG CXXCPP CPP OTOOL64 @@ -859,8 +716,9 @@ OTOOL LIPO NMEDIT DSYMUTIL -lt_ECHO +MANIFEST_TOOL RANLIB +ac_ct_AR AR LN_S NM @@ -884,6 +742,7 @@ CXX am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -897,6 +756,10 @@ CPPFLAGS LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -962,6 +825,7 @@ bindir program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -972,19 +836,23 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_shared enable_static with_pic enable_fast_install with_gnu_ld +with_sysroot enable_libtool_lock with_clucene with_zlib with_icu with_icusword with_conf +with_cxx11regex with_curl +with_curl_sftp with_internalregex enable_debug enable_warnings @@ -1009,7 +877,12 @@ CXX CXXFLAGS CCC CPP -CXXCPP' +CXXCPP +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +CLUCENE2_CFLAGS +CLUCENE2_LIBS' # Initialize some variables set by options. @@ -1072,8 +945,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1118,8 +992,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1145,8 +1018,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1350,8 +1222,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1367,8 +1238,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1398,17 +1268,17 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1417,7 +1287,7 @@ Try \`$0 --help' for more information." >&2 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1425,15 +1295,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1456,8 +1324,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1471,8 +1338,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1487,11 +1352,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1530,13 +1393,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1562,7 +1423,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sword 1.6.2 to adapt to many kinds of systems. +\`configure' configures sword 1.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1576,7 +1437,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1633,7 +1494,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sword 1.6.2:";; + short | recursive ) echo "Configuration of sword 1.7.2:";; esac cat <<\_ACEOF @@ -1641,8 +1502,12 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1655,24 +1520,30 @@ Optional Features: --enable-tests build test programs (default=yes) --enable-utilities build utilities (default=yes) --enable-examples build examples (default=no) - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). --with-clucene= prefix of CLucene-Core installation. e.g. /usr/local or /usr --with-zlib allow zlib compressed modules (default=yes) --with-icu use ICU for unicode (default=yes) --with-icusword use custom SWORD ICU (default=no) --with-conf install a new sword.conf (default=yes) + --with-cxx11regex build regex support using c++11 regex (default=no) --with-curl build install manager support using libcurl (default=yes) - --with-internalregex Compile using SWORD's internal copy of regex + --with-curl_sftp build install manager support using libcurl+sftp + (requires --with-curl, default=yes) + --with-internalregex Compile using SWORDs internal copy of regex --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional) --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional) @@ -1682,17 +1553,27 @@ Some influential environment variables: LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CXX C++ compiler command CXXFLAGS C++ compiler flags CPP C preprocessor CXXCPP C++ preprocessor + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + CLUCENE2_CFLAGS + C compiler flags for CLUCENE2, overriding pkg-config + CLUCENE2_LIBS + linker flags for CLUCENE2, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to . +sword home page: . _ACEOF ac_status=$? fi @@ -1755,32 +1636,526 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sword configure 1.6.2 -generated by GNU Autoconf 2.63 +sword configure 1.7.2 +generated by GNU Autoconf 2.69 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -It was created by sword $as_me 1.6.2, which was -generated by GNU Autoconf 2.63. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## - $ $0 $@ - -_ACEOF -exec 5>>config.log +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_cxx_try_cpp LINENO +# ------------------------ +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_cpp + +# ac_fn_cxx_try_link LINENO +# ------------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_link + +# ac_fn_cxx_try_run LINENO +# ------------------------ +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_cxx_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_run + +# ac_fn_cxx_check_func LINENO FUNC VAR +# ------------------------------------ +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_cxx_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_cxx_check_func +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by sword $as_me 1.7.2, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -1806,8 +2181,8 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1844,9 +2219,9 @@ do ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1862,13 +2237,13 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1880,11 +2255,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1893,13 +2266,13 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1918,11 +2291,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1935,11 +2306,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1953,11 +2322,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -1971,46 +2338,53 @@ _ASBOX exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2021,19 +2395,23 @@ fi for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; @@ -2041,7 +2419,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -2056,11 +2434,11 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -2070,17 +2448,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -2092,43 +2470,20 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2158,9 +2513,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2174,35 +2527,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2218,28 +2563,24 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2255,28 +2596,24 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking target system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then +if ${ac_cv_target+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -$as_echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -2298,7 +2635,7 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- -am__api_version='1.11' +am__api_version='1.13' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2314,10 +2651,10 @@ am__api_version='1.11' # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2325,11 +2662,11 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2337,7 +2674,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2366,7 +2703,7 @@ case $as_dir/ in ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2382,7 +2719,7 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2393,68 +2730,73 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 -$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 -$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2477,12 +2819,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2494,17 +2836,17 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2515,24 +2857,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2542,9 +2884,9 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2555,24 +2897,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2581,7 +2923,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2594,10 +2936,10 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2605,9 +2947,9 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2617,11 +2959,12 @@ do esac done done -done + done IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2629,26 +2972,19 @@ fi # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2659,24 +2995,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2684,11 +3020,11 @@ fi test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2696,7 +3032,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2706,11 +3042,11 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2724,15 +3060,52 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2748,7 +3121,7 @@ fi # Define the identity of the package. PACKAGE='sword' - VERSION='1.6.2' + VERSION='1.7.2' cat >>confdefs.h <<_ACEOF @@ -2776,13 +3149,24 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + -AMTAR=${AMTAR-"${am_missing_run}tar"} +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' @@ -2821,9 +3205,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2834,24 +3218,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2861,9 +3245,9 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2874,24 +3258,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2900,7 +3284,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2914,9 +3298,9 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2927,24 +3311,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2954,9 +3338,9 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2968,18 +3352,18 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2998,10 +3382,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3013,9 +3397,9 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3026,24 +3410,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3057,9 +3441,9 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3070,24 +3454,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3100,7 +3484,7 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3111,57 +3495,37 @@ fi fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3177,8 +3541,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3194,17 +3558,17 @@ do done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3221,7 +3585,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3240,84 +3604,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3332,32 +3653,83 @@ for ac_file in conftest.exe conftest conftest.*; do esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3369,17 +3741,17 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3392,31 +3764,23 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3430,37 +3794,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3469,20 +3812,16 @@ else fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3493,35 +3832,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3532,36 +3847,12 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3572,42 +3863,17 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -3624,23 +3890,18 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3692,32 +3953,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3728,17 +3966,19 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -3757,14 +3997,14 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3785,18 +4025,19 @@ if test "$am__include" = "#"; then fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3810,17 +4051,18 @@ fi depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3854,16 +4096,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3872,16 +4114,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3920,7 +4162,7 @@ else fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3949,9 +4191,9 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -3962,24 +4204,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 $as_echo "$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3993,9 +4235,9 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -4006,24 +4248,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 $as_echo "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4036,7 +4278,7 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4047,53 +4289,36 @@ fi fi fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +if ${ac_cv_cxx_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4107,37 +4332,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes @@ -4146,20 +4350,16 @@ else fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then +if ${ac_cv_prog_cxx_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4170,35 +4370,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4209,36 +4385,12 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4249,42 +4401,17 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -4309,17 +4436,18 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4353,16 +4481,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4371,16 +4499,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4419,7 +4547,7 @@ else fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type @@ -4434,109 +4562,17 @@ else fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - -done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AS+set}" = set; then +if ${ac_cv_prog_AS+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AS"; then @@ -4547,24 +4583,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AS="${ac_tool_prefix}as" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then - { $as_echo "$as_me:$LINENO: result: $AS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 $as_echo "$AS" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4574,9 +4610,9 @@ if test -z "$ac_cv_prog_AS"; then ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then +if ${ac_cv_prog_ac_ct_AS+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AS"; then @@ -4587,24 +4623,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AS="as" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 $as_echo "$ac_ct_AS" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4613,7 +4649,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4626,9 +4662,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DLLTOOL+set}" = set; then +if ${ac_cv_prog_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then @@ -4639,24 +4675,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 $as_echo "$DLLTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4666,9 +4702,9 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then @@ -4679,24 +4715,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 $as_echo "$ac_ct_DLLTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4705,7 +4741,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4718,9 +4754,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -4731,24 +4767,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 $as_echo "$OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4758,9 +4794,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -4771,24 +4807,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 $as_echo "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4797,7 +4833,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4832,14 +4868,14 @@ test -z "$OBJDUMP" && OBJDUMP=objdump case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.2.6b' -macro_revision='1.3017' +macro_version='2.4.2' +macro_revision='1.3337' @@ -4855,9 +4891,78 @@ macro_revision='1.3017' ltmain="$ac_aux_dir/ltmain.sh" -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -4865,7 +4970,7 @@ else ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - $as_unset ac_script || ac_script= + { ac_script=; unset ac_script;} if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -4874,10 +4979,10 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4894,7 +4999,7 @@ case `"$ac_path_SED" --version 2>&1` in $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" @@ -4909,19 +5014,17 @@ esac $ac_path_SED_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4939,9 +5042,9 @@ Xsed="$SED -e 1s/^X//" -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4952,10 +5055,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4972,7 +5075,7 @@ case `"$ac_path_GREP" --version 2>&1` in $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -4987,26 +5090,24 @@ esac $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -5020,10 +5121,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5040,7 +5141,7 @@ case `"$ac_path_EGREP" --version 2>&1` in $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -5055,12 +5156,10 @@ esac $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -5068,14 +5167,14 @@ fi fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -5089,10 +5188,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5109,7 +5208,7 @@ case `"$ac_path_FGREP" --version 2>&1` in $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" @@ -5124,12 +5223,10 @@ esac $ac_path_FGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -5137,7 +5234,7 @@ fi fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -5163,7 +5260,7 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -5172,7 +5269,7 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -5202,13 +5299,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -5239,18 +5336,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -5263,7 +5358,7 @@ case `$LD -v 2>&1 &5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -5275,9 +5370,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -5324,20 +5419,23 @@ else : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$ac_tool_prefix"; then - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then +if ${ac_cv_prog_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -5348,24 +5446,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 $as_echo "$DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5375,13 +5473,13 @@ fi fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -5392,24 +5490,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 $as_echo "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5422,7 +5520,7 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5430,6 +5528,15 @@ esac fi fi + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -5442,44 +5549,44 @@ test -z "$NM" && NM=nm -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then +if ${lt_cv_nm_interface+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5452: $ac_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5455: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5458: output\"" >&5) + (eval echo "\"\$as_me:$LINENO: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 $as_echo "$lt_cv_nm_interface" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 $as_echo "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -5512,6 +5619,11 @@ else lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -5537,6 +5649,11 @@ else lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5576,8 +5693,8 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -5597,10 +5714,10 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:$LINENO: result: none" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -5614,27 +5731,27 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 $as_echo "$xsi_shell" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 $as_echo "$lt_shell_append" >&6; } @@ -5669,22 +5786,101 @@ esac -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -5705,9 +5901,9 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -5718,24 +5914,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 $as_echo "$OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5745,9 +5941,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -5758,24 +5954,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 $as_echo "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5784,7 +5980,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5801,9 +5997,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -5845,16 +6041,18 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -5884,6 +6082,10 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -5892,11 +6094,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -5917,8 +6119,8 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5997,8 +6199,23 @@ tpf*) esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -6014,12 +6231,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -6030,36 +6398,40 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 $as_echo "$AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + test -n "$AR" && break + done fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$AR"; then ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -6070,44 +6442,46 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 $as_echo "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} @@ -6119,12 +6493,70 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -6135,24 +6567,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6162,9 +6594,9 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -6175,24 +6607,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6201,7 +6633,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6221,9 +6653,9 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -6234,24 +6666,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6261,9 +6693,9 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -6274,24 +6706,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 $as_echo "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6300,7 +6732,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6325,15 +6757,27 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + @@ -6378,9 +6822,9 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6441,8 +6885,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6466,6 +6910,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -6478,6 +6923,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -6496,18 +6942,18 @@ void nm_test_func(void){} int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -6519,6 +6965,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -6530,7 +6988,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -6556,19 +7014,19 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -6598,13 +7056,19 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:$LINENO: result: failed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 $as_echo "failed" >&6; } else - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi @@ -6627,24 +7091,67 @@ fi -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; -fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -6658,12 +7165,12 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6661 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -6693,15 +7200,15 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -6711,7 +7218,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6730,7 +7240,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -6750,9 +7263,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -6761,11 +7274,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6776,38 +7285,13 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6815,25 +7299,38 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -6849,15 +7346,132 @@ esac need_locks="$enable_libtool_lock" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + case $host_os in rhapsody* | darwin*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +if ${ac_cv_prog_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -6868,24 +7482,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 $as_echo "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6895,9 +7509,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -6908,24 +7522,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 $as_echo "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6934,7 +7548,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6947,9 +7561,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then +if ${ac_cv_prog_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -6960,24 +7574,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 $as_echo "$NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6987,9 +7601,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -7000,24 +7614,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 $as_echo "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7026,7 +7640,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7039,9 +7653,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -7052,24 +7666,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 $as_echo "$LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7079,9 +7693,9 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -7092,24 +7706,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 $as_echo "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7118,7 +7732,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7131,9 +7745,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -7144,24 +7758,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 $as_echo "$OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7171,9 +7785,9 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -7184,24 +7798,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 $as_echo "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7210,7 +7824,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7223,9 +7837,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then +if ${ac_cv_prog_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -7236,24 +7850,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 $as_echo "$OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7263,9 +7877,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -7276,24 +7890,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 $as_echo "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7302,7 +7916,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7338,9 +7952,9 @@ fi - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -7356,7 +7970,13 @@ else $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7365,22 +7985,19 @@ else rm -f conftest.* fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +if ${lt_cv_ld_exported_symbols_list+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7391,43 +8008,53 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no + lt_cv_ld_exported_symbols_list=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -7455,7 +8082,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7468,14 +8095,14 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -7490,11 +8117,7 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -7503,78 +8126,34 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -7586,7 +8165,7 @@ fi else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -7597,11 +8176,7 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -7610,87 +8185,40 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -7700,16 +8228,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -7724,48 +8248,23 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7773,982 +8272,114 @@ rm -f conftest* fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_header in dlfcn.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : - done - ac_cv_prog_CXXCPP=$CXXCPP +else + ac_cv_header_stdc=no +fi +rm -f conftest* fi - CXXCPP=$ac_cv_prog_CXXCPP + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# include +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif - Syntax error + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : +if ac_fn_c_try_run "$LINENO"; then : + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi - # Broken: fails on valid input. -continue fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then -rm -f conftest.err conftest.$ac_ext +$as_echo "#define STDC_HEADERS 1" >>confdefs.h - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break fi -rm -f conftest.err conftest.$ac_ext - done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -_lt_caught_CXX_error=yes; } -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -else - _lt_caught_CXX_error=yes +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + fi +done + + + +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf + @@ -8762,7 +8393,7 @@ fi # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -8793,7 +8424,7 @@ fi # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -8825,8 +8456,23 @@ fi # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8841,7 +8487,7 @@ test -z "$pic_mode" && pic_mode=default # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -8897,6 +8543,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + + @@ -8922,9 +8573,9 @@ if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -8937,7 +8588,7 @@ else fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -8952,19 +8603,6 @@ _ACEOF - - - - - - - - - - - - - case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -8977,23 +8615,6 @@ aix3*) ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -9022,7 +8643,7 @@ for cc_temp in $compiler""; do *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -9030,9 +8651,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -9083,10 +8704,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9096,9 +8717,9 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:$LINENO: checking for file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -9149,10 +8770,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9231,11 +8852,16 @@ if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac - { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -9251,15 +8877,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9254: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9258: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes @@ -9268,7 +8894,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then @@ -9288,8 +8914,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -9337,6 +8961,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -9379,6 +9009,15 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -9420,7 +9059,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -9441,7 +9080,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' @@ -9453,25 +9098,40 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-qpic' lt_prog_compiler_static='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' ;; esac ;; @@ -9503,7 +9163,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; @@ -9560,21 +9220,25 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -9590,15 +9254,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9593: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9597: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes @@ -9607,7 +9271,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then @@ -9627,13 +9291,18 @@ fi + + + + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -9646,7 +9315,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes @@ -9659,7 +9328,7 @@ else LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then @@ -9674,9 +9343,9 @@ fi - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9695,16 +9364,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9698: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9702: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9721,7 +9390,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9729,9 +9398,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9750,16 +9419,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9753: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9757: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9776,7 +9445,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9785,7 +9454,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -9793,10 +9462,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; } touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -9809,7 +9478,7 @@ fi - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= @@ -9825,7 +9494,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9872,7 +9540,33 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie esac ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -9890,6 +9584,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -9905,11 +9600,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -9945,10 +9641,12 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -9966,6 +9664,11 @@ _LT_EOF fi ;; + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no @@ -9981,7 +9684,7 @@ _LT_EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -9991,15 +9694,16 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -10010,13 +9714,17 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -10032,17 +9740,16 @@ _LT_EOF fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -10056,8 +9763,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -10075,8 +9782,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10122,8 +9829,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10163,8 +9870,10 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -10251,11 +9960,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -10265,55 +9976,35 @@ main () ; return 0; } -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' @@ -10322,11 +10013,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -10337,59 +10030,44 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_link "$LINENO"; then : + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -10421,20 +10099,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -10444,7 +10166,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec='' + fi link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in @@ -10452,7 +10179,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="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}" @@ -10470,10 +10197,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10486,7 +10209,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10495,7 +10218,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -10503,7 +10226,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -10518,14 +10241,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10537,16 +10259,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -10558,7 +10280,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + ;; esac fi @@ -10586,52 +10347,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF -int foo(void) {} + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + lt_cv_irix_exported_symbol=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -10693,17 +10441,17 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -10713,13 +10461,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10732,9 +10480,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -10883,7 +10631,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no @@ -10920,46 +10668,52 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac fi @@ -11117,12 +10871,7 @@ esac - - - - - - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then @@ -11130,16 +10879,23 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -11152,7 +10908,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -11172,7 +10928,13 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[lt_foo]++; } if (lt_freq[lt_foo] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -11198,7 +10960,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -11207,7 +10969,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -11260,7 +11022,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - 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' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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' ;; esac ;; @@ -11272,7 +11034,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -11291,8 +11053,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -11313,36 +11076,83 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -11363,7 +11173,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -11371,10 +11181,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11382,7 +11188,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -11400,7 +11206,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11420,12 +11226,26 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -11471,12 +11291,14 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -11492,7 +11314,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -11529,9 +11351,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11539,16 +11361,17 @@ linux* | k*bsd*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11559,43 +11382,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -11607,8 +11406,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - 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' ' '` + 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;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11639,7 +11439,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11708,7 +11508,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11733,7 +11533,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11757,7 +11557,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11788,7 +11588,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11798,7 +11598,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11808,7 +11608,7 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -11910,7 +11710,12 @@ fi - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || @@ -11935,7 +11740,7 @@ else # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || @@ -11973,118 +11778,22 @@ else lt_cv_dlopen_libs= ;; - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dl_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= ;; - *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -12092,72 +11801,51 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif - +char dlopen (); int main () { -return shl_load (); +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then + + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then +if ${ac_cv_lib_dld_shl_load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12175,145 +11863,32 @@ return shl_load (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_shl_load=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif - -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12331,57 +11906,28 @@ return dlopen (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12399,57 +11945,28 @@ return dlopen (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12467,43 +11984,18 @@ return dld_link (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -12542,9 +12034,9 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -12553,7 +12045,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12556 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12594,7 +12086,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12603,7 +12101,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -12612,11 +12114,11 @@ int main () return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12633,14 +12135,14 @@ rm -fr conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -12649,7 +12151,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12652 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12690,7 +12192,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12699,7 +12207,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -12708,11 +12220,11 @@ int main () return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12729,7 +12241,7 @@ rm -fr conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 $as_echo "$lt_cv_dlopen_self_static" >&6; } fi @@ -12768,12 +12280,12 @@ fi striplib= old_striplib= -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough @@ -12782,15 +12294,15 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi ;; *) - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ;; esac @@ -12807,55 +12319,194 @@ fi - # Report which library types will actually be built - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } + + + + +fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +CC="$lt_save_CC" + + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then + if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } + done + ac_cv_prog_CXXCPP=$CXXCPP - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -CC="$lt_save_CC" - +else + _lt_caught_CXX_error=yes +fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -12872,7 +12523,6 @@ export_dynamic_flag_spec_CXX= hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -12882,6 +12532,8 @@ module_cmds_CXX= module_expsym_cmds_CXX= link_all_deplibs_CXX=unknown old_archive_cmds_CXX=$old_archive_cmds +reload_flag_CXX=$reload_flag +reload_cmds_CXX=$reload_cmds no_undefined_flag_CXX= whole_archive_flag_spec_CXX= enable_shared_with_static_runtimes_CXX=no @@ -12937,6 +12589,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -12954,6 +12607,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do @@ -12964,7 +12618,7 @@ $RM -r conftest* *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` if test -n "$compiler"; then @@ -12982,7 +12636,7 @@ cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -12991,7 +12645,7 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -13021,13 +12675,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -13058,18 +12712,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -13082,7 +12734,7 @@ case `$LD -v 2>&1 &5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -13095,8 +12747,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13128,7 +12780,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -13137,7 +12789,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld fi # PORTME: fill in a description of your system's C++ link characteristics - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in @@ -13238,11 +12890,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -13253,55 +12907,35 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_link "$LINENO"; then : + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath__CXX +fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' @@ -13310,11 +12944,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -13325,59 +12961,44 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_link "$LINENO"; then : + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath__CXX +fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + fi archive_cmds_need_lc_CXX=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -13407,28 +13028,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_CXX=' ' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=yes + file_list_spec_CXX='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' + enable_shared_with_static_runtimes_CXX=yes + # Don't use ranlib + old_postinstall_cmds_CXX='chmod 644 $oldlib' + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; + esac + ;; darwin* | rhapsody*) @@ -13436,7 +13104,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec_CXX='' + fi link_all_deplibs_CXX=yes allow_undefined_flag_CXX="$_lt_dar_allow_undefined" case $cc_basename in @@ -13444,7 +13117,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds_CXX="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}" @@ -13478,7 +13151,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -13497,6 +13170,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi gnu*) ;; + haiku*) + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs_CXX=yes + ;; + hpux9*) hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -13521,11 +13199,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13586,7 +13264,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -13596,10 +13274,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -13629,7 +13307,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -13640,9 +13318,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes @@ -13653,7 +13331,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -13671,7 +13349,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13708,26 +13386,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [1-5]* | *pgcpp\ [1-5]*) + *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -13735,7 +13413,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -13754,9 +13432,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13776,13 +13454,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -13851,7 +13529,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec_CXX='${wl}-E' whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else ld_shlibs_CXX=no fi @@ -13886,15 +13564,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host in osf3*) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; @@ -13910,17 +13588,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -13930,7 +13608,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -13966,7 +13644,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' @@ -13987,7 +13665,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac link_all_deplibs_CXX=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -14007,14 +13685,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -14025,7 +13703,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' @@ -14079,6 +13757,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi CC*) archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ + '"$old_archive_cmds_CXX" + reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ + '"$reload_cmds_CXX" ;; *) archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -14112,7 +13794,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac - { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no @@ -14140,11 +13822,19 @@ private: }; _LT_EOF -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -14153,7 +13843,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -14162,13 +13852,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + case ${prev} in + -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -14188,8 +13887,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -14225,6 +13926,7 @@ else fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken case $host_os in @@ -14260,7 +13962,7 @@ linux*) solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -14325,8 +14027,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -14376,6 +14076,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static_CXX= + ;; interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -14425,6 +14130,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; dgux*) case $cc_basename in ec++*) @@ -14481,7 +14191,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -14514,8 +14224,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-qpic' lt_prog_compiler_static_CXX='-qstaticlink' @@ -14577,7 +14287,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' @@ -14642,18 +14352,25 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then +if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_CXX=no @@ -14669,15 +14386,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14672: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14676: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works_CXX=yes @@ -14686,7 +14403,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then @@ -14703,13 +14420,15 @@ fi + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then +if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no @@ -14722,7 +14441,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works_CXX=yes @@ -14735,7 +14454,7 @@ else LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then @@ -14747,9 +14466,9 @@ fi - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -14768,16 +14487,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14771: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14775: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -14794,14 +14513,14 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -14820,16 +14539,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14823: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14827: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -14846,7 +14565,7 @@ else $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } @@ -14855,7 +14574,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -14863,10 +14582,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; } touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -14876,33 +14595,43 @@ fi - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; + case $cc_basename in + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + ;; + esac + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no @@ -14930,46 +14659,52 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -$as_echo "$archive_cmds_need_lc_CXX" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc_CXX=no + else + lt_cv_archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } + archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ;; esac fi @@ -15037,9 +14772,7 @@ esac - - - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= @@ -15064,7 +14797,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -15073,7 +14806,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -15126,7 +14859,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - 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' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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' ;; esac ;; @@ -15138,7 +14871,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -15157,8 +14890,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -15179,36 +14913,82 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -15228,7 +15008,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -15236,10 +15016,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -15247,7 +15023,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -15265,7 +15041,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -15284,13 +15060,27 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no + dynamic_linker="$host_os runtime_loader" library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -15336,12 +15126,14 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -15357,7 +15149,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -15394,9 +15186,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15404,16 +15196,17 @@ linux* | k*bsd*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -15424,43 +15217,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes +if ac_fn_cxx_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -15472,8 +15241,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - 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' ' '` + 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;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15504,7 +15274,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -15573,7 +15343,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15598,7 +15368,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15622,7 +15392,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -15653,7 +15423,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15663,7 +15433,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15673,7 +15443,7 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -15724,7 +15494,9 @@ fi - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || @@ -15749,7 +15521,7 @@ else # directories. hardcode_action_CXX=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 $as_echo "$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink || @@ -15771,6 +15543,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -15799,121 +15572,25 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_config_commands="$ac_config_commands libtool" - - - - -# Only expand once: - - - - - colored_echo_bold='' - colored_echo_norm='' - - for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 -$as_echo "$AWK" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - test -n "$AWK" && break -done + ac_config_commands="$ac_config_commands libtool" - if test x"$AWK" = x"not found"; then - return - fi - case $TERM in - xterm|xterm*|vt220|vt220*) - colored_echo_bold=`$AWK 'BEGIN { printf("%c%c%c%c", 27, 91, 49, 109); }' /dev/null` - colored_echo_norm=`$AWK 'BEGIN { printf("%c%c%c", 27, 91, 109); }' /dev/null` - ;; - vt100|vt100*|cygwin) - colored_echo_bold=`$AWK 'BEGIN { printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }' /dev/null` - colored_echo_norm=`$AWK 'BEGIN { printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }' /dev/null` - ;; - *) - paths=`$ECHO $PATH | sed -e 's/:/ /g'` - for tool in tput tcout; do - for dir in $paths; do - if test -r "$dir/$tool" ; then - for seq in bold md smso; do - bold="`$dir/$tool $seq 2>/dev/null`" - if test ".$bold" != . ; then - colored_echo_bold="$bold" - break - fi - done - if test ".$colored_echo_bold" != . ; then - for seq in sgr0 me rmso init reset; do - norm="`$dir/$tool $seq 2>/dev/null`" - if test ".$norm" != . ; then - colored_echo_norm="$norm" - break - fi - done - fi - break - fi - done - if test x"$colored_echo_bold" != "x" -a x"$colored_echo_norm" != "x"; then - break; - fi - done - ;; - esac +# Only expand once: - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then +if ${ac_cv_c_bigendian+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __APPLE_CC__ not a universal capable compiler @@ -15921,46 +15598,34 @@ cat >>conftest.$ac_ext <<_ACEOF typedef int dummy; _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : # Check for potential -arch flags. It is not universal unless - # there are some -arch flags. Note that *ppc* also matches - # ppc64. This check is also rather less than ideal. - case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( - *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; - esac -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -15978,30 +15643,9 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : # It does; now see whether it defined to BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -16017,49 +15661,18 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -16074,30 +15687,9 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : # It does; now see whether it defined to _BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -16112,51 +15704,20 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : # Try to guess by grepping values from an object file. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; @@ -16182,24 +15743,7 @@ return use_ascii (foo) == use_ebcdic (foo); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -16211,103 +15755,251 @@ $as_echo "$ac_try_echo") >&5 ac_cv_c_bigendian=unknown fi fi +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_run "$LINENO"; then : + ac_cv_c_bigendian=no +else + ac_cv_c_bigendian=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h +;; #( + no) + ;; #( + universal) + +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_bigendian=no + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi -( exit $ac_status ) -ac_cv_c_bigendian=yes fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUCENE2" >&5 +$as_echo_n "checking for CLUCENE2... " >&6; } - fi +if test -n "$CLUCENE2_CFLAGS"; then + pkg_cv_CLUCENE2_CFLAGS="$CLUCENE2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libclucene-core >= 2.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libclucene-core >= 2.3") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CLUCENE2_CFLAGS=`$PKG_CONFIG --cflags "libclucene-core >= 2.3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$CLUCENE2_LIBS"; then + pkg_cv_CLUCENE2_LIBS="$CLUCENE2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libclucene-core >= 2.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libclucene-core >= 2.3") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CLUCENE2_LIBS=`$PKG_CONFIG --libs "libclucene-core >= 2.3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } - case $ac_cv_c_bigendian in #( - yes) - cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF -;; #( - no) - ;; #( - universal) -cat >>confdefs.h <<\_ACEOF -#define AC_APPLE_UNIVERSAL_BUILD 1 -_ACEOF - ;; #( - *) - { { $as_echo "$as_me:$LINENO: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -$as_echo "$as_me: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; - esac +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + CLUCENE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libclucene-core >= 2.3" 2>&1` + else + CLUCENE2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libclucene-core >= 2.3" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$CLUCENE2_PKG_ERRORS" >&5 + + true +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + true +else + CLUCENE2_CFLAGS=$pkg_cv_CLUCENE2_CFLAGS + CLUCENE2_LIBS=$pkg_cv_CLUCENE2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +if test "x$CLUCENE2_LIBS" = x; then ac_ext=cpp @@ -16321,15 +16013,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # Ask user for path to clucene-core stuff:. # Check whether --with-clucene was given. -if test "${with_clucene+set}" = set; then +if test "${with_clucene+set}" = set; then : withval=$with_clucene; fi -{ $as_echo "$as_me:$LINENO: checking how to include clucene" >&5 -$as_echo_n "checking how to include clucene... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to include clucene 0.x" >&5 +$as_echo_n "checking how to include clucene 0.x... " >&6; } if test "x$with_clucene" = "xno"; then - { $as_echo "$as_me:$LINENO: result: excluding support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5 $as_echo "excluding support" >&6; } else #try some default locations @@ -16385,15 +16077,15 @@ done if test -z "$clucene_set_failed"; then clucene_set_failed="true" with_clucene="no" - { $as_echo "$as_me:$LINENO: result: excluding support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5 $as_echo "excluding support" >&6; } else - { $as_echo "$as_me:$LINENO: result: $clucene_set_failed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $clucene_set_failed" >&5 $as_echo "$clucene_set_failed" >&6; } fi if test "$clucene_set_failed" = "true"; then - { $as_echo "$as_me:$LINENO: WARNING: Could not detect clucene location. To enable clucene, you must + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not detect clucene location. To enable clucene, you must call configure with the --with-clucene option specifying the location. This tells configure where to find the CLucene Core library and headers. e.g. --with-clucene=/usr/local or --with-clucene=/usr" >&5 @@ -16415,13 +16107,14 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +fi # --------------------------------------------------------------------- # With options # --------------------------------------------------------------------- # Check whether --with-zlib was given. -if test "${with_zlib+set}" = set; then +if test "${with_zlib+set}" = set; then : withval=$with_zlib; else with_zlib=yes @@ -16429,7 +16122,7 @@ fi # Check whether --with-icu was given. -if test "${with_icu+set}" = set; then +if test "${with_icu+set}" = set; then : withval=$with_icu; else with_icu=yes @@ -16437,7 +16130,7 @@ fi # Check whether --with-icusword was given. -if test "${with_icusword+set}" = set; then +if test "${with_icusword+set}" = set; then : withval=$with_icusword; else with_icusword=no @@ -16445,25 +16138,41 @@ fi # Check whether --with-conf was given. -if test "${with_conf+set}" = set; then +if test "${with_conf+set}" = set; then : withval=$with_conf; else with_conf=yes fi +# Check whether --with-cxx11regex was given. +if test "${with_cxx11regex+set}" = set; then : + withval=$with_cxx11regex; +else + with_cxx11regex=no +fi + + # Check whether --with-curl was given. -if test "${with_curl+set}" = set; then +if test "${with_curl+set}" = set; then : withval=$with_curl; else with_curl=yes fi + +# Check whether --with-curl_sftp was given. +if test "${with_curl_sftp+set}" = set; then : + withval=$with_curl_sftp; +else + with_curl_sftp=yes +fi + #AC_ARG_WITH(lucene, # AC_HELP_STRING([--with-lucene],[include lucene support for searching (default=no)]),,with_lucene=no) # Check whether --with-internalregex was given. -if test "${with_internalregex+set}" = set; then +if test "${with_internalregex+set}" = set; then : withval=$with_internalregex; fi @@ -16473,65 +16182,65 @@ fi # Enable options # --------------------------------------------------------------------- # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; else enable_debug=no fi # Check whether --enable-warnings was given. -if test "${enable_warnings+set}" = set; then +if test "${enable_warnings+set}" = set; then : enableval=$enable_warnings; else enable_warnings=no fi # Check whether --enable-profile was given. -if test "${enable_profile+set}" = set; then +if test "${enable_profile+set}" = set; then : enableval=$enable_profile; else enable_profile=no fi # Check whether --enable-profilefn was given. -if test "${enable_profilefn+set}" = set; then +if test "${enable_profilefn+set}" = set; then : enableval=$enable_profilefn; else enable_profilefn=no fi # Check whether --enable-tests was given. -if test "${enable_tests+set}" = set; then +if test "${enable_tests+set}" = set; then : enableval=$enable_tests; else enable_tests=yes fi # Check whether --enable-utilities was given. -if test "${enable_utilities+set}" = set; then +if test "${enable_utilities+set}" = set; then : enableval=$enable_utilities; else enable_utilities=yes fi # Check whether --enable-examples was given. -if test "${enable_examples+set}" = set; then +if test "${enable_examples+set}" = set; then : enableval=$enable_examples; else enable_examples=no fi -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then +if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -16558,32 +16267,30 @@ if test x$enable_debug = xyes; then AM_CFLAGS="-O0 -Wall -Werror" fi if test x$ac_cv_prog_cxx_g = xyes; then - AM_CXXFLAGS="-g3 -O0 -Wall -Werror" + AM_CXXFLAGS="-g3 -O0 -Wall -Werror -Woverloaded-virtual" else - AM_CXXFLAGS="-O0 -Wall -Werror" + AM_CXXFLAGS="-O0 -Wall -Werror -Woverloaded-virtual" fi else AM_CFLAGS="-O3" AM_CXXFLAGS="-O3" fi +AM_CFLAGS="$AM_CFLAGS -fPIC" +AM_CXXFLAGS="$AM_CXXFLAGS -fPIC" + # --------------------------------------------------------------------- # Check libraries # --------------------------------------------------------------------- if test x$with_zlib = xyes; then - -{ $as_echo "$as_me:$LINENO: checking for compress in -lz" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 $as_echo_n "checking for compress in -lz... " >&6; } -if test "${ac_cv_lib_z_compress+set}" = set; then +if ${ac_cv_lib_z_compress+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16601,43 +16308,18 @@ return compress (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_lib_z_compress=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_z_compress=no + ac_cv_lib_z_compress=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 $as_echo "$ac_cv_lib_z_compress" >&6; } -if test "x$ac_cv_lib_z_compress" = x""yes; then +if test "x$ac_cv_lib_z_compress" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBZ 1 _ACEOF @@ -16657,20 +16339,16 @@ if test x$with_zlib = xno; then AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEZLIB" fi -if test "x$with_internalregex" = "xyes"; then +if test "x$with_internalregex" = "xyes"; then : have_systemregex="no" else - { $as_echo "$as_me:$LINENO: checking for library containing regexec" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regexec" >&5 $as_echo_n "checking for library containing regexec... " >&6; } -if test "${ac_cv_search_regexec+set}" = set; then +if ${ac_cv_search_regexec+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16695,54 +16373,27 @@ for ac_lib in '' regex; do ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + if ac_fn_cxx_try_link "$LINENO"; then : ac_cv_search_regexec=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_regexec+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_regexec+:} false; then : break fi done -if test "${ac_cv_search_regexec+set}" = set; then - : +if ${ac_cv_search_regexec+:} false; then : + else ac_cv_search_regexec=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_regexec" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regexec" >&5 $as_echo "$ac_cv_search_regexec" >&6; } ac_res=$ac_cv_search_regexec -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" have_systemregex="yes" else @@ -16751,26 +16402,21 @@ fi fi - -if test "x$have_systemregex" = "xyes"; then +if test "x$have_systemregex" = "xyes"; then : with_internalregex="no" - { $as_echo "$as_me:$LINENO: Using system regex.h" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using system regex.h" >&5 $as_echo "$as_me: Using system regex.h" >&6;} else with_internalregex="yes" - if test "x$with_internalregex" = "xno"; then - { { $as_echo "$as_me:$LINENO: error: System regex forced but not found" >&5 -$as_echo "$as_me: error: System regex forced but not found" >&2;} - { (exit 1); exit 1; }; } + if test "x$with_internalregex" = "xno"; then : + as_fn_error $? "System regex forced but not found" "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: Using internal regex.h" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using internal regex.h" >&5 $as_echo "$as_me: Using internal regex.h" >&6;} fi - fi - # --------------------------------------------------------------------- # Find CppUnit # --------------------------------------------------------------------- @@ -16779,7 +16425,7 @@ fi # Check whether --with-cppunit-prefix was given. -if test "${with_cppunit_prefix+set}" = set; then +if test "${with_cppunit_prefix+set}" = set; then : withval=$with_cppunit_prefix; cppunit_config_prefix="$withval" else cppunit_config_prefix="" @@ -16787,7 +16433,7 @@ fi # Check whether --with-cppunit-exec-prefix was given. -if test "${with_cppunit_exec_prefix+set}" = set; then +if test "${with_cppunit_exec_prefix+set}" = set; then : withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval" else cppunit_config_exec_prefix="" @@ -16809,9 +16455,9 @@ fi # Extract the first word of "cppunit-config", so it can be a program name with args. set dummy cppunit-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then +if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $CPPUNIT_CONFIG in @@ -16824,14 +16470,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no" @@ -16840,17 +16486,17 @@ esac fi CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG if test -n "$CPPUNIT_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $CPPUNIT_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5 $as_echo "$CPPUNIT_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi cppunit_version_min=1.8.0 - { $as_echo "$as_me:$LINENO: checking for Cppunit - version >= $cppunit_version_min" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5 $as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; } no_cppunit="" if test "$CPPUNIT_CONFIG" = "no" ; then @@ -16883,10 +16529,10 @@ $as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; } $cppunit_micro_version \>= $cppunit_micro_min ` if test "$cppunit_version_proper" = "1" ; then - { $as_echo "$as_me:$LINENO: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5 $as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } no_cppunit=yes fi @@ -16922,9 +16568,9 @@ fi use_pkgconfig=yes # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -16937,14 +16583,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" @@ -16953,18 +16599,18 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 $as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test x$PKG_CONFIG = xno ; then - { $as_echo "$as_me:$LINENO: WARNING: *** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/" >&5 $as_echo "$as_me: WARNING: *** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: not using pkg-config" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: not using pkg-config" >&5 $as_echo "$as_me: WARNING: not using pkg-config" >&2;} use_pkgconfig=no fi @@ -16972,9 +16618,9 @@ fi if $PKG_CONFIG --atleast-pkgconfig-version 0.14 ; then : else - { $as_echo "$as_me:$LINENO: WARNING: *** pkg-config too old; version 0.14 or better required." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** pkg-config too old; version 0.14 or better required." >&5 $as_echo "$as_me: WARNING: *** pkg-config too old; version 0.14 or better required." >&2;} - { $as_echo "$as_me:$LINENO: WARNING: not using pkg-config" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: not using pkg-config" >&5 $as_echo "$as_me: WARNING: not using pkg-config" >&2;} use_pkgconfig=no fi @@ -16987,180 +16633,11 @@ ICU_VER= ICU_LIBS= ICU_IOLIBS= if test x$with_icu = xyes; then - # Extract the first word of "pkgdata", so it can be a program name with args. -set dummy pkgdata; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKGDATA+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $PKGDATA in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKGDATA="$PKGDATA" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/sbin:." -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKGDATA="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PKGDATA" && ac_cv_path_PKGDATA="/usr/bin/pkgdata" - ;; -esac -fi -PKGDATA=$ac_cv_path_PKGDATA -if test -n "$PKGDATA"; then - { $as_echo "$as_me:$LINENO: result: $PKGDATA" >&5 -$as_echo "$PKGDATA" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "genccode", so it can be a program name with args. -set dummy genccode; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GENCCODE+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $GENCCODE in - [\\/]* | ?:[\\/]*) - ac_cv_path_GENCCODE="$GENCCODE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/sbin:." -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GENCCODE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GENCCODE" && ac_cv_path_GENCCODE="/usr/bin/genccode" - ;; -esac -fi -GENCCODE=$ac_cv_path_GENCCODE -if test -n "$GENCCODE"; then - { $as_echo "$as_me:$LINENO: result: $GENCCODE" >&5 -$as_echo "$GENCCODE" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "gencmn", so it can be a program name with args. -set dummy gencmn; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GENCMN+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $GENCMN in - [\\/]* | ?:[\\/]*) - ac_cv_path_GENCMN="$GENCMN" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/sbin:." -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GENCMN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GENCMN" && ac_cv_path_GENCMN="/usr/bin/gencmn" - ;; -esac -fi -GENCMN=$ac_cv_path_GENCMN -if test -n "$GENCMN"; then - { $as_echo "$as_me:$LINENO: result: $GENCMN" >&5 -$as_echo "$GENCMN" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "genrb", so it can be a program name with args. -set dummy genrb; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GENRB+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $GENRB in - [\\/]* | ?:[\\/]*) - ac_cv_path_GENRB="$GENRB" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/sbin:." -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GENRB="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GENRB" && ac_cv_path_GENRB="/usr/bin/genrb" - ;; -esac -fi -GENRB=$ac_cv_path_GENRB -if test -n "$GENRB"; then - { $as_echo "$as_me:$LINENO: result: $GENRB" >&5 -$as_echo "$GENRB" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "icu-config", so it can be a program name with args. set dummy icu-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ICU_CONFIG+set}" = set; then +if ${ac_cv_path_ICU_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ICU_CONFIG in @@ -17173,14 +16650,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ICU_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_ICU_CONFIG" && ac_cv_path_ICU_CONFIG="no" @@ -17189,10 +16666,10 @@ esac fi ICU_CONFIG=$ac_cv_path_ICU_CONFIG if test -n "$ICU_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ICU_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5 $as_echo "$ICU_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -17232,7 +16709,7 @@ AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25" if test x$enable_warnings = xyes; then AM_CFLAGS="$AM_CFLAGS -Werror" - AM_CXXFLAGS="$AM_CXXFLAGS -Werror" + AM_CXXFLAGS="$AM_CXXFLAGS -Werror -Woverloaded-virtual" fi if test x$enable_profile = xyes; then @@ -17253,9 +16730,9 @@ with_internalftplib=no if test x$with_curl = xyes; then # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CURL_CONFIG+set}" = set; then +if ${ac_cv_path_CURL_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $CURL_CONFIG in @@ -17268,14 +16745,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CURL_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_CURL_CONFIG" && ac_cv_path_CURL_CONFIG="no" @@ -17284,10 +16761,10 @@ esac fi CURL_CONFIG=$ac_cv_path_CURL_CONFIG if test -n "$CURL_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5 $as_echo "$CURL_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -17296,6 +16773,7 @@ fi echo "*** The curl-config script installed by curl could not be found" echo "*** compiling without libcurl support" with_curl=no + with_curl_sftp=no with_internalftplib=yes else echo "curl found - remote install options available" @@ -17304,123 +16782,56 @@ fi AM_CXXFLAGS="$AM_CXXFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS" AM_CFLAGS="$AM_CFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS" LIBS="$LIBS $CURL_LIBS" + if test x$with_curl_sftp = xyes; then + if test x`$CURL_CONFIG --protocols|grep SFTP|wc -l` = x1; then + AM_CXXFLAGS="$AM_CXXFLAGS -DCURLSFTPAVAILABLE" + AM_CFLAGS="$AM_CFLAGS -DCURLSFTPAVAILABLE" + else + with_curl_sftp=no; + fi + fi fi else with_curl=no; + with_curl_sftp=no; with_internalftplib=yes fi +if test x$with_cxx11regex = xyes; then + AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11 -ftemplate-depth=100" +fi + # --------------------------------------------------------------------- # Check for clucene for lucene searching support # --------------------------------------------------------------------- +# NOTE the $libdir hack at the end of the c[xx]flags. Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/ with_clucene=no -if test -z "$CLUCENE_LIBS"; then - echo "lucene searching options not available" -else - echo "lucene found - lucene searching options available" - AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE_CXXFLAGS -DUSELUCENE" - AM_CFLAGS="$AM_CFLAGS -DUSELUCENE" +if test "x$CLUCENE2_LIBS" != x; then + echo "clucene 2.x found - lucene searching options available" + AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir" + AM_CFLAGS="$AM_CFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir" + LIBS="$LIBS $CLUCENE2_LIBS" + with_clucene="yes 2.x" + CLUCENE_LIBS="$CLUCENE_LIBS $CLUCENE2_LIBS" +else +if test "x$CLUCENE_LIBS" != x; then + echo "lucene 0.x found - lucene searching options available" + AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE_CXXFLAGS -DUSELUCENE -I$libdir" + AM_CFLAGS="$AM_CFLAGS -DUSELUCENE -I$libdir" LIBS="$LIBS $CLUCENE_LIBS" - with_clucene="yes" -fi - - -for ac_func in vsnprintf -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" + with_clucene="yes 0.x" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + echo "lucene searching options not available" fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + +for ac_func in vsnprintf +do : + ac_fn_cxx_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" +if test "x$ac_cv_func_vsnprintf" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_VSNPRINTF 1 _ACEOF have_vsnprintf="yes" fi @@ -17438,6 +16849,33 @@ else fi +V1=`expr $VERSION : '\([0-9]*\)\.[0-9]*\.*[0-9]*\.*[0-9]*'` +V2=`expr $VERSION : '[0-9]*\.\([0-9]*\)\.*[0-9]*\.*[0-9]*'` +V3=`expr $VERSION : '[0-9]*\.[0-9]*\.*\([0-9]*\)\.*[0-9]*'` +V4=`expr $VERSION : '[0-9]*\.[0-9]*\.*[0-9]*\.*\([0-9]*\)'` + + +SWORD_VERSION_STR=$VERSION +SWORD_VERSION_MAJOR=$V1 +SWORD_VERSION_MINOR=$V2 +SWORD_VERSION_MICRO=$V3 +if test "$V4" = "" ; then V4=0; fi +SWORD_VERSION_NANO=$V4 + +if test "$V2" -le 9 ; then V2=0$V2 ; fi +if test "$V3" -le 9 ; then V3=00$V3 ; elif test "$V3" -le 99 ; then V3=0$V3 ; fi +if test "$V4" -le 9 ; then V4=00$V4 ; elif test "$V4" -le 99 ; then V4=0$V4 ; fi +SWORD_VERSION_NUM=$V1$V2$V3$V4 + + + + + + + + + + # --------------------------------------------------------------------- # Substitute variables into makefiles # --------------------------------------------------------------------- @@ -17451,9 +16889,8 @@ fi -# TODO: WHY ARE WE SUBST CXXFLAGS BUT NOT CFLAGS? And why, when I uncomment out the cflags subst do we get compile errors? -#AC_SUBST(AM_CFLAGS) + @@ -17472,7 +16909,6 @@ fi # Conditional variables # --------------------------------------------------------------------- -# don't #ifdef in .cpp files HAVE_ stuff because non-ac compiles won't be able to switch them since we include config.h if test x$with_zlib = xyes; then HAVE_LIBZ_TRUE= HAVE_LIBZ_FALSE='#' @@ -17506,7 +16942,7 @@ else fi - if test x$with_clucene = xyes; then + if test "x$with_clucene" != xno; then USELUCENE_TRUE= USELUCENE_FALSE='#' else @@ -17530,6 +16966,14 @@ else INSTCONF_FALSE= fi + if test x$with_cxx11regex = xyes; then + USECXX11REGEX_TRUE= + USECXX11REGEX_FALSE='#' +else + USECXX11REGEX_TRUE='#' + USECXX11REGEX_FALSE= +fi + if test x$with_curl = xyes; then WITHCURL_TRUE= WITHCURL_FALSE='#' @@ -17538,6 +16982,14 @@ else WITHCURL_FALSE= fi + if test x$with_curl_sftp = xyes; then + WITHCURLSFTP_TRUE= + WITHCURLSFTP_FALSE='#' +else + WITHCURLSFTP_TRUE='#' + WITHCURLSFTP_FALSE= +fi + if test x$with_internalftplib = xyes; then INTERNALFTPLIB_TRUE= INTERNALFTPLIB_FALSE='#' @@ -17598,7 +17050,7 @@ fi # --------------------------------------------------------------------- # Final output # --------------------------------------------------------------------- -ac_config_files="$ac_config_files Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile utilities/diatheke/Makefile icu/Makefile sword.pc sword.spec" +ac_config_files="$ac_config_files Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -17627,13 +17079,13 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -17641,8 +17093,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -17664,12 +17116,23 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -17689,14 +17152,22 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -17706,161 +17177,103 @@ else fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_CPPUNIT_TRUE}" && test -z "${HAVE_CPPUNIT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CPPUNIT\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_CPPUNIT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_CPPUNIT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_LIBZ_TRUE}" && test -z "${HAVE_LIBZ_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBZ\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_LIBZ\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_LIBZ\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_ICU_TRUE}" && test -z "${HAVE_ICU_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ICU\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_ICU\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_ICU\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_ICUSWORD_TRUE}" && test -z "${HAVE_ICUSWORD_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ICUSWORD\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_ICUSWORD\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_ICUSWORD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_VSNPRINTF_TRUE}" && test -z "${HAVE_VSNPRINTF_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_VSNPRINTF\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_VSNPRINTF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_VSNPRINTF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USELUCENE_TRUE}" && test -z "${USELUCENE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"USELUCENE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"USELUCENE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"USELUCENE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SHAREDLIB_TRUE}" && test -z "${SHAREDLIB_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SHAREDLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SHAREDLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"SHAREDLIB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${INSTCONF_TRUE}" && test -z "${INSTCONF_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"INSTCONF\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"INSTCONF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"INSTCONF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USECXX11REGEX_TRUE}" && test -z "${USECXX11REGEX_FALSE}"; then + as_fn_error $? "conditional \"USECXX11REGEX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${WITHCURL_TRUE}" && test -z "${WITHCURL_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"WITHCURL\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"WITHCURL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"WITHCURL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${WITHCURLSFTP_TRUE}" && test -z "${WITHCURLSFTP_FALSE}"; then + as_fn_error $? "conditional \"WITHCURLSFTP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${INTERNALFTPLIB_TRUE}" && test -z "${INTERNALFTPLIB_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"INTERNALFTPLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"INTERNALFTPLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"INTERNALFTPLIB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_INTERNAL_REGEX_TRUE}" && test -z "${USE_INTERNAL_REGEX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"USE_INTERNAL_REGEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"USE_INTERNAL_REGEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"USE_INTERNAL_REGEX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CONFDEF_TRUE}" && test -z "${CONFDEF_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"CONFDEF\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"CONFDEF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"CONFDEF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_PKGCONF_TRUE}" && test -z "${USE_PKGCONF_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"USE_PKGCONF\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"USE_PKGCONF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"USE_PKGCONF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILDTESTS_TRUE}" && test -z "${BUILDTESTS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILDTESTS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILDTESTS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"BUILDTESTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILDUTILS_TRUE}" && test -z "${BUILDUTILS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILDUTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILDUTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"BUILDUTILS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILDEXAMPLES_TRUE}" && test -z "${BUILDEXAMPLES_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILDEXAMPLES\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILDEXAMPLES\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"BUILDEXAMPLES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -17870,17 +17283,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -17888,23 +17302,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -17912,7 +17318,13 @@ export as_nl as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -17923,7 +17335,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -17946,13 +17358,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -17962,15 +17367,16 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -17982,12 +17388,16 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -17999,7 +17409,89 @@ export LC_ALL LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -18013,8 +17505,12 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -18034,76 +17530,25 @@ $as_echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -18118,49 +17563,85 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -18170,13 +17651,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sword $as_me 1.6.2, which was -generated by GNU Autoconf 2.63. Invocation command line was +This file was extended by sword $as_me 1.7.2, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -18208,13 +17695,15 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -18233,16 +17722,18 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to . +sword home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sword config.status 1.6.2 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +sword config.status 1.7.2 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -18260,11 +17751,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -18278,27 +17774,29 @@ do ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -18306,11 +17804,10 @@ Try \`$0 --help' for more information." >&2 ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -18327,7 +17824,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -18361,186 +17858,212 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' -macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' -macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' -host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' -host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' -host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' -build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' -build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' -build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' -SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' -Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' -GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' -EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' -FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' -LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' -NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' -LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' -ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' -exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' -lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' -reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' -AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' -STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' -RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' -compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' -GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' -SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' -ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' -need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' -LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' -libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' -version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' -runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' -libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' -soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' -old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' -striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' +predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' +predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' +postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' +reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' +reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + # Quote evaled strings. -for var in SED \ +for var in AS \ +DLLTOOL \ +OBJDUMP \ +SHELL \ +ECHO \ +PATH_SEPARATOR \ +SED \ GREP \ EGREP \ FGREP \ @@ -18552,8 +18075,12 @@ lt_NL2SP \ reload_flag \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -18563,14 +18090,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -SHELL \ -ECHO \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -18584,9 +18111,7 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -18594,6 +18119,7 @@ variables_saved_for_relink \ libname_spec \ library_names_spec \ soname_spec \ +install_override_mode \ finish_eval \ old_striplib \ striplib \ @@ -18604,10 +18130,11 @@ predeps \ postdeps \ compiler_lib_search_path \ LD_CXX \ +reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_wl_CXX \ lt_prog_compiler_pic_CXX \ +lt_prog_compiler_wl_CXX \ lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ @@ -18617,9 +18144,7 @@ with_gnu_ld_CXX \ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ -fix_srcfile_path_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ @@ -18629,9 +18154,9 @@ postdep_objects_CXX \ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -18653,11 +18178,13 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec \ +reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ old_archive_from_expsyms_cmds_CXX \ @@ -18666,10 +18193,11 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ -prelink_cmds_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in +prelink_cmds_CXX \ +postlink_cmds_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -18677,12 +18205,6 @@ prelink_cmds_CXX; do esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` - ;; -esac - ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -18724,13 +18246,11 @@ do "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "examples/cmdline/Makefile") CONFIG_FILES="$CONFIG_FILES examples/cmdline/Makefile" ;; "utilities/diatheke/Makefile") CONFIG_FILES="$CONFIG_FILES utilities/diatheke/Makefile" ;; - "icu/Makefile") CONFIG_FILES="$CONFIG_FILES icu/Makefile" ;; "sword.pc") CONFIG_FILES="$CONFIG_FILES sword.pc" ;; + "include/swversion.h") CONFIG_FILES="$CONFIG_FILES include/swversion.h" ;; "sword.spec") CONFIG_FILES="$CONFIG_FILES sword.spec" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -18753,26 +18273,24 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -18780,7 +18298,13 @@ $debug || if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' @@ -18788,7 +18312,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -18797,24 +18321,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -18822,7 +18340,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -18836,7 +18354,7 @@ s/'"$ac_delim"'$// t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -18850,7 +18368,7 @@ s/.\{148\}// t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -18870,7 +18388,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -18902,23 +18420,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -18930,7 +18454,7 @@ fi # test -n "$CONFIG_FILES" # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -18942,13 +18466,11 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -19033,9 +18555,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -19048,9 +18568,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -19069,7 +18587,7 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -19078,12 +18596,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -19094,7 +18610,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -19106,10 +18622,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -19137,47 +18651,7 @@ $as_echo X"$ac_file" | q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -19234,7 +18708,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -19244,12 +18717,11 @@ ac_sed_dataroot=' /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -19259,7 +18731,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -19287,27 +18759,24 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -19316,27 +18785,21 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;} if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -19374,7 +18837,7 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -19382,7 +18845,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -19395,7 +18858,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -19429,21 +18892,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -19469,47 +18930,7 @@ $as_echo X"$file" | q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -19537,7 +18958,8 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;} # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -19570,13 +18992,13 @@ available_tags="CXX " # ### BEGIN LIBTOOL CONFIG # Assembler program. -AS=$AS +AS=$lt_AS # DLL creation program. -DLLTOOL=$DLLTOOL +DLLTOOL=$lt_DLLTOOL # Object dumper program. -OBJDUMP=$OBJDUMP +OBJDUMP=$lt_OBJDUMP # Which release of libtool.m4 was used? macro_version=$macro_version @@ -19594,6 +19016,15 @@ pic_mode=$pic_mode # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -19643,20 +19074,36 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == "file_magic". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -19665,6 +19112,9 @@ RANLIB=$lt_RANLIB old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + # A C compiler. LTCC=$lt_CC @@ -19683,14 +19133,14 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -# The name of the directory that contains temporary libtool files. -objdir=$objdir +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot -# An echo program that does not interpret backslashes. -ECHO=$lt_ECHO +# The name of the directory that contains temporary libtool files. +objdir=$objdir # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD @@ -19698,6 +19148,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -19754,6 +19207,9 @@ library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -19793,6 +19249,10 @@ striplib=$lt_striplib # The linker used to build libraries. LD=$lt_LD +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -19805,12 +19265,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -19860,10 +19320,6 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -19897,9 +19353,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -19915,6 +19368,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -19961,212 +19417,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac - - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi + + + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -20178,6 +19591,10 @@ _LT_EOF # The linker used to build libraries. LD=$lt_LD_CXX +# How to create reloadable object files. +reload_flag=$lt_reload_flag_CXX +reload_cmds=$lt_reload_cmds_CXX + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds_CXX @@ -20190,12 +19607,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic_CXX +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX @@ -20245,10 +19662,6 @@ no_undefined_flag=$lt_no_undefined_flag_CXX # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX @@ -20282,9 +19695,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path_CXX - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -20300,6 +19710,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds_CXX + # Specify filename containing input files. file_list_spec=$lt_file_list_spec_CXX @@ -20329,15 +19742,12 @@ _LT_EOF done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -20358,107 +19768,32 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi echo echo - - text=`$ECHO $seo "Configuration:" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec "Configuration:" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " DEBUG: $enable_debug" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " DEBUG: $enable_debug" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " PROFILE: $enable_profile" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " PROFILE: $enable_profile" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " BUILD TESTS: $enable_tests" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " BUILD TESTS: $enable_tests" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " BUILD EXAMPLES: $enable_examples" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " BUILD EXAMPLES: $enable_examples" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " BUILD UTILITIES: $enable_utilities" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " BUILD UTILITIES: $enable_utilities" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " LIBZ: $with_zlib" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " LIBZ: $with_zlib" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " ICU: $with_icu" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " ICU: $with_icu" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " ICUSWORD: $with_icusword" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " ICUSWORD: $with_icusword" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " CURL: $with_curl" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " CURL: $with_curl" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " INTERNAL FTPLIB: $with_internalftplib" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " INTERNAL FTPLIB: $with_internalftplib" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " INTERNAL REGEX: $with_internalregex" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " INTERNAL REGEX: $with_internalregex" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - - - text=`$ECHO $seo " CLUCENE: $with_clucene" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec " CLUCENE: $with_clucene" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - $as_echo "$as_me:$LINENO: $text" >&5 - +echo "Configuration:" +echo " LIBDIR: $libdir" +echo " DEBUG: $enable_debug" +echo " PROFILE: $enable_profile" +echo " BUILD TESTS: $enable_tests" +echo " BUILD EXAMPLES: $enable_examples" +echo " BUILD UTILITIES: $enable_utilities" +echo " LIBZ: $with_zlib" +echo " ICU: $with_icu" +echo " ICUSWORD: $with_icusword" +echo " CXX11REGEX: $with_cxx11regex" +echo " CURL: $with_curl" +echo " CURL SFTP: $with_curl_sftp" +echo " INTERNAL FTPLIB: $with_internalftplib" +echo " INTERNAL REGEX: $with_internalregex" +echo " CLUCENE: $with_clucene" echo echo diff --git a/configure.ac b/configure.ac index 44628cf..bb687cb 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ # Version change: Change line 8 only ! # Change it immediately after a release -AC_INIT(sword, 1.6.2, sword-bugs@crosswire.org, sword, http://crosswire.org/sword) +AC_INIT(sword, 1.7.2, sword-bugs@crosswire.org, sword, http://crosswire.org/sword) AC_CONFIG_SRCDIR(sword.bmp) AC_PREREQ(2.52) AC_REVISION($Revision: 1.45 $) @@ -37,11 +37,12 @@ AC_PROG_INSTALL AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL -COLORED_ECHO_INIT - AC_C_BIGENDIAN +PKG_CHECK_MODULES([CLUCENE2], [libclucene-core >= 2.3],,true) +if test "x$CLUCENE2_LIBS" = x; then ACX_CLUCENE +fi # --------------------------------------------------------------------- # With options @@ -54,12 +55,16 @@ AC_ARG_WITH(icusword, AC_HELP_STRING([--with-icusword],[use custom SWORD ICU (default=no)]),,with_icusword=no) AC_ARG_WITH(conf, AC_HELP_STRING([--with-conf],[install a new sword.conf (default=yes)]),,with_conf=yes) +AC_ARG_WITH(cxx11regex, + AC_HELP_STRING([--with-cxx11regex],[build regex support using c++11 regex (default=no)]),,with_cxx11regex=no) AC_ARG_WITH(curl, AC_HELP_STRING([--with-curl],[build install manager support using libcurl (default=yes)]),,with_curl=yes) +AC_ARG_WITH(curl_sftp, + AC_HELP_STRING([--with-curl_sftp],[build install manager support using libcurl+sftp (requires --with-curl, default=yes)]),,with_curl_sftp=yes) #AC_ARG_WITH(lucene, # AC_HELP_STRING([--with-lucene],[include lucene support for searching (default=no)]),,with_lucene=no) AC_ARG_WITH([internalregex], - AS_HELP_STRING([--with-internalregex], [Compile using SWORD's internal copy of regex])) + AS_HELP_STRING([--with-internalregex], [Compile using SWORDs internal copy of regex])) # --------------------------------------------------------------------- @@ -94,15 +99,18 @@ if test x$enable_debug = xyes; then AM_CFLAGS="-O0 -Wall -Werror" fi if test x$ac_cv_prog_cxx_g = xyes; then - AM_CXXFLAGS="-g3 -O0 -Wall -Werror" + AM_CXXFLAGS="-g3 -O0 -Wall -Werror -Woverloaded-virtual" else - AM_CXXFLAGS="-O0 -Wall -Werror" + AM_CXXFLAGS="-O0 -Wall -Werror -Woverloaded-virtual" fi else AM_CFLAGS="-O3" AM_CXXFLAGS="-O3" fi +AM_CFLAGS="$AM_CFLAGS -fPIC" +AM_CXXFLAGS="$AM_CXXFLAGS -fPIC" + # --------------------------------------------------------------------- # Check libraries # --------------------------------------------------------------------- @@ -168,11 +176,6 @@ ICU_VER= ICU_LIBS= ICU_IOLIBS= if test x$with_icu = xyes; then - AC_PATH_PROG([PKGDATA], [pkgdata],[/usr/bin/pkgdata],[$PATH:/usr/sbin:.]) - AC_PATH_PROG([GENCCODE], [genccode], [/usr/bin/genccode], [$PATH:/usr/sbin:.]) - AC_PATH_PROG([GENCMN], [gencmn], [/usr/bin/gencmn], [$PATH:/usr/sbin:.]) - AC_PATH_PROG([GENRB], [genrb], [/usr/bin/genrb], [$PATH:/usr/sbin:.]) - AC_PATH_PROG(ICU_CONFIG, icu-config, no) # The icu-config script was new in icu 2.2 if test "$ICU_CONFIG" = "no" ; then @@ -209,7 +212,7 @@ AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25" if test x$enable_warnings = xyes; then AM_CFLAGS="$AM_CFLAGS -Werror" - AM_CXXFLAGS="$AM_CXXFLAGS -Werror" + AM_CXXFLAGS="$AM_CXXFLAGS -Werror -Woverloaded-virtual" fi if test x$enable_profile = xyes; then @@ -233,6 +236,7 @@ if test x$with_curl = xyes; then echo "*** The curl-config script installed by curl could not be found" echo "*** compiling without libcurl support" with_curl=no + with_curl_sftp=no with_internalftplib=yes else echo "curl found - remote install options available" @@ -241,25 +245,48 @@ if test x$with_curl = xyes; then AM_CXXFLAGS="$AM_CXXFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS" AM_CFLAGS="$AM_CFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS" LIBS="$LIBS $CURL_LIBS" + if test x$with_curl_sftp = xyes; then + if test x`$CURL_CONFIG --protocols|grep SFTP|wc -l` = x1; then + AM_CXXFLAGS="$AM_CXXFLAGS -DCURLSFTPAVAILABLE" + AM_CFLAGS="$AM_CFLAGS -DCURLSFTPAVAILABLE" + else + with_curl_sftp=no; + fi + fi fi else with_curl=no; + with_curl_sftp=no; with_internalftplib=yes fi +if test x$with_cxx11regex = xyes; then + AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11 -ftemplate-depth=100" +fi + # --------------------------------------------------------------------- # Check for clucene for lucene searching support # --------------------------------------------------------------------- +# NOTE the $libdir hack at the end of the c[xx]flags. Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/ with_clucene=no -if test -z "$CLUCENE_LIBS"; then - echo "lucene searching options not available" +if test "x$CLUCENE2_LIBS" != x; then + echo "clucene 2.x found - lucene searching options available" + AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir" + AM_CFLAGS="$AM_CFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir" + LIBS="$LIBS $CLUCENE2_LIBS" + with_clucene="yes 2.x" + CLUCENE_LIBS="$CLUCENE_LIBS $CLUCENE2_LIBS" else - echo "lucene found - lucene searching options available" - AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE_CXXFLAGS -DUSELUCENE" - AM_CFLAGS="$AM_CFLAGS -DUSELUCENE" +if test "x$CLUCENE_LIBS" != x; then + echo "lucene 0.x found - lucene searching options available" + AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE_CXXFLAGS -DUSELUCENE -I$libdir" + AM_CFLAGS="$AM_CFLAGS -DUSELUCENE -I$libdir" LIBS="$LIBS $CLUCENE_LIBS" - with_clucene="yes" + with_clucene="yes 0.x" +else + echo "lucene searching options not available" +fi fi AC_CHECK_FUNCS(vsnprintf, [have_vsnprintf="yes"]) @@ -274,6 +301,33 @@ else dir_confdef="yes" fi +changequote(<<,>>) +V1=`expr $VERSION : '\([0-9]*\)\.[0-9]*\.*[0-9]*\.*[0-9]*'` +V2=`expr $VERSION : '[0-9]*\.\([0-9]*\)\.*[0-9]*\.*[0-9]*'` +V3=`expr $VERSION : '[0-9]*\.[0-9]*\.*\([0-9]*\)\.*[0-9]*'` +V4=`expr $VERSION : '[0-9]*\.[0-9]*\.*[0-9]*\.*\([0-9]*\)'` +changequote([,]) + +SWORD_VERSION_STR=$VERSION +SWORD_VERSION_MAJOR=$V1 +SWORD_VERSION_MINOR=$V2 +SWORD_VERSION_MICRO=$V3 +if test "$V4" = "" ; then V4=0; fi +SWORD_VERSION_NANO=$V4 + +if test "$V2" -le 9 ; then V2=0$V2 ; fi +if test "$V3" -le 9 ; then V3=00$V3 ; elif test "$V3" -le 99 ; then V3=0$V3 ; fi +if test "$V4" -le 9 ; then V4=00$V4 ; elif test "$V4" -le 99 ; then V4=0$V4 ; fi +SWORD_VERSION_NUM=$V1$V2$V3$V4 + +AC_SUBST(SWORD_VERSION_NUM) +AC_SUBST(SWORD_VERSION_STR) +AC_SUBST(SWORD_VERSION_MAJOR) +AC_SUBST(SWORD_VERSION_MINOR) +AC_SUBST(SWORD_VERSION_MICRO) +AC_SUBST(SWORD_VERSION_NANO) + + # --------------------------------------------------------------------- # Substitute variables into makefiles @@ -288,9 +342,8 @@ AC_SUBST(ICU_VER) AC_SUBST(enable_debug) AC_SUBST(enable_profile) -# TODO: WHY ARE WE SUBST CXXFLAGS BUT NOT CFLAGS? And why, when I uncomment out the cflags subst do we get compile errors? AC_SUBST(AM_CXXFLAGS) -#AC_SUBST(AM_CFLAGS) +AC_SUBST(AM_CFLAGS) AC_SUBST(target_cpu) AC_SUBST(target_vendor) @@ -300,25 +353,26 @@ AC_SUBST(target_system) AC_SUBST(target_mingw32) AC_SUBST(CURL_LIBS) -AC_SUBST(CLUCENE_LIBS) AC_SUBST(ICU_LIBS) AC_SUBST(ICU_IOLIBS) +AC_SUBST(CLUCENE_LIBS) # --------------------------------------------------------------------- # Conditional variables # --------------------------------------------------------------------- -# don't #ifdef in .cpp files HAVE_ stuff because non-ac compiles won't be able to switch them since we include config.h AM_CONDITIONAL(HAVE_LIBZ, test x$with_zlib = xyes) AM_CONDITIONAL(HAVE_ICU, test x$with_icu = xyes) AM_CONDITIONAL(HAVE_ICUSWORD, test x$with_icusword = xyes) AM_CONDITIONAL(HAVE_VSNPRINTF, test x$have_vsnprintf = xyes) -AM_CONDITIONAL(USELUCENE, test x$with_clucene = xyes) +AM_CONDITIONAL(USELUCENE, test "x$with_clucene" != xno) AM_CONDITIONAL(SHAREDLIB, test x$enable_shared = xyes) AM_CONDITIONAL(INSTCONF, test x$with_conf = xyes) +AM_CONDITIONAL(USECXX11REGEX, test x$with_cxx11regex = xyes) AM_CONDITIONAL(WITHCURL, test x$with_curl = xyes) +AM_CONDITIONAL(WITHCURLSFTP, test x$with_curl_sftp = xyes) AM_CONDITIONAL(INTERNALFTPLIB, test x$with_internalftplib = xyes) AM_CONDITIONAL(USE_INTERNAL_REGEX, test x$with_internalregex = xyes) AM_CONDITIONAL(CONFDEF, test x$dir_confdef = xyes) @@ -330,24 +384,27 @@ AM_CONDITIONAL(BUILDEXAMPLES, test x$enable_examples = xyes) # --------------------------------------------------------------------- # Final output # --------------------------------------------------------------------- -AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile utilities/diatheke/Makefile icu/Makefile sword.pc sword.spec) +AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec) AC_OUTPUT echo echo -COLORED_ECHO([Configuration:]) -COLORED_ECHO([ DEBUG: $enable_debug]) -COLORED_ECHO([ PROFILE: $enable_profile]) -COLORED_ECHO([ BUILD TESTS: $enable_tests]) -COLORED_ECHO([ BUILD EXAMPLES: $enable_examples]) -COLORED_ECHO([ BUILD UTILITIES: $enable_utilities]) -COLORED_ECHO([ LIBZ: $with_zlib]) -COLORED_ECHO([ ICU: $with_icu]) -COLORED_ECHO([ ICUSWORD: $with_icusword]) -COLORED_ECHO([ CURL: $with_curl]) -COLORED_ECHO([ INTERNAL FTPLIB: $with_internalftplib]) -COLORED_ECHO([ INTERNAL REGEX: $with_internalregex]) -COLORED_ECHO([ CLUCENE: $with_clucene]) +echo "Configuration:" +echo " LIBDIR: $libdir" +echo " DEBUG: $enable_debug" +echo " PROFILE: $enable_profile" +echo " BUILD TESTS: $enable_tests" +echo " BUILD EXAMPLES: $enable_examples" +echo " BUILD UTILITIES: $enable_utilities" +echo " LIBZ: $with_zlib" +echo " ICU: $with_icu" +echo " ICUSWORD: $with_icusword" +echo " CXX11REGEX: $with_cxx11regex" +echo " CURL: $with_curl" +echo " CURL SFTP: $with_curl_sftp" +echo " INTERNAL FTPLIB: $with_internalftplib" +echo " INTERNAL REGEX: $with_internalregex" +echo " CLUCENE: $with_clucene" echo echo diff --git a/depcomp b/depcomp index df8eea7..4ebd5b3 100755 --- a/depcomp +++ b/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ scriptversion=2009-04-28.21; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ icc) sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ makedepend) touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/doc/Doxyfile b/doc/Doxyfile index ca7c1ca..49901f5 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -55,7 +55,7 @@ PROJECT_NAME = "The SWORD Project" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "1.6.2" +PROJECT_NUMBER = "1.7.2" # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/doc/Makefile.am b/doc/Makefile.am index c0ce3cb..4fff12c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,4 @@ swdocdir = $(top_srcdir)/doc -EXTRA_DIST += $(swdocdir)/greektrans.txt EXTRA_DIST += $(swdocdir)/translation-template.conf diff --git a/doc/README b/doc/README index ca0a00c..2a781bf 100644 --- a/doc/README +++ b/doc/README @@ -1,9 +1,10 @@ See README and INSTALL in root directory of the sword package No real good docs for developers yet, but see tutorials and primers on -our website at: +our website and wiki at: -http://www.crosswire.org +http://www.crosswire.org/sword +http://www.crosswire.org/wiki Thanks! More to come, Lord willing! diff --git a/doc/greektrans.txt b/doc/greektrans.txt deleted file mode 100644 index 84851c9..0000000 --- a/doc/greektrans.txt +++ /dev/null @@ -1,81 +0,0 @@ - - TRANSLITERATING GREEK into ASCII - - B-Greek has from the beginning allowed every poster to use -any scheme he/she found comfortable, since we all could usually -figure out what text was meant. For those who wish some -guidance, a generally accepted scheme has evolved on the List, -with two or three matters still not fully settled. - -(1) CAPITALS are used when transliterating Greek letters, on a -one-to-one basis, reserving lower-case {i} to represent -iota-subscript and lower-case {h} to represent rough breathing. -No accents, no smooth breathings. And no distinction between -medial and final Sigma. - -(2) If accents are really necessary, to distinguish otherwise -identical words, acute is represented by {/}, grave by {\}, and -circumflex either by tilde {~ [preferable]} or {=} -- always -AFTER the vowel over which it would be written. - -(3) A few characters without Roman single-character form are -usually done with almost-look-alike Roman characters otherwise -unused: - - Theta = Q - Eta = H - Psi = Y (upsilon is always U) - Omega = W - -(4) Digraphs (in the usual Roman transliteration) are handled in -three different ways to avoid two-letter transliterations, all -involving otherwise-unused Roman letters: - - THeta uses Q ("look-alike", as above). - PSi uses Y ("look-alike", as above). - PHi uses F (sound equivalence). - CHi uses C (first letter of traditional digraph). - -(5) Xi and Chi: There being no single Roman letter for "Xi" -other than X, the "look-alike" use of X for "Chi" is confusing, -though some use it. And some seem to like to use C for "Sigma." -Since S is otherwise unused, and poses no confusion whatever, -using C for "Sigma" makes for problems in decoding back to Greek, -especially since it is the only letter available for "Chi" -(unless X is used, thus posing a problem for "Xi"). And -occasionally someone uses P for "Rho", making problems for how to -represent "Pi". - -***************************************************************** - - Usual in Traditional - B-Greek (uses macrons and digraphs) - - -alpha A a -beta B b -gamma G g -delta D d -epsilon E e -zeta Z z -eta H e with macron -theta Q th -iota I i -kappa K k -lambda L l -mu M m -nu N n -xi X x -omicron O o -pi P p -rho R r -sigma S s -tau T t -upsilon U u -phi F ph -chi C ch -psi Y ps -omega W o with macron - -rough breathing h h -iota-subscript i (i) diff --git a/examples/Makefile.in b/examples/Makefile.in index 1c30393..31f1f33 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,33 +79,71 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = examples -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ - $(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -93,7 +175,9 @@ am__relativize = \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -103,6 +187,8 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@ +CLUCENE2_LIBS = @CLUCENE2_LIBS@ CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@ CLUCENE_LIBS = @CLUCENE_LIBS@ CPP = @CPP@ @@ -128,9 +214,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GENCCODE = @GENCCODE@ -GENCMN = @GENCMN@ -GENRB = @GENRB@ GREP = @GREP@ ICU_CONFIG = @ICU_CONFIG@ ICU_IOLIBS = @ICU_IOLIBS@ @@ -151,6 +234,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -163,20 +247,29 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGDATA = @PKGDATA@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@ +SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@ +SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@ +SWORD_VERSION_NANO = @SWORD_VERSION_NANO@ +SWORD_VERSION_NUM = @SWORD_VERSION_NUM@ +SWORD_VERSION_STR = @SWORD_VERSION_STR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -213,7 +306,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -282,22 +374,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -312,57 +407,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -378,12 +428,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -395,15 +440,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -412,6 +453,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -448,13 +504,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -489,10 +542,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -570,22 +628,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/examples/classes/Makefile b/examples/classes/Makefile index 4cef07f..aca68d0 100644 --- a/examples/classes/Makefile +++ b/examples/classes/Makefile @@ -1,10 +1,10 @@ -TARGETS= ciphercng swmgrex +TARGETS= ciphercng swmgrex verseranges lastVerseInChapter verseposition showchapter all: $(TARGETS) clean: rm $(TARGETS) .cpp: - g++ -O0 -g `pkg-config --cflags sword` $< -o $@ `pkg-config --libs sword` + g++ -O0 -g -Wall -Werror `pkg-config --cflags sword` $< -o $@ `pkg-config --libs sword` diff --git a/examples/classes/README b/examples/classes/README new file mode 100644 index 0000000..53a65b7 --- /dev/null +++ b/examples/classes/README @@ -0,0 +1,4 @@ +These examples use a standard Makefile which exemplifies how you can compile +your own code against the SWORD engine. +This does, however, require SWORD to be installed before a 'make' in this +folder will be successful. diff --git a/examples/classes/ciphercng.cpp b/examples/classes/ciphercng.cpp index 9859341..f1ce5e8 100644 --- a/examples/classes/ciphercng.cpp +++ b/examples/classes/ciphercng.cpp @@ -1,13 +1,13 @@ /****************************************************************************** * - * This example demonstrates how to change the cipher key of a module - * The change is only in effect for this run. This DOES NOT change the - * cipherkey in the module's .conf file. + * ciphercng.cpp - This example demonstrates how to change the cipher key + * of a module. The change is only in effect for this + * run. This DOES NOT change the cipherkey in the + * module's .conf file. * + * $Id: ciphercng.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * $Id: ciphercng.cpp 2504 2010-01-26 16:46:19Z scribe $ - * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -33,6 +33,7 @@ using namespace sword; using namespace std; + int main(int argc, char **argv) { if (argc != 2) { @@ -56,13 +57,13 @@ int main(int argc, char **argv) { while (true) { cout << "\nModule text:\n"; module->setKey("1jn 1:9"); - cout << "[ " << module->KeyText() << " ]\n"; - cout << (const char *)*module; + cout << "[ " << module->getKeyText() << " ]\n"; + cout << module->renderText(); cout << "\n\nEnter new cipher key: "; cin >> key; cout << "\nSetting key to: " << key; manager.setCipherKey(argv[1], key.c_str()); } - + return 0; } diff --git a/examples/classes/lastVerseInChapter.cpp b/examples/classes/lastVerseInChapter.cpp new file mode 100644 index 0000000..aac905c --- /dev/null +++ b/examples/classes/lastVerseInChapter.cpp @@ -0,0 +1,56 @@ +/****************************************************************************** + * + * lastVerseInChapter.cpp - This example demonstrates how to navigate + * verses using VerseKey. It uselessly iterates + * every chapter of the KJV, finds the last verse + * and prints out the sole verse in the KJV which + * ends in a ',' -- just for fun. + * + * $Id: lastVerseInChapter.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include +#include +#include + + +using namespace sword; +using namespace std; + + +int main(int argc, char **argv) { + + SWMgr library; + + SWModule *book = library.getModule("KJV"); + + VerseKey *vk = (VerseKey *) book->getKey(); + for (;!vk->popError();vk->setChapter(vk->getChapter()+1)) { + vk->setVerse(vk->getVerseMax()); + SWBuf text = book->stripText(); + text = text.trim(); + if (text.endsWith(",")) { + cout << vk->getText() << ":\n\n"; + cout << text << endl; + } + } + + return 0; +} + diff --git a/examples/classes/showchapter.cpp b/examples/classes/showchapter.cpp new file mode 100644 index 0000000..f170b51 --- /dev/null +++ b/examples/classes/showchapter.cpp @@ -0,0 +1,57 @@ +/****************************************************************************** + * + * showchapter.cpp - + * + * $Id: showchapter.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include +#include +#include + + +using namespace sword; +using namespace std; + + +int main(int argc, char **argv) { + + SWMgr library; + SWModule *kjv = library.getModule("KJV"); + + kjv->setKey(argc > 1 ? argv[1] : "Jn.3.16"); + + VerseKey *key = (VerseKey *)kjv->getKey(); + + int curVerse = key->getVerse(); + int curChapter = key->getChapter(); + int curBook = key->getBook(); + + for (key->setVerse(1); + (key->getBook() == curBook) && + (key->getChapter() == curChapter) && + !kjv->popError(); + (*kjv)++) { + if (key->getVerse() == curVerse) cout << "* "; + cout << key->getVerse() << " " << kjv->stripText() << "\n"; + } + + return 0; +} + diff --git a/examples/classes/swmgrex.cpp b/examples/classes/swmgrex.cpp index 9978a7b..7fc9f73 100644 --- a/examples/classes/swmgrex.cpp +++ b/examples/classes/swmgrex.cpp @@ -1,19 +1,18 @@ /****************************************************************************** - * Class SWMgr manages installed modules for a frontend. - * SWMgr reads a mods.conf file to discover its information. - * It then instantiates the correct decendent of SWModule for each - * module entry in mods.conf - * The developer may use this class to query what modules are installed - * and to retrieve an (SWModule *) for any one of these modules * - * SWMgr makes its modules available as an STL Map. - * The Map definition is typedef'ed as ModMap - * ModMap consists of: FIRST : SWBuf moduleName - * SECOND: SWModule *module + * swmgrex.cpp - Class SWMgr manages installed modules for a frontend. + * The developer may use this class to query what modules + * are installed and to retrieve an (SWModule *) for any + * one of these modules * - * $Id: swmgrex.cpp 2327 2009-04-22 11:42:33Z scribe $ + * SWMgr makes its modules available as an STL Map. + * The Map definition is typedef'ed as ModMap + * ModMap consists of: FIRST : SWBuf moduleName + * SECOND: SWModule *module * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swmgrex.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -34,10 +33,13 @@ #include #include + using namespace sword; using namespace std; -main() { + +int main(int argc, char **argv) { + SWMgr manager; // create a default manager that looks in the current directory for mods.conf cout << "\nInstalled Modules:\n\n"; @@ -50,14 +52,14 @@ main() { SWBuf modName = (*modIterator).first; // mod.conf section name (stored in module->Name()) SWModule *module = (*modIterator).second; - cout << modName << "(" << module->Name() << ") | " << module->Type() << "\n"; + cout << modName << "(" << module->getName() << ") | " << module->getType() << "\n"; } // Print out a verse from the first module: - cout << "\n" << manager.Modules.begin()->second->KeyText() << ":\n"; - cout << (const char *)(*manager.Modules.begin()->second); - cout << " (" << manager.Modules.begin()->second->Name() << ")\n"; + cout << "\n" << manager.Modules.begin()->second->getKeyText() << ":\n"; + cout << manager.Modules.begin()->second->renderText(); + cout << " (" << manager.Modules.begin()->second->getName() << ")\n"; // Print out the same verse from the second module (less confusing): @@ -66,9 +68,11 @@ main() { SWModule *mod = modIterator->second; - cout << "\n" << mod->KeyText() << ":\n"; + cout << "\n" << mod->getKeyText() << ":\n"; // cout << (const char *)(*mod); // we could do this, the same as above - mod->Display(); // instead of casting mod to const char * to get its contents, we'll call the default display method that writes to stdout; - cout << " (" << mod->Name() << ")\n\n"; + mod->display(); // instead of casting mod to const char * to get its contents, we'll call the default display method that writes to stdout; + cout << " (" << mod->getName() << ")\n\n"; + + return 0; } diff --git a/examples/classes/verseposition.cpp b/examples/classes/verseposition.cpp new file mode 100644 index 0000000..8e63cb5 --- /dev/null +++ b/examples/classes/verseposition.cpp @@ -0,0 +1,51 @@ +/****************************************************************************** + * + * verseposition.cpp - + * + * $Id: verseposition.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include +#include +#include + + +using namespace sword; +using namespace std; + + +int main(int argc, char **argv) { + + const char *modName = "HunKar"; + SWMgr library; + SWModule *book = library.getModule(modName); + if (!book) { + cerr << "Can't find module: " << modName << endl; + return -1; + } + VerseKey* key = ((VerseKey *)book->getKey()); + + key->setIntros(true); + book->setSkipConsecutiveLinks(true); + book->setPosition(TOP); + + cout << *key << endl; + + return 0; +} diff --git a/examples/classes/verseranges.cpp b/examples/classes/verseranges.cpp new file mode 100644 index 0000000..557855a --- /dev/null +++ b/examples/classes/verseranges.cpp @@ -0,0 +1,127 @@ +/****************************************************************************** + * + * verseranges.cpp - This example demonstrates how to work with contiguous + * verse ranges using VerseKey + * + * $Id: verseranges.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include + +#include +#include +#include + + +using namespace sword; +using namespace std; + + +int main(int argc, char **argv) { + + cout << "\n"; + + const char *modName = "KJVA"; + SWMgr manager; + SWModule *bible = manager.getModule(modName); + if (!bible) { + cout << modName << " not installed for example. Please install.\n\n"; + exit(-1); + } + + VerseKey *vk = (VerseKey *)bible->createKey(); + + // let's set verse ranges for a variety of different contiguous regions + + // set a verse range for the whole Bible + vk->setLowerBound(*vk); // vk initially points to TOP, so we don't need to set position first + vk->setPosition(BOTTOM); + vk->setUpperBound(*vk); + cout << vk->getRangeText() << "\n"; + + + vk->clearBounds(); + + + // Old Testament + vk->setPosition(TOP); + vk->setLowerBound(*vk); + + vk->setTestament(2); + (*vk)--; + + vk->setUpperBound(*vk); + cout << vk->getRangeText() << "\n"; + + + vk->clearBounds(); + + + // New Testament + vk->setPosition(TOP); + vk->setTestament(2); + vk->setLowerBound(*vk); + vk->setPosition(BOTTOM); + vk->setUpperBound(*vk); + cout << vk->getRangeText() << "\n"; + + + vk->clearBounds(); + + + // Current Book + vk->setText("John 3:16"); + vk->setChapter(1); vk->setVerse(1); + vk->setLowerBound(*vk); + vk->setChapter(vk->getChapterMax()); vk->setVerse(vk->getVerseMax()); + vk->setUpperBound(*vk); + cout << vk->getRangeText() << "\n"; + + + // ------------------------- + // Shorter syntax using the parser and based on book names, and requires intimate knowledge of VersificationMgr + // You're probably better off using the above code, but this is here for completeness + // + const VersificationMgr::System *refSys = VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(vk->getVersificationSystem()); + + + // whole Bible + VerseKey vkBible(refSys->getBook(0)->getOSISName(), refSys->getBook(refSys->getBookCount()-1)->getOSISName(), refSys->getName()); + cout << vkBible.getRangeText() << "\n"; + + // OT + VerseKey vkOT(refSys->getBook(0)->getOSISName(), refSys->getBook(refSys->getBMAX()[0]-1)->getOSISName(), refSys->getName()); + cout << vkOT.getRangeText() << "\n"; + + // NT + VerseKey vkNT(refSys->getBook(refSys->getBMAX()[0])->getOSISName(), refSys->getBook(refSys->getBookCount()-1)->getOSISName(), refSys->getName()); + cout << vkNT.getRangeText() << "\n"; + + // Current Book + vk->setText("John 3:16"); + VerseKey vkCurrentBook(vk->getBookName(), vk->getBookName(), refSys->getName()); + cout << vkCurrentBook.getRangeText() << "\n"; + + + delete vk; + + cout << endl; + + return 0; +} + diff --git a/examples/cmdline/CMakeLists.txt b/examples/cmdline/CMakeLists.txt index 922c2d8..bfbb995 100644 --- a/examples/cmdline/CMakeLists.txt +++ b/examples/cmdline/CMakeLists.txt @@ -3,6 +3,7 @@ # SWORD_BUILD_EXAMPLES="Yes". These will not be installed, so don't worry about # that. # +MESSAGE(STATUS "\n-- CONFIGURING LIBRARY EXAMPLES") SET(example_PROGRAMS listoptions lookup diff --git a/examples/cmdline/Makefile.am b/examples/cmdline/Makefile.am index e7409dd..1b14b67 100644 --- a/examples/cmdline/Makefile.am +++ b/examples/cmdline/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = 1.6 -INCLUDES = -I $(top_srcdir)/include +AM_CPPFLAGS = -I $(top_srcdir)/include if USE_INTERNAL_REGEX -INCLUDES += -I$(top_srcdir)/include/internal/regex +AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex endif LDADD = $(top_builddir)/lib/libsword.la diff --git a/examples/cmdline/Makefile.in b/examples/cmdline/Makefile.in index fe4ca69..a3cb2f4 100644 --- a/examples/cmdline/Makefile.in +++ b/examples/cmdline/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -40,13 +84,14 @@ noinst_PROGRAMS = lookup$(EXEEXT) search$(EXEEXT) \ threaded_search$(EXEEXT) listoptions$(EXEEXT) \ verserangeparse$(EXEEXT) outplain$(EXEEXT) outrender$(EXEEXT) subdir = examples/cmdline -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ - $(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -58,6 +103,10 @@ am_listoptions_OBJECTS = listoptions.$(OBJEXT) listoptions_OBJECTS = $(am_listoptions_OBJECTS) listoptions_LDADD = $(LDADD) listoptions_DEPENDENCIES = $(top_builddir)/lib/libsword.la +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am_lookup_OBJECTS = lookup.$(OBJEXT) lookup_OBJECTS = $(am_lookup_OBJECTS) lookup_LDADD = $(LDADD) @@ -81,31 +130,76 @@ am_verserangeparse_OBJECTS = verserangeparse.$(OBJEXT) verserangeparse_OBJECTS = $(am_verserangeparse_OBJECTS) verserangeparse_LDADD = $(LDADD) verserangeparse_DEPENDENCIES = $(top_builddir)/lib/libsword.la +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(listoptions_SOURCES) $(lookup_SOURCES) $(outplain_SOURCES) \ $(outrender_SOURCES) $(search_SOURCES) \ $(threaded_search_SOURCES) $(verserangeparse_SOURCES) DIST_SOURCES = $(listoptions_SOURCES) $(lookup_SOURCES) \ $(outplain_SOURCES) $(outrender_SOURCES) $(search_SOURCES) \ $(threaded_search_SOURCES) $(verserangeparse_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -115,6 +209,8 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@ +CLUCENE2_LIBS = @CLUCENE2_LIBS@ CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@ CLUCENE_LIBS = @CLUCENE_LIBS@ CPP = @CPP@ @@ -140,9 +236,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GENCCODE = @GENCCODE@ -GENCMN = @GENCMN@ -GENRB = @GENRB@ GREP = @GREP@ ICU_CONFIG = @ICU_CONFIG@ ICU_IOLIBS = @ICU_IOLIBS@ @@ -163,6 +256,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -175,20 +269,29 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGDATA = @PKGDATA@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@ +SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@ +SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@ +SWORD_VERSION_NANO = @SWORD_VERSION_NANO@ +SWORD_VERSION_NUM = @SWORD_VERSION_NUM@ +SWORD_VERSION_STR = @SWORD_VERSION_STR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -225,7 +328,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -252,7 +354,7 @@ with_icu = @with_icu@ with_icusword = @with_icusword@ with_zlib = @with_zlib@ AUTOMAKE_OPTIONS = 1.6 -INCLUDES = -I $(top_srcdir)/include $(am__append_1) +AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1) LDADD = $(top_builddir)/lib/libsword.la lookup_SOURCES = lookup.cpp search_SOURCES = search.cpp @@ -305,27 +407,34 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -listoptions$(EXEEXT): $(listoptions_OBJECTS) $(listoptions_DEPENDENCIES) + +listoptions$(EXEEXT): $(listoptions_OBJECTS) $(listoptions_DEPENDENCIES) $(EXTRA_listoptions_DEPENDENCIES) @rm -f listoptions$(EXEEXT) - $(CXXLINK) $(listoptions_OBJECTS) $(listoptions_LDADD) $(LIBS) -lookup$(EXEEXT): $(lookup_OBJECTS) $(lookup_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(listoptions_OBJECTS) $(listoptions_LDADD) $(LIBS) + +lookup$(EXEEXT): $(lookup_OBJECTS) $(lookup_DEPENDENCIES) $(EXTRA_lookup_DEPENDENCIES) @rm -f lookup$(EXEEXT) - $(CXXLINK) $(lookup_OBJECTS) $(lookup_LDADD) $(LIBS) -outplain$(EXEEXT): $(outplain_OBJECTS) $(outplain_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(lookup_OBJECTS) $(lookup_LDADD) $(LIBS) + +outplain$(EXEEXT): $(outplain_OBJECTS) $(outplain_DEPENDENCIES) $(EXTRA_outplain_DEPENDENCIES) @rm -f outplain$(EXEEXT) - $(CXXLINK) $(outplain_OBJECTS) $(outplain_LDADD) $(LIBS) -outrender$(EXEEXT): $(outrender_OBJECTS) $(outrender_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(outplain_OBJECTS) $(outplain_LDADD) $(LIBS) + +outrender$(EXEEXT): $(outrender_OBJECTS) $(outrender_DEPENDENCIES) $(EXTRA_outrender_DEPENDENCIES) @rm -f outrender$(EXEEXT) - $(CXXLINK) $(outrender_OBJECTS) $(outrender_LDADD) $(LIBS) -search$(EXEEXT): $(search_OBJECTS) $(search_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(outrender_OBJECTS) $(outrender_LDADD) $(LIBS) + +search$(EXEEXT): $(search_OBJECTS) $(search_DEPENDENCIES) $(EXTRA_search_DEPENDENCIES) @rm -f search$(EXEEXT) - $(CXXLINK) $(search_OBJECTS) $(search_LDADD) $(LIBS) -threaded_search$(EXEEXT): $(threaded_search_OBJECTS) $(threaded_search_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(search_OBJECTS) $(search_LDADD) $(LIBS) + +threaded_search$(EXEEXT): $(threaded_search_OBJECTS) $(threaded_search_DEPENDENCIES) $(EXTRA_threaded_search_DEPENDENCIES) @rm -f threaded_search$(EXEEXT) - $(CXXLINK) $(threaded_search_OBJECTS) $(threaded_search_LDADD) $(LIBS) -verserangeparse$(EXEEXT): $(verserangeparse_OBJECTS) $(verserangeparse_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(threaded_search_OBJECTS) $(threaded_search_LDADD) $(LIBS) + +verserangeparse$(EXEEXT): $(verserangeparse_OBJECTS) $(verserangeparse_DEPENDENCIES) $(EXTRA_verserangeparse_DEPENDENCIES) @rm -f verserangeparse$(EXEEXT) - $(CXXLINK) $(verserangeparse_OBJECTS) $(verserangeparse_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(verserangeparse_OBJECTS) $(verserangeparse_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -342,25 +451,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verserangeparse.Po@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -368,26 +477,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -399,15 +497,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -416,6 +510,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -464,10 +573,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -552,18 +666,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/examples/cmdline/listoptions.cpp b/examples/cmdline/listoptions.cpp index 721e8ea..c5525e9 100644 --- a/examples/cmdline/listoptions.cpp +++ b/examples/cmdline/listoptions.cpp @@ -1,10 +1,14 @@ /****************************************************************************** - * Simple example to show how to see which options are available from the - * installed set of modules and their possible settings. * - * $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ + * listoptions.cpp - Simple example to show how to see which 'options' are + * available from the installed set of modules and their + * possible settings. + * Options in SWORD refer to things like "Strong's + * Numbers", "Morphology", etc. + * + * $Id: listoptions.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -19,24 +23,30 @@ * General Public License for more details. * */ + #include #include + using sword::SWMgr; using sword::StringList; using std::cout; + int main(int argc, char **argv) { SWMgr library; StringList options = library.getGlobalOptions(); - for (StringList::const_iterator it = options.begin(); it != options.end(); it++) { + for (StringList::const_iterator it = options.begin(); it != options.end(); ++it) { cout << *it << " (" << library.getGlobalOptionTip(*it) << ")\n"; StringList optionValues = library.getGlobalOptionValues(*it); - for (StringList::const_iterator it2 = optionValues.begin(); it2 != optionValues.end(); it2++) { + for (StringList::const_iterator it2 = optionValues.begin(); it2 != optionValues.end(); ++it2) { cout << "\t" << *it2 << "\n"; } } + return 0; + } + diff --git a/examples/cmdline/lookup.cpp b/examples/cmdline/lookup.cpp index 5fecafb..505b5e1 100644 --- a/examples/cmdline/lookup.cpp +++ b/examples/cmdline/lookup.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * Simple example of how to retrieve an entry from a SWORD module * - * $Id: lookup.cpp 2546 2010-09-08 14:14:37Z scribe $ + * lookup.cpp - Simple example of how to retrieve an entry from a + * SWORD module * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: lookup.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,9 +26,11 @@ #include #include #include +#include #include #include + using sword::SWMgr; using sword::MarkupFilterMgr; using sword::SWModule; @@ -38,6 +42,8 @@ using sword::AttributeTypeList; using sword::AttributeList; using sword::AttributeValue; using sword::VerseKey; +using sword::FilterList; + int main(int argc, char **argv) { @@ -57,8 +63,8 @@ int main(int argc, char **argv) if (!target) { fprintf(stderr, "Could not find module [%s]. Available modules:\n", argv[1]); ModMap::iterator it; - for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { - fprintf(stderr, "[%s]\t - %s\n", (*it).second->Name(), (*it).second->Description()); + for (it = manager.Modules.begin(); it != manager.Modules.end(); ++it) { + fprintf(stderr, "[%s]\t - %s\n", (*it).second->getName(), (*it).second->getDescription()); } exit(-1); } @@ -73,36 +79,40 @@ int main(int argc, char **argv) if (vk) { // vk->AutoNormalize(false); - vk->Headings(true); + vk->setIntros(true); vk->setText(argv[2]); } else { target->setKey(argv[2]); } - target->RenderText(); // force an entry lookup to resolve key to something in the index + target->renderText(); // force an entry lookup to resolve key to something in the index std::cout << "==Raw=Entry===============\n"; std::cout << target->getKeyText() << ":\n"; std::cout << target->getRawEntry(); std::cout << "\n"; std::cout << "==Render=Entry============\n"; - std::cout << target->RenderText(); + std::cout << target->getRenderHeader(); + std::cout << "\n"; + std::cout << target->renderText(); std::cout << "\n"; std::cout << "==========================\n"; std::cout << "Entry Attributes:\n\n"; AttributeTypeList::iterator i1; AttributeList::iterator i2; AttributeValue::iterator i3; - for (i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); i1++) { + for (i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); ++i1) { std::cout << "[ " << i1->first << " ]\n"; - for (i2 = i1->second.begin(); i2 != i1->second.end(); i2++) { + for (i2 = i1->second.begin(); i2 != i1->second.end(); ++i2) { std::cout << "\t[ " << i2->first << " ]\n"; - for (i3 = i2->second.begin(); i3 != i2->second.end(); i3++) { + for (i3 = i2->second.begin(); i3 != i2->second.end(); ++i3) { std::cout << "\t\t" << i3->first << " = " << i3->second << "\n"; } } } std::cout << std::endl; + return 0; } + diff --git a/examples/cmdline/outplain.cpp b/examples/cmdline/outplain.cpp index f95be88..5245fda 100644 --- a/examples/cmdline/outplain.cpp +++ b/examples/cmdline/outplain.cpp @@ -1,11 +1,17 @@ /****************************************************************************** - * This example show how to output the plain text entries from a SWORD module. - * This is also good for speed tests + * + * outplain.cpp - This example shows how to output the plain text + * entries from a SWORD module. This small program + * outputs a SWORD module in 'imp' format, e.g.: + * + * $$$Gen.1.1 + * In the beginning God created + * the heavens and the earth + * + * $$$Gen.1.2 + * ... * * Class SWMgr manages installed modules for a frontend. - * SWMgr reads a mods.conf file to discover its information. - * It then instantiates the correct decendent of SWModule for each - * module entry in mods.conf * The developer may use this class to query what modules are installed * and to retrieve an (SWModule *) for any one of these modules * @@ -14,9 +20,9 @@ * ModMap consists of: FIRST : SWBuf moduleName * SECOND: SWModule *module * - * $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ + * $Id: outplain.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -32,21 +38,6 @@ * */ -/****************************************************************************** - * Class SWMgr manages installed modules for a frontend. - * SWMgr reads a mods.conf file to discover its information. - * It then instantiates the correct decendent of SWModule for each - * module entry in mods.conf - * The developer may use this class to query what modules are installed - * and to retrieve an (SWModule *) for any one of these modules - * - * SWMgr makes its modules available as an STL Map. - * The Map definition is typedef'ed as ModMap - * ModMap consists of: FIRST : SWBuf moduleName - * SECOND: SWModule *module - * - */ - #include #include @@ -54,24 +45,29 @@ #include #include + using namespace sword; using namespace std; + int main(int argc, char **argv) { + SWMgr manager(new MarkupFilterMgr(sword::FMT_HTMLHREF, sword::ENC_UTF16)); const char *bookName = (argc > 1) ? argv[1] : "WLC"; SWModule *b = manager.getModule(bookName); if (!b) return -1; SWModule &book = *b; - book.processEntryAttributes(false); + book.setProcessEntryAttributes(false); VerseKey *vk = SWDYNAMIC_CAST(VerseKey, book.getKey()); - for (book = TOP; !book.Error() && !book.getRawEntryBuf().size(); book++); + for (book = TOP; !book.popError() && !book.getRawEntryBuf().size(); book++); if (!book.getRawEntryBuf().size()) return -2; // empty module - for (;!book.Error(); book++) { + for (;!book.popError(); book++) { cout << "$$$"; if (vk) cout << vk->getOSISRef(); else cout << book.getKeyText(); - cout << "\n" << book.StripText() << "\n\n"; + cout << "\n" << book.stripText() << "\n\n"; } + + return 0; } diff --git a/examples/cmdline/outrender.cpp b/examples/cmdline/outrender.cpp index 99cc39e..192b29d 100644 --- a/examples/cmdline/outrender.cpp +++ b/examples/cmdline/outrender.cpp @@ -1,22 +1,13 @@ /****************************************************************************** - * This example show how to choose an output render markup and render - * entries from a SWORD module. * - * Class SWMgr manages installed modules for a frontend. - * SWMgr reads a mods.conf file to discover its information. - * It then instantiates the correct decendent of SWModule for each - * module entry in mods.conf - * The developer may use this class to query what modules are installed - * and to retrieve an (SWModule *) for any one of these modules + * outrender.cpp - This example show how to choose an output render + * markup and render entries from a SWORD module. The + * following snippet outputs a module in HTML output + * encoded as UTF8. * - * SWMgr makes its modules available as an STL Map. - * The Map definition is typedef'ed as ModMap - * ModMap consists of: FIRST : SWBuf moduleName - * SECOND: SWModule *module + * $Id: outrender.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ - * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -39,24 +30,37 @@ #include #include + using namespace sword; using namespace std; + int main(int argc, char **argv) { + SWMgr manager(new MarkupFilterMgr(sword::FMT_HTMLHREF, sword::ENC_UTF16)); const char *bookName = (argc > 1) ? argv[1] : "WLC"; + SWModule *b = manager.getModule(bookName); if (!b) return -1; + SWModule &book = *b; - book.processEntryAttributes(false); + book.setProcessEntryAttributes(false); VerseKey *vk = SWDYNAMIC_CAST(VerseKey, book.getKey()); - for (book = TOP; !book.Error() && !book.getRawEntryBuf().size(); book++); + + // find the first non-zero entry + for (book = TOP; !book.popError() && !book.getRawEntryBuf().size(); book++); if (!book.getRawEntryBuf().size()) return -2; // empty module - for (;!book.Error(); book++) { + + for (;!book.popError(); book++) { + cout << "$$$"; if (vk) cout << vk->getOSISRef(); else cout << book.getKeyText(); - cout << "\n" << book.RenderText() << "\n\n"; + + cout << "\n" << book.renderText() << "\n\n"; } + + return 0; } + diff --git a/examples/cmdline/search.cpp b/examples/cmdline/search.cpp index 1542405..f437430 100644 --- a/examples/cmdline/search.cpp +++ b/examples/cmdline/search.cpp @@ -1,9 +1,14 @@ /****************************************************************************** - * This simple example shows how to perform a search on a SWORD module * - * $Id: search.cpp 2439 2009-08-10 02:37:42Z scribe $ + * search.cpp - This simple example shows how to perform a search on a + * SWORD module. It amounts to a simple commandline + * search tool with a usage like: * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * search KJV "swift hear slow speak" + * + * $Id: search.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -31,13 +36,14 @@ using namespace sword; #endif - /* - * >=0 - regex - * -1 - phrase - * -2 - multiword - * -3 - entryAttrib (eg. Word//Lemma/G1234/) - * -4 - Lucene - */ +/* + * >=0 - regex + * -1 - phrase + * -2 - multiword + * -3 - entryAttrib (eg. Word//Lemma/G1234/) + * -4 - Lucene + */ + char SEARCH_TYPE=-2; char printed = 0; @@ -82,8 +88,8 @@ int main(int argc, char **argv) it = manager.Modules.find(argv[1]); if (it == manager.Modules.end()) { fprintf(stderr, "Could not find module [%s]. Available modules:\n", argv[1]); - for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { - fprintf(stderr, "[%s]\t - %s\n", (*it).second->Name(), (*it).second->Description()); + for (it = manager.Modules.begin(); it != manager.Modules.end(); ++it) { + fprintf(stderr, "[%s]\t - %s\n", (*it).second->getName(), (*it).second->getDescription()); } exit(-1); } @@ -95,8 +101,8 @@ int main(int argc, char **argv) VerseKey *parser = SWDYNAMIC_CAST(VerseKey, k); VerseKey kjvParser; if (!parser) parser = &kjvParser; // use standard KJV parsing as fallback - scope = parser->ParseVerseList(argv[3], *parser, true); - scope.Persist(1); + scope = parser->parseVerseList(argv[3], *parser, true); + scope.setPersist(true); target->setKey(scope); } @@ -106,7 +112,7 @@ int main(int argc, char **argv) std::cerr << std::endl; if (argc > 4) { // if min / max specified scope = listkey; - scope.Persist(1); + scope.setPersist(true); target->setKey(scope); printed = 0; std::cerr << " "; @@ -114,9 +120,11 @@ int main(int argc, char **argv) std::cerr << std::endl; } listkey.sort(); - while (!listkey.Error()) { + while (!listkey.popError()) { std::cout << (const char *)listkey << std::endl; listkey++; } + return 0; + } diff --git a/examples/cmdline/threaded_search.cpp b/examples/cmdline/threaded_search.cpp index cf454a3..a3710a9 100755 --- a/examples/cmdline/threaded_search.cpp +++ b/examples/cmdline/threaded_search.cpp @@ -1,9 +1,10 @@ /****************************************************************************** - * This example shows how to do a thread search * - * $Id: threaded_search.cpp 2327 2009-04-22 11:42:33Z scribe $ + * threaded_search.cpp - This example shows how to do a thread search * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: threaded_search.cpp 2923 2013-07-28 20:05:37Z scribe $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -18,6 +19,7 @@ * General Public License for more details. * */ + #include #include #include @@ -98,13 +100,13 @@ void SearchThread::search() { return; } - ListKey scopeList = VerseKey().ParseVerseList("Luke;John;Revelation","", true); - for (int i=0; i < scopeList.Count(); ++i) { - std::cout << (const char*)*scopeList.GetElement(i) << std::endl; + ListKey scopeList = VerseKey().parseVerseList("Luke;John;Revelation","", true); + for (int i=0; i < scopeList.getCount(); ++i) { + std::cout << (const char*)*scopeList.getElement(i) << std::endl; } SWKey* scope = &scopeList; - searchResult = module->Search(searchedText, -2, REG_ICASE, scope, 0, &percentUpdate); + searchResult = module->search(searchedText, -2, REG_ICASE, scope, 0, &percentUpdate); if (!scope) std::cout << "bad scope!" << std::endl; @@ -125,8 +127,8 @@ int main(int argc, char **argv) { it = manager.Modules.find(argv[1]); if (it == manager.Modules.end()) { fprintf(stderr, "Could not find module [%s]. Available modules:\n", argv[1]); - for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { - fprintf(stderr, "[%s]\t - %s\n", (*it).second->Name(), (*it).second->Description()); + for (it = manager.Modules.begin(); it != manager.Modules.end(); ++it) { + fprintf(stderr, "[%s]\t - %s\n", (*it).second->getName(), (*it).second->getDescription()); } exit(-1); } @@ -144,7 +146,7 @@ int main(int argc, char **argv) { std::cout.flush(); }; - std::cout << std::endl << "Number of found items: " << searchThread->searchResult.Count() << std::endl; + std::cout << std::endl << "Number of found items: " << searchThread->searchResult.getCount() << std::endl; std::cout << "Finished program" << std::endl; std::cout.flush(); diff --git a/examples/cmdline/verserangeparse.cpp b/examples/cmdline/verserangeparse.cpp index aa8cf71..d5fd18b 100644 --- a/examples/cmdline/verserangeparse.cpp +++ b/examples/cmdline/verserangeparse.cpp @@ -1,11 +1,11 @@ -/****************************************************************** - * This example shows: - * How to parse a verse reference - * How to persist a custom range key in a book +/****************************************************************************** * - * $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ + * verserangeparse.cpp - This example shows + * how to parse a verse reference * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: verserangeparse.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -45,42 +45,30 @@ int main(int argc, char **argv) VerseKey parser; ListKey result; - result = parser.ParseVerseList(range, parser, true); + result = parser.parseVerseList(range, parser, true); + // let's iterate the key and display - for (result = TOP; !result.Error(); result++) { + for (result = TOP; !result.popError(); result++) { cout << result << "\n"; } cout << endl; - // Now if we'd like persist this key for use inside of a book... - result.Persist(true); + // Now let's output a module with the entries from the result - // Let's get a book; + // we'll initialize our library of books SWMgr library(new MarkupFilterMgr(FMT_PLAIN)); // render plain without fancy markup + + // Let's get a book; SWModule *book = library.getModule("KJV"); - // and set our limited key inside - book->setKey(result); + // couldn't find our test module + if (!book) return -1; // now let's iterate the book and display - for ((*book) = TOP; !book->Error(); (*book)++) { - cout << "*** " << book->getKeyText() << ": " << book->RenderText() << "\n"; + for (result = TOP; !result.popError(); result++) { + book->setKey(result); + cout << "*** " << book->getKeyText() << ": " << book->renderText() << "\n"; } - // since we've told our result key to persist in book, we can reuse our - // setup by simply resetting result, e.g. - // - // result = parser.ParseVerseList(someNewRange, parser, true); - // - // now an iteration of book will give us our new range. - // - // to stop persistence of our custom key, we'll need to set our book's key - // to something simple: - // - // book->setKey("gen.1.1"); - // - // this allows book to create and use an instance of its preferred key type - // - return 0; } diff --git a/examples/simple.cpp b/examples/simple.cpp index e28d404..c46346b 100644 --- a/examples/simple.cpp +++ b/examples/simple.cpp @@ -1,5 +1,7 @@ /****************************************************************************** - * This is about the simplest useful example of using the sword engine. + * + * simple.cpp - This is about the simplest useful example of using the + * SWORD engine. * * After sword is installed, it should compile with something similar to: * @@ -14,9 +16,9 @@ * * SWMgr library(0, 0, true, new MarkupFilterMgr(FMT_HTMLHREF)); * - * $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $ + * $Id: simple.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -36,9 +38,11 @@ #include #include + using namespace sword; using std::cout; + int main(int argc, char **argv) { SWMgr library; SWModule *darby = library.getModule("Darby"); @@ -47,3 +51,4 @@ int main(int argc, char **argv) { return 0; } + diff --git a/icu/Makefile.am b/icu/Makefile.am deleted file mode 100644 index db9a705..0000000 --- a/icu/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -AUTOMAKE_OPTIONS = 1.6 - -swicuSOURCES = translit_BETA_Greek.txt -swicuSOURCES += translit_BGreek_Greek.txt -swicuSOURCES += translit_CCAT_Hebrew.txt -swicuSOURCES += translit_CCAT_Syriac.txt -swicuSOURCES += translit_Latin_Coptic.txt -swicuSOURCES += translit_Latin_Gothic.txt -swicuSOURCES += translit_Latin_Ugaritic.txt -swicuSOURCES += translit_Any_Latin1.txt -swicuSOURCES += translit_Any_Latex.txt -swicuSOURCES += translit_swordindex.txt - -if HAVE_ICU -swicu_DATA = $(swicuSOURCES:.txt=.res) -else -swicu_DATA = -endif -EXTRA_DIST = $(swicuSOURCES) - -CLEANFILES = *.res *.lst *.mk *.mak swicu.dat - -SUFFIXES = .txt .res .dat - -.txt.res: - $(GENRB) -s . -d . $< - - -if HAVE_ICU -swicudir = $(pkglibdir)/${VERSION}_icu_${ICU_VER} - -#installswicu_DATA: $(swicu_DATA) -# @$(NORMAL_INSTALL) -# $(mkinstalldirs) $(DESTDIR)$(swicudir) -# @list='$(swicu_DATA)'; for p in $$list; do \ -# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -# f="`echo $$p | sed -e 's|^.*/||'`"; \ -# echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(swicudir)/$$f"; \ -# $(INSTALL_DATA) $$d$$p $(DESTDIR)$(swicudir)/$$f; \ -# done - -#uninstallswicu_DATA: -# @$(NORMAL_UNINSTALL) -# @list='$(swicu_DATA)'; for p in $$list; do \ -# f="`echo $$p | sed -e 's|^.*/||'`"; \ -# echo " rm -f $(DESTDIR)$(swicudir)/$$f"; \ -# rm -f $(DESTDIR)$(swicudir)/$$f; \ -# done -else -swicudir = $(pkglibdir) - -#installswicu_DATA: -# -#uninstallswicu_DATA: -endif diff --git a/icu/Makefile.in b/icu/Makefile.in deleted file mode 100644 index 38ebfee..0000000 --- a/icu/Makefile.in +++ /dev/null @@ -1,477 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = icu -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ - $(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(swicudir)" -DATA = $(swicu_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_CXXFLAGS = @AM_CXXFLAGS@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@ -CLUCENE_LIBS = @CLUCENE_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ -CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ -CPPUNIT_LIBS = @CPPUNIT_LIBS@ -CURL_CONFIG = @CURL_CONFIG@ -CURL_LIBS = @CURL_LIBS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GENCCODE = @GENCCODE@ -GENCMN = @GENCMN@ -GENRB = @GENRB@ -GREP = @GREP@ -ICU_CONFIG = @ICU_CONFIG@ -ICU_IOLIBS = @ICU_IOLIBS@ -ICU_LIBS = @ICU_LIBS@ -ICU_VER = @ICU_VER@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGDATA = @PKGDATA@ -PKG_CONFIG = @PKG_CONFIG@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -dir_confdef = @dir_confdef@ -docdir = @docdir@ -dvidir = @dvidir@ -enable_debug = @enable_debug@ -enable_profile = @enable_profile@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_mingw32 = @target_mingw32@ -target_os = @target_os@ -target_system = @target_system@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -with_conf = @with_conf@ -with_icu = @with_icu@ -with_icusword = @with_icusword@ -with_zlib = @with_zlib@ -AUTOMAKE_OPTIONS = 1.6 -swicuSOURCES = translit_BETA_Greek.txt translit_BGreek_Greek.txt \ - translit_CCAT_Hebrew.txt translit_CCAT_Syriac.txt \ - translit_Latin_Coptic.txt translit_Latin_Gothic.txt \ - translit_Latin_Ugaritic.txt translit_Any_Latin1.txt \ - translit_Any_Latex.txt translit_swordindex.txt -@HAVE_ICU_FALSE@swicu_DATA = -@HAVE_ICU_TRUE@swicu_DATA = $(swicuSOURCES:.txt=.res) -EXTRA_DIST = $(swicuSOURCES) -CLEANFILES = *.res *.lst *.mk *.mak swicu.dat -SUFFIXES = .txt .res .dat - -#installswicu_DATA: $(swicu_DATA) -# @$(NORMAL_INSTALL) -# $(mkinstalldirs) $(DESTDIR)$(swicudir) -# @list='$(swicu_DATA)'; for p in $$list; do \ -# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -# f="`echo $$p | sed -e 's|^.*/||'`"; \ -# echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(swicudir)/$$f"; \ -# $(INSTALL_DATA) $$d$$p $(DESTDIR)$(swicudir)/$$f; \ -# done - -#uninstallswicu_DATA: -# @$(NORMAL_UNINSTALL) -# @list='$(swicu_DATA)'; for p in $$list; do \ -# f="`echo $$p | sed -e 's|^.*/||'`"; \ -# echo " rm -f $(DESTDIR)$(swicudir)/$$f"; \ -# rm -f $(DESTDIR)$(swicudir)/$$f; \ -# done -@HAVE_ICU_FALSE@swicudir = $(pkglibdir) -@HAVE_ICU_TRUE@swicudir = $(pkglibdir)/${VERSION}_icu_${ICU_VER} -all: all-am - -.SUFFIXES: -.SUFFIXES: .txt .res .dat -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icu/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign icu/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-swicuDATA: $(swicu_DATA) - @$(NORMAL_INSTALL) - test -z "$(swicudir)" || $(MKDIR_P) "$(DESTDIR)$(swicudir)" - @list='$(swicu_DATA)'; test -n "$(swicudir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(swicudir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(swicudir)" || exit $$?; \ - done - -uninstall-swicuDATA: - @$(NORMAL_UNINSTALL) - @list='$(swicu_DATA)'; test -n "$(swicudir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(swicudir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(swicudir)" && rm -f $$files -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(swicudir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-swicuDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-swicuDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-swicuDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-swicuDATA - - -.txt.res: - $(GENRB) -s . -d . $< - -#installswicu_DATA: -# -#uninstallswicu_DATA: - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/icu/translit_Any_Latex.txt b/icu/translit_Any_Latex.txt deleted file mode 100644 index f4dec6e..0000000 --- a/icu/translit_Any_Latex.txt +++ /dev/null @@ -1,78 +0,0 @@ -// Any_Latex - -// This transliterator is supposed to convert Unicode text into -// the (language-specific) transliterated format that latex (babel and arabtex) -// expects. For the start, only ancient greek will be supported. Feel free to -// add support for your language if desired. -// I am just starting to use ICU, so please forgive my mistakes. - -// Author Martin Gruner -// Copyright the Crosswire Bible Society - -translit_Any_Latex { - Rule { - - //Decompose combined characters - ":: NFD (NFC) ;" - - //How to handle accents now? - - //The letters: - " \u037A > | ;" //Iota subscriptum - " \u0384 > ' ;" //Accent acute - - " \u0391 > A ;" //Alpha - " \u0392 > B ;" //Beta - " \u0393 > D ;" //Gamma - " \u0394 > G ;" //Delta - " \u0395 > E ;" //Epsilon - " \u0396 > Z ;" //Zeta - " \u0397 > J ;" //Thetha !! - " \u0398 > H ;" //Eta - " \u0399 > I ;" //Iota - " \u039A > K ;" //Kappa - " \u039B > L ;" //Lambda - " \u039C > M ;" //My - " \u039D > N ;" //Ny - " \u039E > X ;" //Xi - " \u039F > O ;" //Omikron - " \u03A0 > P ;" //Pi - " \u03A1 > R ;" //Rho - " \u03A3 > S ;" //Sigma - " \u03A4 > T ;" //Tau - " \u03A5 > U ;" //Ypsilon !! - " \u03A6 > F ;" //Phi - " \u03A7 > Q ;" //Chi !! - " \u03A8 > Y ;" //Psi !! - " \u03A9 > W ;" //Omikron - - " \u03B1 > a ;" //alpha - " \u03B2 > b ;" //beta - " \u03B3 > d ;" //gamma - " \u03B4 > g ;" //delta - " \u03B5 > e ;" //epsilon - " \u03B6 > z ;" //zeta - " \u03B7 > j ;" //thetha !! - " \u03B8 > h ;" //eta - " \u03B9 > i ;" //iota - " \u03BA > k ;" //kappa - " \u03BB > l ;" //lambda - " \u03BC > m ;" //my - " \u03BD > n ;" //ny - " \u03BE > x ;" //xi - " \u03BF > o ;" //omikron - " \u03C0 > p ;" //pi - " \u03C1 > r ;" //rho - " \u03C3 > s ;" //sigma - " \u03C4 > t ;" //tau - " \u03C5 > u ;" //ypsilon !! - " \u03C6 > f ;" //phi - " \u03C7 > q ;" //chi !! - " \u03C8 > y ;" //psi !! - " \u03C9 > w ;" //omikron - - ":: NFC (NFD);" - - } -} - diff --git a/icu/translit_Any_Latin1.txt b/icu/translit_Any_Latin1.txt deleted file mode 100644 index d049845..0000000 --- a/icu/translit_Any_Latin1.txt +++ /dev/null @@ -1,89 +0,0 @@ -// Any_Latin1 - -translit_Any_Latin1 { - Rule { - - //NFKD then NFC; then NFD all non-Latin-1 codepoints - ":: NFKC ();" - ":: [^\u0000-\u00FF] NFD ();" - - //remove non-spacing marks - "[:Mn:] > ;" - - //change some non-Latin-1 codepoints to similar characters in Latin-1 range - " [\u2000-\u200A\u3000] > ' ' ;" - " [\u01C3\u2762]> '!' ;" - " \u203C > '!!' ;" - " [\u203D\u2048] > '?!' ;" - " [\u02BA\u030B\u030E\u2033\u3003\u201C-\u201F] > '\"' ;" - " [\u066A\u2030\u2031] > '%' ;" - " [\u02B9\u02BC\u02C8\u0301\u2032\u2018-\u201B] > '' ;" - " [\u066D\u2217\u2731] > '*' ;" - " [\u060C\u201A\u3001] > ',' ;" - " [\u2010-\u2013\u2212] > '-' ;" - " [\u2023\u06D4\u3002\u0589] > '.' ;" - " [\u0338\u2044\u2215] > '/' ;" - " \u2236 > ':' ;" - " \u061B > ';' ;" - " [\u2039\u2329\u3008] > '<' ;" - " \u2261 > '=' ;" - " [\u203A\u232A\u3009] > '>' ;" - " [\u037E\u061F] > '?' ;" - " \u2049 > '!?' ;" - " \u212C > B ;" - " [\u2102\u212D] > C ;" - " [\u2107\u2130] > E ;" - " [\u2131\u2132] > F ;" - " [\u210B\u210C\u210D] > H ;" - " [\u2110\u2111\u2160] > I ;" - " \u212A > K ;" - " \u2112 > L ;" - " \u2133 > L ;" - " \u2115 > N ;" - " \u2119 > P ;" - " \u211A > Q ;" - " [\u211B\u211C\u211D] > R ;" - " [\u2124\u2128] > Z ;" - " \u2216 > '\\' ;" - " [\u02C4\u02C6\u0302\u2303] > '^' ;" - " [\u02CD\u0331\u0332\u2017] > '_' ;" - " [\u02CB\u0300\u2035] > '`' ;" - " [\u212E\u212F] > e ;" - " [\u0261\u210A] > g ;" - " [\u04BB\u210E] > h ;" - " \u0131 > i ;" - " \u207F > n ;" - " \u2134 > o ;" - " \u01B6 > z ;" - " [\u01C0\u2223\u2758] > '|' ;" - " [\u02DC\u0303\u223C\uFF5E] > '~' ;" - " \u202F > \u00A0 ;" - " \uFFFD > \u001A;" - " \u20A4 > \u00A3 ;" - " [\u20A0-\u20AF] > \u00A4 ;" - " \u0308 > \u00A8 ;" - " \u2117 > \u00A9 ;" - " [\u226A\u300A] > \u00AB ;" - " \u2310 > \u00AC ;" - " \u1806 > \u00AD ;" - " [\u02C9\u0304\u0305] > \u00AF ;" - " [\u02DA\u030A\u2070\u2218] > \u00B0 ;" - " \u2213 > \u00B1 ;" - " [\u02B9\u02CA\u0301\u2032] > \u00B4 ;" - " [\u204B\u2761] > \u00B6 ;" - " [\u2022\u2024\u2027\u2219\u22C5\u30FB] > \u00B7 ;" - " \u0327 > \u00B8 ;" - " [\u226B\u300B] > \u00BB ;" - " \u2014 > '--';" - " \u2015 > '---';" - " \u2024 > '..';" - " \u2025 > '...';" - " \u2016 > '||';" - " \uFEFF > ;" - - //change all spacing character to space - "[^\u0000-\u00FF] > ' ';" - - } -} - diff --git a/icu/translit_BETA_Greek.txt b/icu/translit_BETA_Greek.txt deleted file mode 100644 index d90cec2..0000000 --- a/icu/translit_BETA_Greek.txt +++ /dev/null @@ -1,119 +0,0 @@ -//-------------------------------------------------------------------- -// Copyright (c) 2001, CrossWire Bible Society -//-------------------------------------------------------------------- - -// BETA-Greek/Coptic - -translit_BETA_Greek { - Rule { - ":: NFD (NFD);"//this is wrong, but required - - ":: [abdezqiklmncoypruxwv] upper();" - - //Uppercase - "'*A'<>\u0391;" - "'*B'<>\u0392;" - "'*G'<>\u0393;" - "'*D'<>\u0394;" - "'*E'<>\u0395;" - "'*Z'<>\u0396;" - "'*H'<>\u0397;" - "'*Q'<>\u0398;" - "'*I'<>\u0399;" - "'*K'<>\u039A;" - "'*L'<>\u039B;" - "'*M'<>\u039C;" - "'*N'<>\u039D;" - "'*C'<>\u039E;" - "'*O'<>\u039F;" - "'*F'<>\u03A6;" - "'*Y'<>\u03A8;" - "'*P'<>\u03A0;" - "'*R'<>\u03A1;" - "'*S'<>\u03A3;" - "'*T'<>\u03A4;" - "'*U'<>\u03A5;" - "'*X'<>\u03A7;" - "'*W'<>\u03A9;" - - //Archaic - "'*V'<>\u03DC;" - "'*#3'<>\u03DE;" - "'*#5'<>\u03E0;" - - //Coptic - "'*s'<>\u03E2;" - "'*f'<>\u03E4;" - "'*h'<>\u03E8;" - "'*j'<>\u03EA;" - "'*g'<>\u03EC;" - "'*t'<>\u03EE;" - - - //Lowercase - "A<>\u03B1;" - "B<>\u03B2;" - "G<>\u03B3;" - "D<>\u03B4;" - "E<>\u03B5;" - "Z<>\u03B6;" - "H<>\u03B7;" - "Q<>\u03B8;" - "I<>\u03B9;" - "K<>\u03BA;" - "L<>\u03BB;" - "M<>\u03BC;" - "N<>\u03BD;" - "C<>\u03BE;" - "O<>\u03BF;" - "F<>\u03C6;" - "Y<>\u03C8;" - "P<>\u03C0;" - "R<>\u03C1;" - "J<>\u03C2;" - "S<>\u03C3;" - "T<>\u03C4;" - "U<>\u03C5;" - "X<>\u03C7;" - "W<>\u03C9;" - - - //Archaic - "V<>\u03DD;" - "#3<>\u03DF;" - "#5<>\u03E1;" - - //Coptic - "s<>\u03E3;" - "f<>\u03E5;" - "h<>\u03E9;" - "j<>\u03EB;" - "g<>\u03ED;" - "t<>\u03EF;" - - // Non-letter characters //these don't work (this is wrong) - "'V'<>\u037A;" - "'V'<>\u0314;" - "'V'<\u02BD;" - "'V'<>\u0387;" - "'V'<>\u0313;" - "'V'<\u02BC;" - "'V'<>\u0301;" - "'V'<\u00B4;" - "'V'<\u02CA;" - "'V'<\u0384;" - "'V'<>\u0342;" - "'V'<\u0302;" - "'V'<'^';" - "'V'<\u02C6;" - "'V'<>\u0300;" - "'V'<'`';" - "'V'<\u02CB;" - "'V'<>\u0308;" - "'V'<\u00A8;" - "'V'<>\u0307;" - "'V'<\u02D9;" - - ":: NFD (NFD);" //this is wrong, but required - } -} diff --git a/icu/translit_BGreek_Greek.txt b/icu/translit_BGreek_Greek.txt deleted file mode 100644 index 1cacd3d..0000000 --- a/icu/translit_BGreek_Greek.txt +++ /dev/null @@ -1,155 +0,0 @@ -//-------------------------------------------------------------------- -// Copyright (c) 2001, CrossWire Bible Society -//-------------------------------------------------------------------- - -// BGreek-Greek - -translit_BGreek_Greek { - Rule { - ":: NFD (NFC) ;" - - ":: [abgdezqklmnxofyprtucw] upper();" - - // Extra English Letters. Mapped for completeness - "J>I;" - "V>U;" - - "<[:Mn:];" - - // ============================================== - // Variables, used to make the rules more comprehensible - // and for conditionals. - // ============================================== - - // Greek Letters - - "$ALPHA=\u0391;" - "$BETA=\u0392;" - "$GAMMA=\u0393;" - "$DELTA=\u0394;" - "$EPSILON=\u0395;" - "$ZETA=\u0396;" - "$ETA=\u0397;" - "$THETA=\u0398;" - "$IOTA=\u0399;" - "$KAPPA=\u039A;" - "$LAMBDA=\u039B;" - "$MU=\u039C;" - "$NU=\u039D;" - "$XI=\u039E;" - "$OMICRON=\u039F;" - "$PI=\u03A0;" - "$RHO=\u03A1;" - "$SIGMA=\u03A3;" - "$TAU=\u03A4;" - "$YPSILON=\u03A5;" - "$PHI=\u03A6;" - "$CHI=\u03A7;" - "$PSI=\u03A8;" - "$OMEGA=\u03A9;" - - "$alpha=\u03B1;" - "$beta=\u03B2;" - "$gamma=\u03B3;" - "$delta=\u03B4;" - "$epsilon=\u03B5;" - "$zeta=\u03B6;" - "$eta=\u03B7;" - "$theta=\u03B8;" - "$iota=\u03B9;" - "$kappa=\u03BA;" - "$lambda=\u03BB;" - "$mu=\u03BC;" - "$nu=\u03BD;" - "$xi=\u03BE;" - "$omicron=\u03BF;" - "$pi=\u03C0;" - "$rho=\u03C1;" - "$sigma=\u03C3;" - "$tau=\u03C4;" - "$ypsilon=\u03C5;" - "$phi=\u03C6;" - "$chi=\u03C7;" - "$psi=\u03C8;" - "$omega=\u03C9;" - - "$sigma2=\u03C2;" - - "$iota_subscript=\u037A;" - "$comb_rough_breathing=\u0314;" - "$rough_breathing=\u02BD;" - - // Variables for conditional mappings - - // ============================================== - // Rules - // ============================================== - // The following are special titlecases, and should - // not be copied when duplicating the lowercase - // ============================================== - - // Because there is no uppercase forms for final sigma, - // we had to move all the sigma rules up here. - - // Remember to insert ' to preserve round trip, for double letters - // don't need to do this for the digraphs with h, - // since it is not created when mapping back from greek - - // use special form for s - - "S}[[:L:] & [:Latin:]]>$sigma2;" - "S <> $SIGMA;" - - // The following are a bit tricky. 's' takes two forms in greek - // final or non final. - // We use ~s to represent the abnormal form: final before letter - // or non-final before non-letter. - // We use 's to separate p and s (otherwise ps is one letter) - // so, we break out the following forms: - - "S < $sigma;" - "S < $sigma2;" - - // ============================================== - // Uppercase Forms. - // To make lowercase forms, just copy and lowercase below - // ============================================== - - // Basic Letters - - "A<>$ALPHA;" - "B<>$BETA;" - "G<>$GAMMA;" - "D<>$DELTA;" - "E<>$EPSILON;" - "Z<>$ZETA;" - "H<>$ETA;" - "Q<>$THETA;" - "I<>$IOTA;" - "K<>$KAPPA;" - "L<>$LAMBDA;" - "M<>$MU;" - "N<>$NU;" - "X<>$XI;" - "O<>$OMICRON;" - "F<>$PHI;" // needs ordering before P - "Y<>$PSI;" // needs ordering before P - "P<>$PI;" - "R<>$RHO;" - "T<>$TAU;" - "U<>$YPSILON;" - "C<>$CHI;" - "W<>$OMEGA;" - - // Non-letter characters - - "i<>$iota_subscript;" - "h<>$comb_rough_breathing;" - "h<$rough_breathing;" - - ":: [[:Ll:] & [:Greek:]] upper;" - - ":: NFC (NFD) ;" - } -} - diff --git a/icu/translit_CCAT_Hebrew.txt b/icu/translit_CCAT_Hebrew.txt deleted file mode 100644 index 2c9fafa..0000000 --- a/icu/translit_CCAT_Hebrew.txt +++ /dev/null @@ -1,200 +0,0 @@ -//-------------------------------------------------------------------- -// Copyright (c) 2001, CrossWire Bible Society -//-------------------------------------------------------------------- - -// CCAT-Hebrew - -translit_CCAT_Hebrew { - Rule { - ":: NFD (NFC) ;" - - // Variable names, derived from the Unicode names. - "$CANT_ETNAHTA=\u0591;" - "$CANT_SEGOL=\u0592;" - "$CANT_SHALSHELET=\u0593;" - "$CANT_ZAQEF_QATAN=\u0594;" - "$CANT_ZAQEF_GADOL=\u0595;" - "$CANT_TIPEHA=\u0596;" - "$CANT_REVIA=\u0597;" - "$CANT_ZARQA=\u0598;" - "$CANT_PASHTA=\u0599;" - "$CANT_YETIV=\u059A;" - "$CANT_TEVIR=\u059B;" - "$CANT_GERESH=\u059C;" - "$CANT_GERESH_MUQDAM=\u059D;" - "$CANT_GERESHAYIM=\u059E;" - "$CANT_QARNEY_PARA=\u059F;" - "$CANT_TELISHA_GEDOLA=\u05A0;" - "$CANT_PAZER=\u05A1;" - "$CANT_MUNAH=\u05A3;" - "$CANT_MAHAPAKH=\u05A4;" - "$CANT_MERKHA=\u05A5;" - "$CANT_MERKHA_KEFULA=\u05A6;" - "$CANT_DARGA=\u05A7;" - "$CANT_QADMA=\u05A8;" - "$CANT_TELISHA_QETANA=\u05A9;" - "$CANT_YERAH_BEN_YOMO=\u05AA;" - "$CANT_OLE=\u05AB;" - "$CANT_ILUY=\u05AC;" - "$CANT_DEHI=\u05AD;" - "$CANT_ZINOR=\u05AE;" - - "$MASORA_CIRCLE=\u05AF;" - - "$POINT_SHEVA=\u05B0;" - "$POINT_HATAF_SEGOL=\u05B1;" - "$POINT_HATAF_PATAH=\u05B2;" - "$POINT_HATAF_QAMATS=\u05B3;" - "$POINT_HIRIQ=\u05B4;" - "$POINT_TSERE=\u05B5;" - "$POINT_SEGOL=\u05B6;" - "$POINT_PATAH=\u05B7;" - "$POINT_QAMATS=\u05B8;" - "$POINT_HOLAM=\u05B9;" - "$POINT_QUBUTS=\u05BB;" - "$POINT_DAGESH_OR_MAPIQ=\u05BC;" - "$POINT_METEG=\u05BD;" - "$PUNCTUATION_MAQAF=\u05BE;" - "$POINT_RAFE=\u05BF;" - "$PUNCTUATION_PASEQ=\u05C0;" - "$POINT_SHIN_DOT=\u05C1;" - "$POINT_SIN_DOT=\u05C2;" - "$PUNCTUATION_SOF_PASUQ=\u05C3;" - "$MARK_UPPER_DOT=\u05C4;" - "$ALEF=\u05D0;" - "$BET=\u05D1;" - "$GIMEL=\u05D2;" - "$DALET=\u05D3;" - "$HE=\u05D4;" - "$VAV=\u05D5;" - "$ZAYIN=\u05D6;" - "$HET=\u05D7;" - "$TET=\u05D8;" - "$YOD=\u05D9;" - "$FINAL_KAF=\u05DA;" - "$KAF=\u05DB;" - "$LAMED=\u05DC;" - "$FINAL_MEM=\u05DD;" - "$MEM=\u05DE;" - "$FINAL_NUN=\u05DF;" - "$NUN=\u05E0;" - "$SAMEKH=\u05E1;" - "$AYIN=\u05E2;" - "$FINAL_PE=\u05E3;" - "$PE=\u05E4;" - "$FINAL_TSADI=\u05E5;" - "$TSADI=\u05E6;" - "$QOF=\u05E7;" - "$RESH=\u05E8;" - "$SHIN=\u05E9;" - "$TAV=\u05EA;" - - "$YIDDISH_DOUBLE_VAV=\u05F0;" - "$YIDDISH_VAV_YOD=\u05F1;" - "$YIDDISH_DOUBLE_YOD=\u05F2;" - - "$PUNCTUATION_GERESH=\u05F3;" - "$PUNCTUATION_GERSHAYIM=\u05F4;" - - "$letter=[[:LATIN:]&[:L:]];" - "$softvowel=[eiyEIY];" - "$vowellike=[$ALEF $AYIN $YOD $VAV];" - - "'\)'<>$ALEF;" - "''>$ALEF;" - "B<>$BET;" - "G<>$GIMEL;" - "D<>$DALET;" - "H<>$HE;" - "W<>$VAV;" - "Z<>$ZAYIN;" - "X<>$HET;" - "'+'<>$TET;" - "Y<>$YOD;" - "K}$letter>$KAF;" - "K<$KAF;" - "K<>$FINAL_KAF;" - "L<>$LAMED;" - "M}$letter>$MEM;" - "M<$MEM;" - "M<>$FINAL_MEM;" - "N}$letter>$NUN;" - "N<$NUN;" - "N<>$FINAL_NUN;" - "S<>$SAMEKH;" - "P}$letter>$PE;" - "P<$PE;" - "P<>$FINAL_PE;" - "'\('<>$AYIN;" - "'\`'>$AYIN;" - "C}$letter>$TSADI;" - "C<$TSADI;" - "C<>$FINAL_TSADI;" - "Q<>$QOF;" - "R<>$RESH;" - "'&'<> $SHIN $POINT_SIN_DOT;" - "'\$'<> $SHIN $POINT_SHIN_DOT;" - "'\$'<$SHIN;" - "T<>$TAV;" - - "':A'<>$POINT_HATAF_PATAH;" - "':E'<>$POINT_HATAF_SEGOL;" - "':F'<>$POINT_HATAF_QAMATS;" - - "A<>$POINT_PATAH;" - "F<>$POINT_QAMATS;" - "E<>$POINT_SEGOL;" - "'\"'<>$POINT_TSERE;" - "I<>$POINT_HIRIQ;" - "O<>$POINT_HOLAM;" - "U<>$POINT_QUBUTS;" - "':'<>$POINT_SHEVA;" - - "'.'<>$POINT_DAGESH_OR_MAPIQ;" - "'-'<>$PUNCTUATION_MAQAF;" - - "00<>$PUNCTUATION_SOF_PASUQ;" - "01<>$CANT_SEGOL;" - "02<>$CANT_ZARQA;" - "03>$CANT_PASHTA;" - "04>$CANT_TELISHA_QETANA;" - "05<>$PUNCTUATION_PASEQ;" - "10<>$CANT_YETIV;" - "13<>$CANT_DEHI;" - "11<>$CANT_GERESH_MUQDAM;" - "14>$CANT_TELISHA_GEDOLA;" - "24<>$CANT_TELISHA_QETANA;" - "33<>$CANT_PASHTA;" - "44<>$CANT_TELISHA_GEDOLA;" - "60<>$CANT_OLE;" - "61<>$CANT_GERESH;" - "62<>$CANT_GERESHAYIM;" - "63<>$CANT_QADMA;" - "64<>$CANT_ILUY;" - "65<>$CANT_SHALSHELET;" - "80<>$CANT_ZAQEF_GADOL;" - "81<>$CANT_REVIA;" - "82>$CANT_ZARQA;" - "83<>$CANT_PAZER;" - "84<>$CANT_QARNEY_PARA;" - "85<>$CANT_ZAQEF_QATAN;" - "35<>$POINT_METEG;" - "70<>$CANT_MAHAPAKH;" - "71<>$CANT_MERKHA;" - "72<>$CANT_MERKHA_KEFULA;" - "73<>$CANT_TIPEHA;" - "74<>$CANT_MUNAH;" - "75>$POINT_METEG;" - "91<>$CANT_TEVIR;" - "92<>$CANT_ETNAHTA;" - "93<>$CANT_YERAH_BEN_YOMO;" - "94<>$CANT_DARGA;" - "95>$POINT_METEG;" - - //Get rid of anything we didn't recognize - "<[:HEBREW:];" - "$letter>;" - - ":: NFC (NFD) ;" - } -} diff --git a/icu/translit_CCAT_Syriac.txt b/icu/translit_CCAT_Syriac.txt deleted file mode 100644 index 74bf876..0000000 --- a/icu/translit_CCAT_Syriac.txt +++ /dev/null @@ -1,87 +0,0 @@ -//-------------------------------------------------------------------- -// Copyright (c) 2001, CrossWire Bible Society -//-------------------------------------------------------------------- - -// CCAT-Syriac - -translit_CCAT_Syriac { - Rule { - ":: NFD (NFC) ;" - - // Variable names, derived from the Unicode names. - "$ALEF=\u0710;" - "$ALEF_SUPERSCRIPT=\u0711;" - "$BET=\u0712;" - "$GIMEL=\u0713;" - "$GIMEL_GARSHUNI=\u0714;" - "$DALET=\u0715;" - "$DALET_DOTLESS=\u0716;" - "$HE=\u0717;" - "$VAV=\u0718;" - "$ZAYIN=\u0719;" - "$HET=\u071A;" - "$TET=\u071B;" - "$TET_GARSHUNI=\u071C;" - "$YOD=\u071D;" - "$YOD_HE=\u071E;" - "$KAF=\u071F;" - "$LAMED=\u0720;" - "$MEM=\u0721;" - "$NUN=\u0722;" - "$SAMEKH=\u0723;" - "$FINAL_SAMEKH=\u0724;" - "$AYIN=\u0725;" - "$PE=\u0726;" - "$PE_REVERSED=\u0727;" - "$TSADI=\u0728;" - "$QOF=\u0729;" - "$RESH=\u072A;" - "$SHIN=\u072B;" - "$TAV=\u072C;" - - "$letter=[[:LATIN:] & [:L:]];" - "$softvowel=[eiyEIY];" - "$vowellike=[$ALEF $AYIN $YOD $VAV $ALEF_SUPERSCRIPT];" - - "'\)'<>$ALEF;" - "''>$ALEF;" - "'\)'<$ALEF_SUPERSCRIPT;" - "B<>$BET;" - "G<>$GIMEL;" - "G<$GIMEL_GARSHUNI;" - "D<>$DALET;" - "D<$DALET_DOTLESS;" - "H<>$HE;" - "W<>$VAV;" - "Z<>$ZAYIN;" - "X<>$HET;" - "'+'<>$TET;" - "'+'<$TET_GARSHUNI;" - "Y<>$YOD;" - "YH<$YOD_HE;" - "K<>$KAF;" - "L<>$LAMED;" - "M<>$MEM;" - "N<>$NUN;" - "S}$letter>$SAMEKH;" - "S<$SAMEKH;" - "S<>$FINAL_SAMEKH;" - "P<>$PE;" - "P<$PE_REVERSED;" - "'\('<>$AYIN;" - "'\`'>$AYIN;" - "C<>$TSADI;" - "Q<>$QOF;" - "R<>$RESH;" - "'#'>$SHIN;" - "'&'>$SHIN;" - "'\$'<>$SHIN;" - "T<>$TAV;" - - //Get rid of anything we didn't recognize - "<[:SYRIAC:];" - "$letter>;" - - ":: NFC (NFD) ;" - } -} diff --git a/icu/translit_Latin_Coptic.txt b/icu/translit_Latin_Coptic.txt deleted file mode 100644 index 5f40008..0000000 --- a/icu/translit_Latin_Coptic.txt +++ /dev/null @@ -1,129 +0,0 @@ -//-------------------------------------------------------------------- -// Copyright 2001, CrossWire Bible Society (http://www.crosswire.org) -// Use freely. -//-------------------------------------------------------------------- -// Based upon SBL standard Coptic transliteration system from -// The SBL Handbook of Style p. 30 -//-------------------------------------------------------------------- - -// Latin-Coptic - -translit_Latin_Coptic { - Rule { - ":: NFD (NFC) ;" - - "$macron = \u0304;" - "$caron = \u030C;" - - //completeness mappings for latin - "C}[^$caron]>|C $caron;" - "c}[^$caron]>|c $caron;" - "Q>|K;" - "q>|k;" - "V>|U;" - "v>|u;" - "W>|U;" - "w>|u;" - "X>|KS;" - "x>|ks;" - "Y>|U;" - "y>|u;" - - //titlecase digraphs - "Th<>\u0398}[:LowercaseLetter:];" - "Ks<>\u039E}[:LowercaseLetter:];" - "Ph<>\u03A6}[:LowercaseLetter:];" - "Kh<>\u03A7}[:LowercaseLetter:];" - "Ps<>\u03A8}[:LowercaseLetter:];" - - //coptic-unique - "Ti<>\u03EE}[:LowercaseLetter:];" - - //uppercase digraphs - "TH<>\u0398;" - "KS<>\u039E;" - "PH<>\u03A6;" - "KH<>\u03A7;" - "PS<>\u03A8;" - - //coptic-unique - "TI<>\u03EE;" - - "E $macron<>\u0397;" - "O $macron<>\u03A9;" - - //coptic-unique - "S $caron<>\u03E2;" - "C $caron<>\u03EC;" - - "A<>\u0391;" - "B<>\u0392;" - "G<>\u0393;" - "D<>\u0394;" - "E<>\u0395;" - "Z<>\u0396;" - "I<>\u0399;" - "K<>\u039A;" - "L<>\u039B;" - "M<>\u039C;" - "N<>\u039D;" - "O<>\u039F;" - "P<>\u03A0;" - "R<>\u03A1;" - "S<>\u03A3;" - "T<>\u03A4;" - "U<>\u03A5;" - - //coptic-unique - "F<>\u03E4;" - "H<>\u03E8;" - "J<>\u03EA;" - - // lowercase digraphs - "th<>\u03B8;" - "ks<>\u03BE;" - "ph<>\u03C6;" - "kh<>\u03C7;" - "ps<>\u03C8;" - - //coptic-unique - "ti<>\u03EF;" - - "e $macron<>\u03B7;" - "o $macron<>\u03C9;" - - //coptic-unique - "s $caron<>\u03E3;" - "c $caron<>\u03ED;" - - "a<>\u03B1;" - "b<>\u03B2;" - "g<>\u03B3;" - "d<>\u03B4;" - "e<>\u03B5;" - "z<>\u03B6;" - "i<>\u03B9;" - "k<>\u03BA;" - "l<>\u03BB;" - "m<>\u03BC;" - "n<>\u03BD;" - "o<>\u03BF;" - "p<>\u03C0;" - "r<>\u03C1;" - "s<\u03C2;" - "s<>\u03C3;" - "t<>\u03C4;" - "u<>\u03C5;" - - //coptic-unique - "f<>\u03E5;" - "h<>\u03E9;" - "j<>\u03EB;" - - //remove untransliterated - "<[:GREEK:];" - "[:LATIN:]>;" - - ":: NFC (NFD) ;" - } -} diff --git a/icu/translit_Latin_Gothic.txt b/icu/translit_Latin_Gothic.txt deleted file mode 100644 index 423f65a..0000000 --- a/icu/translit_Latin_Gothic.txt +++ /dev/null @@ -1,57 +0,0 @@ - // -*- Coding: utf-8; -*- -//-------------------------------------------------------------------- -// Copyright 2001, CrossWire Bible Society (http://www.crosswire.org) -// Use freely. -//-------------------------------------------------------------------- -// Based upon standard Gothic transliteration system from -// http://www.cs.tut.fi/~dla/gothic.html -//-------------------------------------------------------------------- - -// Latin-Gothic - -translit_Latin_Gothic { - Rule { - ":: NFD (NFC) ;" - - ":: [:Ll:] lower() ;" - - // the hv ligature might not be ligatured - "hv> |Æ•;" - - // completeness mapping for latin - "c> |k;" - "v> |w;" - "y> |i;" - - // latin-gothic transliteration - "a<>ðŒ°;" - "b<>ðŒ±;" - "g<>ðŒ²;" - "d<>ðŒ³;" - "e<>ðŒ´;" - "q<>ðŒµ;" - "z<>ðŒ¶;" - "h<>ðŒ·;" - "þ<>ðŒ¸;" - "i<>ðŒ¹;" - "k<>ðŒº;" - "l<>ðŒ»;" - "m<>ðŒ¼;" - "n<>ðŒ½;" - "j<>ðŒ¾;" - "u<>ðŒ¿;" - "p<>ð€;" - "90<ð;" // 90 - "r<>ð‚;" - "s<>ðƒ;" - "t<>ð„;" - "w<>ð…;" - "f<>ð†;" - "x<>ð‡;" - "Æ•<>ðˆ;" - "o<>ð‰;" - "900<ðŠ;" // 900 - - ":: NFC (NFD) ;" - } -} diff --git a/icu/translit_Latin_Ugaritic.txt b/icu/translit_Latin_Ugaritic.txt deleted file mode 100644 index d22ae45..0000000 --- a/icu/translit_Latin_Ugaritic.txt +++ /dev/null @@ -1,63 +0,0 @@ - // -*- Coding: utf-8; -*- -//-------------------------------------------------------------------- -// Copyright 2001, CrossWire Bible Society (http://www.crosswire.org) -// Use freely. -//-------------------------------------------------------------------- -// Based upon SBL standard transliteration system from -// the SBL Handbook of Style p.31 -//-------------------------------------------------------------------- - -// Latin-Ugaritic - -translit_Latin_Ugaritic { - Rule { - ":: NFD (NFC) ;" - - ":: lower() ;" - - // completeness - "c> | k;" - "e> | i;" - "f> | w;" - "j> | i;" - "o> | a;" - "v> | w;" - "x> | k;" - - // ugaritic cuneiform - "h Ì£ <> ðˆ;" - "d ̱ <> ð;" - "z Ì£ <> ð‘;" - "s Ì£ <> ð•;" - "g Ì <> ð™;" - "s Ì€ <> ð;" - - "a <> ð€;" - "b <> ð;" - "g <> ð‚;" - "h Ì®<> ðƒ;" - "d <> ð„;" - "h <> ð…;" - "w <> ð†;" - "z <> ð‡;" - "t Ì£ <> ð‰;" - "y <> ðŠ;" - "k <> ð‹;" - "s ÌŒ <> ðŒ;" - "l <> ð;" - "m <> ðŽ;" - "n <> ð;" - "s <> ð’;" - "Ê¿ <> ð“;" - "p <> ð”;" - "q <> ð–;" - "r <> ð—;" - "t ̱ <> ð˜;" - "t <> ðš;" - "i <> ð›;" - "u <> ðœ;" - "' ' <> ðŸ;" - - ":: NFC (NFD) ;" - } -} diff --git a/icu/translit_swordindex.txt b/icu/translit_swordindex.txt deleted file mode 100644 index 5100c49..0000000 --- a/icu/translit_swordindex.txt +++ /dev/null @@ -1,83 +0,0 @@ -//-------------------------------------------------------------------- -// Copyright (c) 1999-2001, International Business Machines -// Corporation and others. All Rights Reserved. -//-------------------------------------------------------------------- -// THIS IS A MACHINE-GENERATED FILE -// Tool: dumpicurules.bat -// Source: Transliterator_index.txt -// Date: Mon Dec 3 11:44:30 2001 -//-------------------------------------------------------------------- - -//-------------------------------------------------------------------- -// N.B.: This file has been generated mechanically from the -// corresponding ICU4J file, which is the master file that receives -// primary updates. The colon-delimited fields have been split into -// separate strings. For 'file' and 'internal' lines, the encoding -// field has been deleted, since the encoding is processed at build -// time in ICU4C. Certain large rule sets not intended for general -// use have been commented out with the notation "Java only". -//-------------------------------------------------------------------- - -translit_swordindex { - RuleBasedTransliteratorIDs { -// Copyright (c) 2001, International Business Machines Corporation and -// others. All Rights Reserved. -// -// TRANSLITERATOR INDEX FILE. This file lists the non-algorithmic -// system transliterators. It allows arbitrary mappings between -// transliterator IDs and file names, and also allows the system to -// define aliases for transliterators, so that "Latin-Hangul", for -// example, can be implemented transparently as the compound -// "Latin-Jamo;Jamo-Hangul". Internal IDs may also be defined; these -// are invisible to the user, but can be composed together by the -// system to create visible transliterators. -// -// Blank lines and lines beginning with '#' are ignored. -// -// Lines in this file have one of the following forms (text not -// enclosed by <> is literal): -// -// :file::: -// :internal::: -// :alias: -// -// is the ID of the system transliterator being defined. These -// are public IDs enumerated by Transliterator.getAvailableIDs(), -// unless the second field is "internal". -// -// is a ResourceReader resource name. Currently these refer -// to file names under com/ibm/text/resources. This string is passed -// directly to ResourceReader, together with . -// -// is the character encoding to use when reading ; -// passed directly to ResourceReader. E.g., "UTF8". -// -// is either "FORWARD" or "REVERSE". -// -// is a string to be passed directly to -// Transliterator.getInstance(). The returned Transliterator object -// then has its ID changed to and is returned. - -// SWORD additions for academic Biblical transliteration schemes -{ "BGreek-Greek", "file", "translit_BGreek_Greek", "FORWARD" }, -{ "Greek-BGreek", "file", "translit_BGreek_Greek", "REVERSE" }, -{ "Beta-Greek", "file", "translit_BETA_Greek", "FORWARD" }, -{ "Greek-Beta", "file", "translit_BETA_Greek", "REVERSE" }, -{ "CCAT-Hebrew", "file", "translit_CCAT_Hebrew", "FORWARD" }, -{ "Hebrew-CCAT", "file", "translit_CCAT_Hebrew", "REVERSE" } -{ "CCAT-Syriac", "file", "translit_CCAT_Syriac", "FORWARD" }, -{ "Syriac-CCAT", "file", "translit_CCAT_Syriac", "REVERSE" }, - -// SWORD additions for other languages -{ "Latin-Coptic", "file", "translit_Latin_Coptic", "FORWARD" }, -{ "Coptic-Latin", "file", "translit_Latin_Coptic", "REVERSE" }, -{ "Latin-Gothic", "file", "translit_Latin_Gothic", "FORWARD" }, -{ "Gothic-Latin", "file", "translit_Latin_Gothic", "REVERSE" }, -{ "Latin-Ugaritic", "file", "translit_Latin_Ugaritic", "FORWARD" }, -{ "Ugaritic-Latin", "file", "translit_Latin_Ugaritic", "REVERSE" }, - -{ "Any-Latin1", "file", "translit_Any_Latin1", "FORWARD" }, - -// eof - } -} diff --git a/include/Greek2Greek.h b/include/Greek2Greek.h deleted file mode 100644 index 00359c1..0000000 --- a/include/Greek2Greek.h +++ /dev/null @@ -1,117 +0,0 @@ -//***************************************************************************** -// Author : William Dicks *** -// Date Created: 10 February 1998 *** -// Purpose : Interface for Greek to b-Greek conversion and vice versa *** -// File Name : Greek2Greek.h *** -// *** -// Author info : ---------------------------------------------------------- *** -// Address : 23 Tieroogpark *** -// : Hoewe Str *** -// : Elarduspark X3 *** -// : 0181 *** -// : South Africa *** -// Home Tel: +27 (0)12 345 3166 *** -// Cell No : +27 (0)82 577 4424 *** -// e-mail : wd@isis.co.za *** -// Church WWW : http://www.hatfield.co.za *** -//***************************************************************************** -/* - * - * $Id: Greek2Greek.h 1688 2005-01-01 04:42:26Z scribe $ - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#ifndef __GREEK2GREEK -#define __GREEK2GREEK - -#include -SWORD_NAMESPACE_START - -//***************************************************************************** -// Used to convert a string created by using the Greek font supplied with the -// Sword Project to a string that conforms to the b-Greek discussion list -// method of transliteration. -//***************************************************************************** -unsigned char Greek2bGreek (unsigned char *sResult, unsigned char *sGreekText, - int nMaxResultBuflen); - -//***************************************************************************** -// Used to convert a string created by using the b-Greek method of -// transliteration to a string that can be converted to a Greek-font readable -// string. -//***************************************************************************** -unsigned char bGreek2Greek (unsigned char *sResult, - unsigned char *sGreekText, int nMaxResultBuflen); - -//***************************************************************************** -// Parse a Greek font created string and return the b-Greek equivalent -//***************************************************************************** -int ParseGreek (unsigned char *sResult, - unsigned char *sGreekText, int nMaxResultBuflen); - -//***************************************************************************** -// Parse a b-Greek string and return the Greek font equivalent -//***************************************************************************** -int ParsebGreek (unsigned char *sResult, - unsigned char *sGreekText, int nMaxResultBuflen); - -//***************************************************************************** -// Convert a unsigned character to a GREEK font unsigned character -//***************************************************************************** -unsigned char char2Font (unsigned char letter, // bGreek letter to convert to Font letter - bool finalSigma, // Is it a final SIGMA - bool iota, // TRUE = IOTA subscript; FALSE = No IOTA - bool breathing, // TRUE = add breathing; FALSE = no breathing - bool rough); // TRUE = rough breathing; False = smooth - -//***************************************************************************** -// Convert a GREEK font unsigned character to a unsigned character -//***************************************************************************** -unsigned char Font2char (unsigned char letter, // bGreek letter to convert to Font letter - bool & iota, // TRUE = IOTA subscript; FALSE = No IOTA - bool & breathing, // TRUE = add breathing; FALSE = no breathing - bool & rough); // TRUE = rough breathing; False = smooth - - -//***************************************************************************** -// Identify and return a bGreek letter from a special font char -//***************************************************************************** -bool getSpecialChar (unsigned char Font, unsigned char &letter); - -//***************************************************************************** -// true if the font character is a special character; false it isn't -//***************************************************************************** -bool SpecialGreek (unsigned char Font); - -//***************************************************************************** -// Return Greek font puntuation from bGreek punstuation -//***************************************************************************** -unsigned char getGreekPunct (unsigned char bGreek); - -//***************************************************************************** -// Return bGreek puntuation from Greek font punstuation -//***************************************************************************** -unsigned char getbGreekPunct (unsigned char Greek); - -//***************************************************************************** -// Is the character punctuation or a space: true it is, false it isn't -//***************************************************************************** -bool isPunctSpace (unsigned char c); - -SWORD_NAMESPACE_END - -#endif // __GREEK2GREEK diff --git a/include/GreekChars.h b/include/GreekChars.h deleted file mode 100644 index 225f9ef..0000000 --- a/include/GreekChars.h +++ /dev/null @@ -1,154 +0,0 @@ -//***************************************************************************** -// Author : William Dicks *** -// Date Created: 10 February 1998 *** -// Purpose : Enumeration for Greek to b-Greek conversion and vice *** -// : versa. *** -// File Name : GreekChars.h *** -// *** -// Author info : ---------------------------------------------------------- *** -// Address : 23 Tieroogpark *** -// : Hoewe Str *** -// : Elarduspark X3 *** -// : 0181 *** -// : South Africa *** -// Home Tel: +27 (0)12 345 3166 *** -// Cell No : +27 (0)82 577 4424 *** -// e-mail : wd@isis.co.za *** -// Church WWW : http://www.hatfield.co.za *** -//***************************************************************************** -/* - * - * $Id: GreekChars.h 1688 2005-01-01 04:42:26Z scribe $ - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#ifndef __GREEKCHARS_H -#define __GREEKCHARS_H - -// This enum represents the values of the characters used for the -// transliteration as used on the b-greek discussion list. - -#include -SWORD_NAMESPACE_START - -enum bGreekChars -{ - ALPHA = 65, // A - BETA, // B - CHI, // C - DELTA, // D - EPSILON, // E - PHI, // F - GAMMA, // G - ETA, // H - IOTA, // I - // No J - KAPPA = 75, // K - LAMBDA, // L - MU, // M - NU, // N - OMICRON, // O - PI, // P - THETA, // Q - RHO, // R - SIGMA, // S - TAU, // T - UPSILON, // U - // No V - OMEGA = 'W', // W - XI, // X - PSI, // Y - ZETA, // Z - ROUGH = 104, // h - IOTA_SUB // i -}; - -// This enum represents the values of the characters ib the Greek.ttf font, -// and the comments on the right are the corresponding bGreek equivalents. - -enum GreekFontChars -{ - gALPHA = 'a', // A - gBETA, // B - gCHI, // C - gDELTA, // D - gEPSILON, // E - gPHI, // F - gGAMMA, // G - gETA, // H - gIOTA, // I - gSIGMA_END, // j - gKAPPA, // K - gLAMBDA, // L - gMU, // M - gNU, // N - gOMICRON, // O - gPI, // P - gTHETA, // Q - gRHO, // R - gSIGMA, // S - gTAU, // T - gUPSILON, // U - // No V - gOMEGA = 'w', // W - gXI, // X - gPSI, // Y - gZETA, // Z - gROUGH_ALPHA = 161, // hA - gROUGH_EPSILON = 152, // hE - gROUGH_ETA = 185, // hH - gROUGH_IOTA = 131, // hH - gROUGH_OMICRON = 208, // hH - gROUGH_RHO = 183, // hR - gROUGH_UPSILON = 216, // hU - gROUGH_OMEGA = 230, // hW - gIOTA_ALPHA = 'v', // Ai - gIOTA_ETA = 'V', // Ei - gIOTA_OMEGA = 'J', // Wi - gNON_ROUGH_ALPHA = 162, // hA - gNON_ROUGH_EPSILON = 153, // hE - gNON_ROUGH_ETA = 186, // hH - gNON_ROUGH_IOTA = 132, // hH - gNON_ROUGH_OMICRON = 209, // hH - gNON_ROUGH_RHO = 184, // hR - gNON_ROUGH_UPSILON = 217, // hU - gNON_ROUGH_OMEGA = 231 // hW -}; - -// English puntuation as used on bGreek - -enum bGreekPunct -{ - COMMA = ',', - STOP = '.', - SEMI_COLON = ';', - QUESTION = '?' -}; - -// English puntuation as used in the Greek font - -enum GreekPunct -{ - gCOMMA = ',', - gSTOP = '.', - gSEMI_COLON = ':', - gQUESTION = ';' -}; - -SWORD_NAMESPACE_END - -#endif // __GREEKCHARS_H diff --git a/include/Makefile.am b/include/Makefile.am index 92de5cb..de34949 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,8 +1,6 @@ swincludedir = $(top_srcdir)/include -pkginclude_HEADERS = $(swincludedir)/Greek2Greek.h -pkginclude_HEADERS += $(swincludedir)/GreekChars.h -pkginclude_HEADERS += $(swincludedir)/canon.h +pkginclude_HEADERS = $(swincludedir)/canon.h pkginclude_HEADERS += $(swincludedir)/canon_abbrevs.h pkginclude_HEADERS += $(swincludedir)/cipherfil.h pkginclude_HEADERS += $(swincludedir)/curlftpt.h @@ -13,16 +11,17 @@ pkginclude_HEADERS += $(swincludedir)/encfiltmgr.h pkginclude_HEADERS += $(swincludedir)/entriesblk.h pkginclude_HEADERS += $(swincludedir)/femain.h pkginclude_HEADERS += $(swincludedir)/filemgr.h -pkginclude_HEADERS += $(swincludedir)/versemgr.h +pkginclude_HEADERS += $(swincludedir)/versificationmgr.h pkginclude_HEADERS += $(swincludedir)/flatapi.h pkginclude_HEADERS += $(swincludedir)/ftpparse.h -pkginclude_HEADERS += $(swincludedir)/ftptrans.h +pkginclude_HEADERS += $(swincludedir)/remotetrans.h pkginclude_HEADERS += $(swincludedir)/ftplibftpt.h pkginclude_HEADERS += $(swincludedir)/ftplib.h pkginclude_HEADERS += $(swincludedir)/gbffootnotes.h pkginclude_HEADERS += $(swincludedir)/gbfheadings.h pkginclude_HEADERS += $(swincludedir)/gbfhtml.h +pkginclude_HEADERS += $(swincludedir)/gbfxhtml.h pkginclude_HEADERS += $(swincludedir)/gbfhtmlhref.h pkginclude_HEADERS += $(swincludedir)/gbfwebif.h pkginclude_HEADERS += $(swincludedir)/gbfmorph.h @@ -47,8 +46,11 @@ pkginclude_HEADERS += $(swincludedir)/markupfiltmgr.h pkginclude_HEADERS += $(swincludedir)/multimapwdef.h pkginclude_HEADERS += $(swincludedir)/nullim.h +pkginclude_HEADERS += $(swincludedir)/osisglosses.h +pkginclude_HEADERS += $(swincludedir)/osisenum.h pkginclude_HEADERS += $(swincludedir)/osisheadings.h pkginclude_HEADERS += $(swincludedir)/osishtmlhref.h +pkginclude_HEADERS += $(swincludedir)/osisxhtml.h pkginclude_HEADERS += $(swincludedir)/osiswebif.h pkginclude_HEADERS += $(swincludedir)/osismorph.h pkginclude_HEADERS += $(swincludedir)/osismorphsegmentation.h @@ -62,11 +64,11 @@ pkginclude_HEADERS += $(swincludedir)/osisredletterwords.h pkginclude_HEADERS += $(swincludedir)/osisscripref.h pkginclude_HEADERS += $(swincludedir)/osiswordjs.h pkginclude_HEADERS += $(swincludedir)/osisvariants.h +pkginclude_HEADERS += $(swincludedir)/osisxlit.h pkginclude_HEADERS += $(swincludedir)/papyriplain.h -pkginclude_HEADERS += $(swincludedir)/plainfootnotes.h -pkginclude_HEADERS += $(swincludedir)/plainhtml.h pkginclude_HEADERS += $(swincludedir)/rawcom.h +pkginclude_HEADERS += $(swincludedir)/rawcom4.h pkginclude_HEADERS += $(swincludedir)/rawfiles.h pkginclude_HEADERS += $(swincludedir)/rawgenbook.h pkginclude_HEADERS += $(swincludedir)/rawld.h @@ -74,13 +76,16 @@ pkginclude_HEADERS += $(swincludedir)/rawld4.h pkginclude_HEADERS += $(swincludedir)/rawstr.h pkginclude_HEADERS += $(swincludedir)/rawstr4.h pkginclude_HEADERS += $(swincludedir)/rawtext.h +pkginclude_HEADERS += $(swincludedir)/rawtext4.h pkginclude_HEADERS += $(swincludedir)/rawverse.h +pkginclude_HEADERS += $(swincludedir)/rawverse4.h if USE_INTERNAL_REGEX pkginclude_HEADERS += $(swincludedir)/internal/regex/regex.h endif pkginclude_HEADERS += $(swincludedir)/roman.h pkginclude_HEADERS += $(swincludedir)/rtfhtml.h pkginclude_HEADERS += $(swincludedir)/sapphire.h +pkginclude_HEADERS += $(swincludedir)/scsuutf8.h pkginclude_HEADERS += $(swincludedir)/strkey.h pkginclude_HEADERS += $(swincludedir)/swbasicfilter.h pkginclude_HEADERS += $(swincludedir)/swbuf.h @@ -106,7 +111,6 @@ pkginclude_HEADERS += $(swincludedir)/swoptfilter.h pkginclude_HEADERS += $(swincludedir)/swobject.h pkginclude_HEADERS += $(swincludedir)/swsearchable.h pkginclude_HEADERS += $(swincludedir)/swtext.h -pkginclude_HEADERS += $(swincludedir)/swunicod.h pkginclude_HEADERS += $(swincludedir)/swversion.h pkginclude_HEADERS += $(swincludedir)/sysdata.h @@ -114,6 +118,7 @@ pkginclude_HEADERS += $(swincludedir)/thmlfootnotes.h pkginclude_HEADERS += $(swincludedir)/thmlgbf.h pkginclude_HEADERS += $(swincludedir)/thmlheadings.h pkginclude_HEADERS += $(swincludedir)/thmlhtml.h +pkginclude_HEADERS += $(swincludedir)/thmlxhtml.h pkginclude_HEADERS += $(swincludedir)/thmlhtmlhref.h pkginclude_HEADERS += $(swincludedir)/thmlwebif.h pkginclude_HEADERS += $(swincludedir)/thmllemma.h @@ -128,6 +133,7 @@ pkginclude_HEADERS += $(swincludedir)/thmlwordjs.h pkginclude_HEADERS += $(swincludedir)/teiplain.h pkginclude_HEADERS += $(swincludedir)/teirtf.h +pkginclude_HEADERS += $(swincludedir)/teixhtml.h pkginclude_HEADERS += $(swincludedir)/teihtmlhref.h pkginclude_HEADERS += $(swincludedir)/treekey.h @@ -154,7 +160,6 @@ pkginclude_HEADERS += $(swincludedir)/utilxml.h pkginclude_HEADERS += $(swincludedir)/versekey.h pkginclude_HEADERS += $(swincludedir)/versetreekey.h pkginclude_HEADERS += $(swincludedir)/zcom.h -pkginclude_HEADERS += $(swincludedir)/zconf.h pkginclude_HEADERS += $(swincludedir)/zipcomprs.h pkginclude_HEADERS += $(swincludedir)/zld.h pkginclude_HEADERS += $(swincludedir)/zstr.h @@ -167,11 +172,13 @@ pkginclude_HEADERS += $(swincludedir)/canon_mt.h pkginclude_HEADERS += $(swincludedir)/canon_nrsv.h pkginclude_HEADERS += $(swincludedir)/canon_nrsva.h pkginclude_HEADERS += $(swincludedir)/canon_synodal.h +pkginclude_HEADERS += $(swincludedir)/canon_synodalprot.h pkginclude_HEADERS += $(swincludedir)/canon_vulg.h pkginclude_HEADERS += $(swincludedir)/canon_german.h pkginclude_HEADERS += $(swincludedir)/canon_luther.h pkginclude_HEADERS += $(swincludedir)/canon_catholic.h pkginclude_HEADERS += $(swincludedir)/canon_catholic2.h -pkginclude_HEADERS += $(swincludedir)/canon_synodalp.h +pkginclude_HEADERS += $(swincludedir)/canon_lxx.h +pkginclude_HEADERS += $(swincludedir)/canon_orthodox.h pkginclude_HEADERS += $(swincludedir)/canon_null.h diff --git a/include/SwordAPI.pas b/include/SwordAPI.pas index 837ff2d..07342bc 100644 --- a/include/SwordAPI.pas +++ b/include/SwordAPI.pas @@ -1,8 +1,10 @@ -{* +{****************************************************************************** * - * $Id: SwordAPI.pas 1688 2005-01-01 04:42:26Z scribe $ + * SwordAPI.pas - + * + * $Id: SwordAPI.pas 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/bz2comprs.h b/include/bz2comprs.h new file mode 100644 index 0000000..c1e1648 --- /dev/null +++ b/include/bz2comprs.h @@ -0,0 +1,45 @@ +/****************************************************************************** + * + * bz2comprs.h - Bzip2Compress, a driver class that provides bzip2 + * compression (Burrows–Wheeler with Huffman coding) + * + * $Id: bz2comprs.h 2858 2013-07-08 03:08:10Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef BZ2COMPRS_H +#define BZ2COMPRS_H + +#include + +#include + +SWORD_NAMESPACE_START + +class SWDLLEXPORT Bzip2Compress : public SWCompress { + +protected: +public: + Bzip2Compress(); + virtual ~Bzip2Compress(); + + virtual void Encode(void); + virtual void Decode(void); +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/canon.h b/include/canon.h index 95222c4..8f6a977 100644 --- a/include/canon.h +++ b/include/canon.h @@ -1,9 +1,10 @@ /****************************************************************************** - * canon.h - Canonical text information to be included by VerseKey.cpp * - * $Id: canon.h 2365 2009-04-29 19:30:06Z chrislit $ + * canon.h - Canonical text information to be included by VerseKey.cpp * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: canon.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -110,93 +111,134 @@ struct sbook ntbooks[] = { int vm[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, - 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 55, 32, 20, 31, 29, 43, 36, - 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, // Exodus - 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, - 26, 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, - 31, 43, 38, + 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, // Leviticus - 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, - 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 16, 33, 45, 41, 50, 13, 32, 22, - 29, 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 50, 13, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 32, 18, 29, 23, 22, 20, 22, 21, - 20, 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, - 9, 45, 34, 16, 33, + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, // Judges - 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, - 48, 25, + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // Ruth 22, 23, 18, 22, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, - 42, 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, + 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 33, 43, - 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, - 43, 29, 53, + 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 53, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 21, 21, 25, 29, 38, 20, 41, 37, 37, - 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // I Chronicles - 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, 47, 40, 14, 17, 29, 43, 27, 17, 19, - 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, + 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 22, 15, 19, 14, 19, 34, 11, - 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, 36, 47, 31, + 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, + 36, 47, 31, // Esther 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, - 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, - 30, 24, 34, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 30, 24, + 34, 17, // Psalms - 6, 12, 8, 8, 12, 10, 17, 9, 20, 18, 7, 8, 6, 7, 5, 11, 15, 50, 14, 9, 13, - 31, 6, 10, 22, 12, 14, 9, 11, 12, 24, 11, 22, 22, 28, 12, 40, 22, 13, 17, - 13, 11, 5, 26, 17, 11, 9, 14, 20, 23, 19, 9, 6, 7, 23, 13, 11, 11, 17, 12, - 8, 12, 11, 10, 13, 20, 7, 35, 36, 5, 24, 20, 28, 23, 10, 12, 20, 72, 13, - 19, 16, 8, 18, 12, 13, 17, 7, 18, 52, 17, 16, 15, 5, 23, 11, 13, 12, 9, 9, - 5, 8, 28, 22, 35, 45, 48, 43, 13, 31, 7, 10, 10, 9, 8, 18, 19, 2, 29, 176, - 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 13, 10, 7, - 12, 15, 21, 10, 20, 14, 9, 6, + 6, 12, 8, 8, 12, 10, 17, 9, 20, 18, + 7, 8, 6, 7, 5, 11, 15, 50, 14, 9, + 13, 31, 6, 10, 22, 12, 14, 9, 11, 12, + 24, 11, 22, 22, 28, 12, 40, 22, 13, 17, + 13, 11, 5, 26, 17, 11, 9, 14, 20, 23, + 19, 9, 6, 7, 23, 13, 11, 11, 17, 12, + 8, 12, 11, 10, 13, 20, 7, 35, 36, 5, + 24, 20, 28, 23, 10, 12, 20, 72, 13, 19, + 16, 8, 18, 12, 13, 17, 7, 18, 52, 17, + 16, 15, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 28, 22, 35, 45, 48, 43, 13, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 13, + 10, 7, 12, 15, 21, 10, 20, 14, 9, 6, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, - 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ecclesiastes - 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, + 10, 14, // Song of Solomon 17, 17, 11, 16, 16, 13, 13, 14, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, - 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, - 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, - 14, 21, 22, 11, 12, 19, 12, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 12, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, - 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, - 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Lamentations 22, 22, 66, 22, 22, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, - 49, 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, - 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, + 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Daniel - 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, 45, 13, + 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, + 45, 13, // Hosea - 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 16, 9, + 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, + 12, 14, 16, 9, // Joel 20, 32, 21, // Amos @@ -216,30 +258,39 @@ int vm[] = { // Haggai 15, 23, // Zechariah - 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 18, 6, // ----------------------------------------------------------------- // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, - 34, 46, 46, 39, 51, 46, 75, 66, 20, + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, // Mark - 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, 33, 44, 37, 72, 47, 20, + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, - 47, 38, 71, 56, 53, + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, // John - 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, - 31, 25, + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, // Acts - 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, 30, 25, 52, 28, 41, 40, 34, 28, 41, - 38, 40, 30, 35, 27, 27, 32, 44, 31, + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, + 40, 30, 35, 27, 27, 32, 44, 31, // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 23, 33, 27, + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 14, + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 14, // Galatians 24, 21, 29, 31, 26, 18, // Ephesians @@ -261,7 +312,8 @@ int vm[] = { // Philemon 25, // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, // James 27, 26, 18, 17, 20, // I Peter @@ -277,8 +329,9 @@ int vm[] = { // Jude 25, // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 17, 18, 20, 8, 21, 18, 24, 21, - 15, 27, 21 + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 }; diff --git a/include/canon_abbrevs.h b/include/canon_abbrevs.h index f456a5f..a5fc320 100644 --- a/include/canon_abbrevs.h +++ b/include/canon_abbrevs.h @@ -1,7 +1,11 @@ /****************************************************************************** - * canon_abbrevs.h - Canonical text information to be included by VerseKey.cpp * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_abbrevs.h - Canonical text information to be included by + * VerseKey.cpp + * + * $Id: canon_abbrevs.h 2970 2013-08-22 07:03:11Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -171,7 +175,6 @@ const struct abbrev builtin_abbrevs[] = { {"3MEQ", "3Meq"}, // III Meqabyan {"3MEQABYAN", "3Meq"}, // III Meqabyan {"4 BARUCH", "4Bar"}, // IV Baruch - {"4 EZRA", "2Esd"}, // II Esdras {"4 KGDMS", "2Kgs"}, // II Kings {"4 KGS", "2Kgs"}, // II Kings {"4 KINGDOMS", "2Kgs"}, // II Kings @@ -179,7 +182,6 @@ const struct abbrev builtin_abbrevs[] = { {"4 MACCABEES", "4Macc"}, // IV Maccabees {"4BAR", "4Bar"}, // IV Baruch {"4BARUCH", "4Bar"}, // IV Baruch - {"4EZRA", "2Esd"}, // II Esdras {"4KGDMS", "2Kgs"}, // II Kings {"4KGS", "2Kgs"}, // II Kings {"4KINGDOMS", "2Kgs"}, // II Kings @@ -231,9 +233,9 @@ const struct abbrev builtin_abbrevs[] = { {"EPLAO", "EpLao"}, // Laodiceans {"ES", "Esth"}, // Esther {"ESDRAS A", "1Esd"}, // I Esdras - {"ESDRAS B", "2Esd"}, // II Esdras + {"ESDRAS B", "Ezra"}, // II Esdras {"ESDRASA", "1Esd"}, // I Esdras - {"ESDRASB", "2Esd"}, // II Esdras + {"ESDRASB", "Ezra"}, // II Esdras {"ESG", "EsthGr"}, // Esther (Greek) {"ESTER", "Esth"}, // Esther {"ESTH", "Esth"}, // Esther @@ -390,14 +392,12 @@ const struct abbrev builtin_abbrevs[] = { {"ITHESSALONIANS", "1Thess"}, // I Thessalonians {"ITIMOTHY", "1Tim"}, // I Timothy {"IV BARUCH", "4Bar"}, // IV Baruch - {"IV EZRA", "2Esd"}, // II Esdras {"IV KGDMS", "2Kgs"}, // II Kings {"IV KGS", "2Kgs"}, // II Kings {"IV KINGDOMS", "2Kgs"}, // II Kings {"IV KINGS", "2Kgs"}, // II Kings {"IV MACCABEES", "4Macc"}, // IV Maccabees {"IVBARUCH", "4Bar"}, // IV Baruch - {"IVEZRA", "2Esd"}, // II Esdras {"IVKGDMS", "2Kgs"}, // II Kings {"IVKGS", "2Kgs"}, // II Kings {"IVKINGDOMS", "2Kgs"}, // II Kings @@ -476,6 +476,7 @@ const struct abbrev builtin_abbrevs[] = { {"PHILEMON", "Phlm"}, // Philemon {"PHILIPPIANS", "Phil"}, // Philippians {"PHLM", "Phlm"}, // Philemon + {"PHLP", "Phil"}, // Philippians {"PHM", "Phlm"}, // Philemon {"PHP", "Phil"}, // Philippians {"PR", "Prov"}, // Proverbs @@ -533,6 +534,7 @@ const struct abbrev builtin_abbrevs[] = { {"WISDOM", "Wis"}, // Wisdom {"WISDOM OF BEN SIRA", "Sir"}, // Sirach {"WISDOM OF JESUS SON OF SIRACH", "Sir"}, // Sirach + {"WISDOM OF SIRACH", "Sir"}, // Sirach {"WISDOM OF SOLOMON", "Wis"}, // Wisdom {"ZECH", "Zech"}, // Zechariah {"ZECHARIAH", "Zech"}, // Zechariah diff --git a/include/canon_catholic.h b/include/canon_catholic.h index ba69d83..cadec81 100644 --- a/include/canon_catholic.h +++ b/include/canon_catholic.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_catholic.h - Versification data for the Catholic system * - * Copyright 2010 CrossWire Bible Society (http://www.crosswire.org) + * canon_catholic.h - Versification data for the Catholic system + * + * $Id: canon_catholic.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2010-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -85,75 +88,158 @@ struct sbook otbooks_catholic[] = { int vm_catholic[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, // Exodus - 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, // Leviticus - 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 66, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, + 35, 41, 30, 25, 19, 66, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, + 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33, + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, // Judges - 36, 23, 31, 24, 32, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, + 36, 23, 31, 24, 32, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // Ruth 22, 23, 18, 22, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, + 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54, + 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 54, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // I Chronicles - 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, + 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 38, 17, 19, 19, 73, 18, 37, 40, 36, 47, 31, + 11, 20, 38, 17, 19, 19, 73, 18, 37, 40, + 36, 47, 31, // Tobit - 22, 14, 17, 21, 23, 19, 17, 21, 6, 14, 19, 22, 18, 15, + 22, 14, 17, 21, 23, 19, 17, 21, 6, 14, + 19, 22, 18, 15, // Judith - 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25, + 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, + 23, 20, 20, 19, 14, 25, // Esther 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, // I Maccabees - 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 54, 53, 49, 41, 24, + 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, + 74, 54, 53, 49, 41, 24, // II Maccabees - 36, 32, 40, 50, 27, 31, 42, 36, 29, 38, 38, 46, 26, 46, 39, + 36, 32, 40, 50, 27, 31, 42, 36, 29, 38, + 38, 46, 26, 46, 39, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 14, 14, 24, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, 26, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 14, 14, 24, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, + 26, 17, // Psalms - 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 24, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 9, 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, + 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, + 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, + 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, + 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, + 14, 12, 5, 27, 18, 12, 10, 15, 21, 24, + 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, + 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, + 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, + 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, + 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, + 9, 29, 22, 35, 45, 48, 43, 14, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, + 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ecclesiastes - 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, + 10, 14, // Song of Solomon 17, 17, 11, 17, 16, 12, 14, 14, // Wisdom - 16, 24, 19, 20, 23, 25, 30, 21, 19, 21, 26, 27, 19, 31, 19, 29, 21, 25, 22, + 16, 24, 19, 20, 23, 25, 30, 21, 19, 21, + 26, 27, 19, 31, 19, 29, 21, 25, 22, // Sirach - 30, 18, 31, 31, 17, 37, 36, 19, 18, 31, 34, 18, 26, 27, 20, 30, 32, 33, 30, 32, 28, 27, 28, 34, 26, 29, 30, 26, 28, 25, 31, 24, 33, 31, 26, 31, 31, 34, 35, 30, 27, 25, 35, 23, 26, 20, 25, 25, 16, 29, 30, + 30, 18, 31, 31, 17, 37, 36, 19, 18, 31, + 34, 18, 26, 27, 20, 30, 32, 33, 30, 32, + 28, 27, 28, 34, 26, 29, 30, 26, 28, 25, + 31, 24, 33, 31, 26, 31, 31, 34, 35, 30, + 27, 25, 35, 23, 26, 20, 25, 25, 16, 29, + 30, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 24, 21, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 11, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 24, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 11, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Lamentations 22, 22, 66, 22, 22, // Baruch 22, 35, 38, 37, 9, 72, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Daniel - 21, 49, 100, 34, 30, 29, 28, 27, 27, 21, 45, 13, 64, 43, + 21, 49, 100, 34, 30, 29, 28, 27, 27, 21, + 45, 13, 64, 43, // Hosea - 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10, + 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, + 11, 15, 15, 10, // Joel 20, 27, 5, 21, // Amos @@ -173,25 +259,38 @@ int vm_catholic[] = { // Haggai 15, 23, // Zechariah - 17, 17, 10, 16, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 17, 17, 10, 16, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 24, // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20, + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, // Mark - 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, 33, 44, 37, 72, 47, 20, + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53, + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, // John - 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, // Acts - 26, 47, 26, 37, 42, 15, 60, 40, 43, 49, 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, 40, 30, 35, 27, 27, 32, 44, 31, + 26, 47, 26, 37, 42, 15, 60, 40, 43, 49, + 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, + 40, 30, 35, 27, 27, 32, 44, 31, // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 23, 33, 27, + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 13, + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 13, // Galatians 24, 21, 29, 31, 26, 18, // Ephesians @@ -213,7 +312,8 @@ int vm_catholic[] = { // Philemon 25, // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, // James 27, 26, 18, 17, 20, // I Peter @@ -229,7 +329,9 @@ int vm_catholic[] = { // Jude 25, // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 }; diff --git a/include/canon_catholic2.h b/include/canon_catholic2.h index 9a2ca45..e0a5a20 100644 --- a/include/canon_catholic2.h +++ b/include/canon_catholic2.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_catholic2.h - Versification data for the Catholic2 system * - * Copyright 2010 CrossWire Bible Society (http://www.crosswire.org) + * canon_catholic2.h - Versification data for the Catholic2 system + * + * $Id: canon_catholic2.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2010-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -87,75 +90,159 @@ struct sbook otbooks_catholic2[] = { int vm_catholic2[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, // Exodus - 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, // Leviticus - 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 66, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, + 35, 41, 30, 25, 19, 66, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, + 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33, + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, // Judges - 36, 23, 31, 24, 32, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, + 36, 23, 31, 24, 32, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // Ruth 22, 23, 18, 22, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, + 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54, + 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 54, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // I Chronicles - 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, + 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 38, 17, 19, 19, 73, 18, 37, 40, 36, 47, 31, + 11, 20, 38, 17, 19, 19, 73, 18, 37, 40, + 36, 47, 31, // Tobit - 22, 14, 17, 21, 23, 19, 17, 21, 6, 14, 19, 22, 18, 15, + 22, 14, 17, 21, 23, 19, 17, 21, 6, 14, + 19, 22, 18, 15, // Judith - 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25, + 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, + 23, 20, 20, 19, 14, 25, // Esther - 22, 23, 15, 17, 14, 14, 10, 17, 32, 13, 12, 6, 18, 19, 19, 24, + 22, 23, 15, 17, 14, 14, 10, 17, 32, 13, + 12, 6, 18, 19, 19, 24, // I Maccabees - 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 54, 53, 49, 41, 24, + 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, + 74, 54, 53, 49, 41, 24, // II Maccabees - 36, 32, 40, 50, 27, 31, 42, 36, 29, 38, 38, 46, 26, 46, 39, + 36, 32, 40, 50, 27, 31, 42, 36, 29, 38, + 38, 46, 26, 46, 39, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 14, 14, 24, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, 26, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 14, 14, 24, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, + 26, 17, // Psalms - 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 24, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 9, 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, + 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, + 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, + 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, + 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, + 14, 12, 5, 27, 18, 12, 10, 15, 21, 24, + 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, + 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, + 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, + 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, + 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, + 9, 29, 22, 35, 45, 48, 43, 14, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, + 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ecclesiastes - 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, + 10, 14, // Song of Solomon 17, 17, 11, 17, 16, 12, 14, 14, // Wisdom - 16, 24, 19, 20, 23, 25, 30, 21, 19, 21, 26, 27, 19, 31, 19, 29, 21, 25, 22, + 16, 24, 19, 20, 23, 25, 30, 21, 19, 21, + 26, 27, 19, 31, 19, 29, 21, 25, 22, // Sirach - 30, 18, 31, 31, 17, 37, 36, 19, 18, 31, 34, 18, 26, 27, 20, 30, 32, 33, 30, 32, 28, 27, 28, 34, 26, 29, 30, 26, 28, 25, 31, 24, 33, 31, 26, 31, 31, 34, 35, 30, 27, 25, 35, 23, 26, 20, 25, 25, 16, 29, 30, + 30, 18, 31, 31, 17, 37, 36, 19, 18, 31, + 34, 18, 26, 27, 20, 30, 32, 33, 30, 32, + 28, 27, 28, 34, 26, 29, 30, 26, 28, 25, + 31, 24, 33, 31, 26, 31, 31, 34, 35, 30, + 27, 25, 35, 23, 26, 20, 25, 25, 16, 29, + 30, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 24, 21, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 11, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 24, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 11, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Lamentations 22, 22, 66, 22, 22, // Baruch 22, 35, 38, 37, 9, 72, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Daniel - 21, 49, 100, 34, 30, 29, 28, 27, 27, 21, 45, 13, 64, 43, + 21, 49, 100, 34, 30, 29, 28, 27, 27, 21, + 45, 13, 64, 43, // Hosea - 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10, + 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, + 11, 15, 15, 10, // Joel 20, 27, 5, 21, // Amos @@ -175,25 +262,38 @@ int vm_catholic2[] = { // Haggai 15, 23, // Zechariah - 17, 17, 10, 16, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 17, 17, 10, 16, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 24, // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20, + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, // Mark - 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, 33, 44, 37, 72, 47, 20, + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53, + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, // John - 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, // Acts - 26, 47, 26, 37, 42, 15, 60, 40, 43, 49, 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, 40, 30, 35, 27, 27, 32, 44, 31, + 26, 47, 26, 37, 42, 15, 60, 40, 43, 49, + 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, + 40, 30, 35, 27, 27, 32, 44, 31, // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 23, 33, 27, + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 13, + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 13, // Galatians 24, 21, 29, 31, 26, 18, // Ephesians @@ -215,7 +315,8 @@ int vm_catholic2[] = { // Philemon 25, // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, // James 27, 26, 18, 17, 20, // I Peter @@ -231,7 +332,9 @@ int vm_catholic2[] = { // Jude 25, // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 }; diff --git a/include/canon_german.h b/include/canon_german.h index 3c132d5..ef6c835 100644 --- a/include/canon_german.h +++ b/include/canon_german.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_german.h - Versification data for the German system * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_german.h - Versification data for the German system + * + * $Id: canon_german.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -78,61 +81,134 @@ struct sbook otbooks_german[] = { int vm_german[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, // Exodus - 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, // Leviticus - 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, + 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, + 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33, + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, // Judges - 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // Ruth 22, 23, 18, 22, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, + 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54, + 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 54, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 20, 22, 25, 29, 39, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 20, 22, 25, 29, 39, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // I Chronicles - 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, + 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 38, 17, 19, 19, 73, 18, 37, 40, 36, 47, 31, + 11, 20, 38, 17, 19, 19, 73, 18, 37, 40, + 36, 47, 31, // Esther 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, 26, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, + 26, 17, // Psalms - 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, + 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, + 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, + 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, + 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, + 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, + 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, + 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, + 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, + 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, + 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, + 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ecclesiastes - 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, + 10, 14, // Song of Solomon 17, 17, 11, 16, 16, 12, 14, 14, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 23, 20, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 11, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 23, 20, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 11, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Lamentations 22, 22, 66, 22, 22, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Daniel - 21, 49, 33, 34, 30, 29, 28, 27, 27, 21, 45, 13, + 21, 49, 33, 34, 30, 29, 28, 27, 27, 21, + 45, 13, // Hosea - 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10, + 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, + 11, 15, 15, 10, // Joel 20, 27, 5, 21, // Amos @@ -152,25 +228,38 @@ int vm_german[] = { // Haggai 15, 23, // Zechariah - 17, 17, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 17, 17, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 24, // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20, + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, // Mark - 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, 33, 44, 37, 72, 47, 20, + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53, + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, // John - 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, // Acts - 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, 30, 25, 52, 28, 41, 40, 34, 28, 40, 38, 40, 30, 35, 27, 27, 32, 44, 31, + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 40, 38, + 40, 30, 35, 27, 27, 32, 44, 31, // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 23, 33, 27, + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 13, + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 13, // Galatians 24, 21, 29, 31, 26, 18, // Ephesians @@ -192,7 +281,8 @@ int vm_german[] = { // Philemon 25, // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, // James 27, 26, 18, 17, 20, // I Peter @@ -208,7 +298,9 @@ int vm_german[] = { // Jude 25, // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 }; diff --git a/include/canon_kjva.h b/include/canon_kjva.h index 866ec83..e97dd01 100644 --- a/include/canon_kjva.h +++ b/include/canon_kjva.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_kjva.h - Versification data for the KJVA system * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_kjva.h - Versification data for the KJVA system + * + * $Id: canon_kjva.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -94,61 +97,134 @@ struct sbook otbooks_kjva[] = { int vm_kjva[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, // Exodus - 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, // Leviticus - 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 16, 33, 45, 41, 50, 13, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 50, 13, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33, + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, // Judges - 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // Ruth 22, 23, 18, 22, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, + 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 53, + 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 53, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // I Chronicles - 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, + 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, 36, 47, 31, + 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, + 36, 47, 31, // Esther 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 24, 34, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 30, 24, + 34, 17, // Psalms - 6, 12, 8, 8, 12, 10, 17, 9, 20, 18, 7, 8, 6, 7, 5, 11, 15, 50, 14, 9, 13, 31, 6, 10, 22, 12, 14, 9, 11, 12, 24, 11, 22, 22, 28, 12, 40, 22, 13, 17, 13, 11, 5, 26, 17, 11, 9, 14, 20, 23, 19, 9, 6, 7, 23, 13, 11, 11, 17, 12, 8, 12, 11, 10, 13, 20, 7, 35, 36, 5, 24, 20, 28, 23, 10, 12, 20, 72, 13, 19, 16, 8, 18, 12, 13, 17, 7, 18, 52, 17, 16, 15, 5, 23, 11, 13, 12, 9, 9, 5, 8, 28, 22, 35, 45, 48, 43, 13, 31, 7, 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 13, 10, 7, 12, 15, 21, 10, 20, 14, 9, 6, + 6, 12, 8, 8, 12, 10, 17, 9, 20, 18, + 7, 8, 6, 7, 5, 11, 15, 50, 14, 9, + 13, 31, 6, 10, 22, 12, 14, 9, 11, 12, + 24, 11, 22, 22, 28, 12, 40, 22, 13, 17, + 13, 11, 5, 26, 17, 11, 9, 14, 20, 23, + 19, 9, 6, 7, 23, 13, 11, 11, 17, 12, + 8, 12, 11, 10, 13, 20, 7, 35, 36, 5, + 24, 20, 28, 23, 10, 12, 20, 72, 13, 19, + 16, 8, 18, 12, 13, 17, 7, 18, 52, 17, + 16, 15, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 28, 22, 35, 45, 48, 43, 13, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 13, + 10, 7, 12, 15, 21, 10, 20, 14, 9, 6, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ecclesiastes - 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, + 10, 14, // Song of Solomon 17, 17, 11, 16, 16, 13, 13, 14, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 12, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 12, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Lamentations 22, 22, 66, 22, 22, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, + 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Daniel - 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, 45, 13, + 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, + 45, 13, // Hosea - 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 16, 9, + 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, + 12, 14, 16, 9, // Joel 20, 32, 21, // Amos @@ -168,23 +244,34 @@ int vm_kjva[] = { // Haggai 15, 23, // Zechariah - 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 18, 6, // I Esdras 58, 30, 24, 63, 73, 34, 15, 96, 55, // II Esdras - 40, 48, 36, 52, 56, 59, 70, 63, 47, 59, 46, 51, 58, 48, 63, 78, + 40, 48, 36, 52, 56, 59, 70, 63, 47, 59, + 46, 51, 58, 48, 63, 78, // Tobit - 22, 14, 17, 21, 22, 17, 18, 21, 6, 12, 19, 22, 18, 15, + 22, 14, 17, 21, 22, 17, 18, 21, 6, 12, + 19, 22, 18, 15, // Judith - 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 13, 25, + 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, + 23, 20, 20, 19, 13, 25, // Additions to Esther - 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 12, 6, 18, 19, 16, 24, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, + 12, 6, 18, 19, 16, 24, // Wisdom - 16, 24, 19, 20, 23, 25, 30, 21, 18, 21, 26, 27, 19, 31, 19, 29, 21, 25, 22, + 16, 24, 19, 20, 23, 25, 30, 21, 18, 21, + 26, 27, 19, 31, 19, 29, 21, 25, 22, // Sirach - 30, 18, 31, 31, 15, 37, 36, 19, 18, 31, 34, 18, 26, 27, 20, 30, 32, 33, 30, 32, 28, 27, 28, 34, 26, 29, 30, 26, 28, 25, 31, 24, 31, 26, 20, 26, 31, 34, 35, 30, 24, 25, 33, 22, 26, 20, 25, 25, 16, 29, 30, + 30, 18, 31, 31, 15, 37, 36, 19, 18, 31, + 34, 18, 26, 27, 20, 30, 32, 33, 30, 32, + 28, 27, 28, 34, 26, 29, 30, 26, 28, 25, + 31, 24, 31, 26, 20, 26, 31, 34, 35, 30, + 24, 25, 33, 22, 26, 20, 25, 25, 16, 29, + 30, // Baruch 22, 35, 37, 37, 9, 73, // Prayer of Azariah @@ -196,25 +283,39 @@ int vm_kjva[] = { // Prayer of Manasses 1, // I Maccabees - 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 53, 53, 49, 41, 24, + 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, + 74, 53, 53, 49, 41, 24, // II Maccabees - 36, 32, 40, 50, 27, 31, 42, 36, 29, 38, 38, 45, 26, 46, 39, + 36, 32, 40, 50, 27, 31, 42, 36, 29, 38, + 38, 45, 26, 46, 39, // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20, + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, // Mark - 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, 33, 44, 37, 72, 47, 20, + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53, + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, // John - 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, // Acts - 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, 40, 30, 35, 27, 27, 32, 44, 31, + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, + 40, 30, 35, 27, 27, 32, 44, 31, // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 23, 33, 27, + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 14, + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 14, // Galatians 24, 21, 29, 31, 26, 18, // Ephesians @@ -236,7 +337,8 @@ int vm_kjva[] = { // Philemon 25, // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, // James 27, 26, 18, 17, 20, // I Peter @@ -252,7 +354,9 @@ int vm_kjva[] = { // Jude 25, // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 }; diff --git a/include/canon_leningrad.h b/include/canon_leningrad.h index 54b1669..edd576b 100644 --- a/include/canon_leningrad.h +++ b/include/canon_leningrad.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_leningrad.h - Versification data for the Leningrad system * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_leningrad.h - Versification data for the Leningrad system + * + * $Id: canon_leningrad.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -80,35 +83,79 @@ struct sbook otbooks_leningrad[] = { int vm_leningrad[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, // Exodus - 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, // Leviticus - 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, + 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, + 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33, + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, // Judges - 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, + 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54, + 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 54, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 23, 20, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 11, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 23, 20, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 11, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Hosea - 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10, + 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, + 11, 15, 15, 10, // Joel 20, 27, 5, 21, // Amos @@ -128,35 +175,65 @@ int vm_leningrad[] = { // Haggai 15, 23, // Zechariah - 17, 17, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 17, 17, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 24, // I Chronicles - 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, + 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Psalms - 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, + 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, + 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, + 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, + 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, + 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, + 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, + 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, + 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, + 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, + 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, + 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, 26, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, + 26, 17, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ruth 22, 23, 18, 22, // Song of Solomon 17, 17, 11, 16, 16, 12, 14, 14, // Ecclesiastes - 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, + 10, 14, // Lamentations 22, 22, 66, 22, 22, // Esther 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, // Daniel - 21, 49, 33, 34, 30, 29, 28, 27, 27, 21, 45, 13, + 21, 49, 33, 34, 30, 29, 28, 27, 27, 21, + 45, 13, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 38, 17, 19, 19, 72, 18, 37, 40, 36, 47, 31 + 11, 20, 38, 17, 19, 19, 72, 18, 37, 40, + 36, 47, 31 }; diff --git a/include/canon_luther.h b/include/canon_luther.h index e3c8ef0..f007358 100644 --- a/include/canon_luther.h +++ b/include/canon_luther.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_luther.h - Versification data for the Luther system * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_luther.h - Versification data for the Luther system + * + * $Id: canon_luther.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -119,61 +122,134 @@ struct sbook ntbooks_luther[] = { int vm_luther[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, // Exodus - 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, // Leviticus - 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, + 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, + 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33, + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, // Judges - 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // Ruth 22, 23, 18, 22, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, + 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54, + 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 54, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 20, 22, 25, 29, 39, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 20, 22, 25, 29, 39, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // I Chronicles - 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, + 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 38, 17, 19, 19, 73, 18, 37, 40, 36, 47, 31, + 11, 20, 38, 17, 19, 19, 73, 18, 37, 40, + 36, 47, 31, // Esther 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, 26, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, + 26, 17, // Psalms - 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, + 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, + 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, + 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, + 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, + 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, + 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, + 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, + 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, + 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, + 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, + 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ecclesiastes - 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, + 10, 14, // Song of Solomon 17, 17, 11, 16, 16, 12, 14, 14, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 23, 20, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 11, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 23, 20, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 11, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Lamentations 22, 22, 66, 22, 22, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Daniel - 21, 49, 33, 34, 30, 29, 28, 27, 27, 21, 45, 13, + 21, 49, 33, 34, 30, 29, 28, 27, 27, 21, + 45, 13, // Hosea - 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10, + 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, + 11, 15, 15, 10, // Joel 20, 27, 5, 21, // Amos @@ -193,23 +269,34 @@ int vm_luther[] = { // Haggai 15, 23, // Zechariah - 17, 17, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 17, 17, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 24, // Judith - 11, 18, 12, 14, 26, 20, 24, 28, 15, 21, 17, 21, 31, 16, 16, 31, + 11, 18, 12, 14, 26, 20, 24, 28, 15, 21, + 17, 21, 31, 16, 16, 31, // Wisdom - 16, 25, 19, 20, 24, 27, 30, 21, 19, 21, 26, 27, 19, 31, 19, 29, 21, 25, 21, + 16, 25, 19, 20, 24, 27, 30, 21, 19, 21, + 26, 27, 19, 31, 19, 29, 21, 25, 21, // Tobit - 25, 23, 25, 22, 29, 23, 20, 23, 12, 13, 20, 22, 22, 17, + 25, 23, 25, 22, 29, 23, 20, 23, 12, 13, + 20, 22, 22, 17, // Sirach - 38, 23, 34, 36, 18, 37, 40, 22, 25, 34, 35, 19, 32, 27, 21, 30, 31, 33, 27, 33, 31, 33, 37, 47, 34, 28, 33, 30, 35, 27, 40, 28, 32, 31, 26, 28, 34, 39, 41, 32, 29, 26, 37, 26, 32, 23, 31, 28, 20, 31, 38, + 38, 23, 34, 36, 18, 37, 40, 22, 25, 34, + 35, 19, 32, 27, 21, 30, 31, 33, 27, 33, + 31, 33, 37, 47, 34, 28, 33, 30, 35, 27, + 40, 28, 32, 31, 26, 28, 34, 39, 41, 32, + 29, 26, 37, 26, 32, 23, 31, 28, 20, 31, + 38, // Baruch 22, 35, 38, 37, 9, 73, // I Maccabees - 68, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 54, 54, 49, 41, 24, + 68, 70, 60, 61, 68, 63, 50, 32, 73, 89, + 74, 54, 54, 49, 41, 24, // II Maccabees - 36, 33, 40, 50, 27, 31, 42, 36, 29, 38, 38, 46, 26, 46, 40, + 36, 33, 40, 50, 27, 31, 42, 36, 29, 38, + 38, 46, 26, 46, 40, // Additions to Esther 4, 8, 12, 12, 16, 9, 8, // Additions to Daniel @@ -217,21 +304,33 @@ int vm_luther[] = { // Prayer of Manasses 16, // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20, + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, // Mark - 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, 33, 44, 37, 72, 47, 20, + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53, + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, // John - 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, // Acts - 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, 30, 25, 52, 28, 41, 40, 34, 28, 40, 38, 40, 30, 35, 27, 27, 32, 44, 31, + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 40, 38, + 40, 30, 35, 27, 27, 32, 44, 31, // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 23, 33, 27, + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 13, + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 13, // Galatians 24, 21, 29, 31, 26, 18, // Ephesians @@ -263,13 +362,16 @@ int vm_luther[] = { // III John 15, // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, // James 27, 26, 18, 17, 20, // Jude 25, // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 }; diff --git a/include/canon_lxx.h b/include/canon_lxx.h new file mode 100644 index 0000000..574ea63 --- /dev/null +++ b/include/canon_lxx.h @@ -0,0 +1,403 @@ +/****************************************************************************** + * + * canon_lxx.h - Versification data for the LXX system + * + * $Id: canon_lxx.h 2936 2013-08-02 18:00:19Z chrislit $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + */ + +#ifndef CANON_LXX_H +#define CANON_LXX_H + +SWORD_NAMESPACE_START + + +// Versification system: LXX +// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Neh Esth Jdt Tob 1Macc 2Macc 3Macc 4Macc Ps PrMan Prov Eccl Song Job Wis Sir PssSol Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek PrAzar Sus Dan Bel 1En Odes Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev + +// This is a compromise versification system, intended to allow encoding of Bibles using a number of slightly varying LXX-based versification systems. In particular, it was produced in consultation with OTs: +// Rahlfs', Swete's, Tischendorf's, & Thomson's editions of the LXX +// the NETS, SAAS (OSB OT), Brenton, & Asser translations +// R. H. Charles' & James H. Charlesworth's anthologies of Apocrypha & Pseudepigrapha +// Henry E. J. Howard's Pentateuch and R. R. Ottley's Isaiah translations from the LXX + +// In addition to the LXX OT, the GNT has been included in this system to facilitate production of modern Bibles such as the OSB, which are translated from the LXX but include the NT as well. The following NTs were consulted in producing this versification system: +// Antoniades' Patriarchal GNT and its translation, the EOB +// the NKJV (OSB NT) & NRSV translations + +// All of these Bibles & texts should be accomodated by this versification definition without requiring that any extra verses be appended; as a consequence, no Bible will include every verse of this system. + + +/****************************************************************************** + * [on]tbooks_lxx - initialize static instance for all canonical + * text names and chapmax + */ +struct sbook otbooks_lxx[] = { + {"Genesis", "Gen", "Gen", 50}, + {"Exodus", "Exod", "Exod", 40}, + {"Leviticus", "Lev", "Lev", 27}, + {"Numbers", "Num", "Num", 36}, + {"Deuteronomy", "Deut", "Deut", 34}, + {"Joshua", "Josh", "Josh", 24}, + {"Judges", "Judg", "Judg", 21}, + {"Ruth", "Ruth", "Ruth", 4}, + {"I Samuel", "1Sam", "1Sam", 31}, + {"II Samuel", "2Sam", "2Sam", 24}, + {"I Kings", "1Kgs", "1Kgs", 22}, + {"II Kings", "2Kgs", "2Kgs", 25}, + {"I Chronicles", "1Chr", "1Chr", 29}, + {"II Chronicles", "2Chr", "2Chr", 36}, + {"I Esdras", "1Esd", "1Esd", 9}, + {"Ezra", "Ezra", "Ezra", 10}, + {"Nehemiah", "Neh", "Neh", 13}, + {"Esther", "Esth", "Esth", 16}, + {"Judith", "Jdt", "Jdt", 16}, + {"Tobit", "Tob", "Tob", 14}, + {"I Maccabees", "1Macc", "1Macc", 16}, + {"II Maccabees", "2Macc", "2Macc", 15}, + {"III Maccabees", "3Macc", "3Macc", 7}, + {"IV Maccabees", "4Macc", "4Macc", 18}, + {"Psalms", "Ps", "Ps", 151}, + {"Prayer of Manasses", "PrMan", "PrMan", 1}, + {"Proverbs", "Prov", "Prov", 31}, + {"Ecclesiastes", "Eccl", "Eccl", 12}, + {"Song of Solomon", "Song", "Song", 8}, + {"Job", "Job", "Job", 42}, + {"Wisdom", "Wis", "Wis", 19}, + {"Sirach", "Sir", "Sir", 51}, + {"Psalms of Solomon", "PssSol", "PssSol", 18}, + {"Hosea", "Hos", "Hos", 14}, + {"Amos", "Amos", "Amos", 9}, + {"Micah", "Mic", "Mic", 7}, + {"Joel", "Joel", "Joel", 4}, + {"Obadiah", "Obad", "Obad", 1}, + {"Jonah", "Jonah", "Jonah", 4}, + {"Nahum", "Nah", "Nah", 3}, + {"Habakkuk", "Hab", "Hab", 3}, + {"Zephaniah", "Zeph", "Zeph", 3}, + {"Haggai", "Hag", "Hag", 2}, + {"Zechariah", "Zech", "Zech", 14}, + {"Malachi", "Mal", "Mal", 4}, + {"Isaiah", "Isa", "Isa", 66}, + {"Jeremiah", "Jer", "Jer", 52}, + {"Baruch", "Bar", "Bar", 5}, + {"Lamentations", "Lam", "Lam", 5}, + {"Epistle of Jeremiah", "EpJer", "EpJer", 1}, + {"Ezekiel", "Ezek", "Ezek", 48}, + {"Prayer of Azariah", "PrAzar", "PrAzar", 1}, + {"Susanna", "Sus", "Sus", 1}, + {"Daniel", "Dan", "Dan", 12}, + {"Bel and the Dragon", "Bel", "Bel", 1}, + {"I Enoch", "1En", "1En", 108}, + {"Odes", "Odes", "Odes", 14}, + {"", "", "", 0} +}; + +// for ntbooks_lxx, use ntbooks + +/****************************************************************************** + * Maximum verses per chapter + */ +int vm_lxx[] = { + // Genesis + 31, 25, 25, 26, 32, 23, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 39, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 33, 20, 31, 29, 44, 36, 30, 23, 23, + 57, 39, 34, 34, 28, 34, 31, 22, 33, 26, + // Exodus + 22, 25, 22, 31, 23, 30, 29, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 37, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 40, 21, 29, 23, 38, + // Leviticus + 17, 16, 17, 35, 26, 40, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, + // Numbers + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 34, 45, 41, 50, 28, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 40, 17, + 54, 42, 56, 29, 34, 13, + // Deuteronomy + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 19, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 26, 24, 19, 19, 27, 69, 29, 20, + 30, 52, 29, 12, + // Joshua + 18, 24, 17, 24, 16, 27, 26, 35, 33, 43, + 23, 24, 33, 15, 64, 10, 18, 28, 54, 9, + 49, 34, 16, 36, + // Judges + 36, 23, 31, 24, 32, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 32, 30, 48, + 25, + // Ruth + 22, 23, 18, 22, + // I Samuel + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, + 16, 23, 29, 23, 44, 25, 12, 25, 11, 32, + 13, + // II Samuel + 27, 32, 39, 12, 26, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 44, 26, + 22, 51, 41, 25, + // I Kings + 53, 71, 39, 34, 32, 38, 51, 66, 28, 33, + 44, 54, 34, 31, 34, 42, 24, 46, 21, 43, + 43, 54, + // II Kings + 22, 25, 27, 44, 27, 35, 20, 29, 37, 36, + 21, 22, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, + // I Chronicles + 54, 55, 24, 43, 41, 81, 40, 40, 44, 14, + 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, + // II Chronicles + 18, 18, 17, 23, 14, 42, 22, 18, 31, 19, + 23, 16, 23, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 31, 31, + // I Esdras + 58, 30, 24, 63, 73, 34, 15, 96, 55, + // Ezra + 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, + // Nehemiah + 11, 20, 37, 23, 19, 19, 73, 18, 38, 40, + 36, 47, 31, + // Esther + 22, 23, 15, 17, 22, 14, 10, 17, 35, 13, + 17, 7, 30, 19, 24, 24, + // Judith + 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, + 23, 20, 20, 19, 14, 25, + // Tobit + 22, 14, 17, 21, 23, 19, 18, 21, 6, 14, + 19, 22, 19, 15, + // I Maccabees + 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, + 74, 53, 54, 49, 41, 24, + // II Maccabees + 36, 32, 40, 50, 27, 31, 42, 36, 29, 38, + 38, 46, 26, 46, 39, + // III Maccabees + 29, 33, 30, 21, 51, 41, 23, + // IV Maccabees + 35, 24, 21, 26, 38, 35, 25, 29, 32, 21, + 27, 20, 27, 20, 32, 25, 24, 24, + // Psalms + 6, 13, 9, 9, 13, 11, 18, 10, 40, 8, + 9, 6, 7, 6, 11, 15, 51, 15, 10, 14, + 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, + 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, + 12, 6, 27, 18, 12, 10, 15, 21, 23, 21, + 11, 7, 9, 24, 14, 12, 12, 19, 14, 9, + 13, 12, 11, 14, 20, 8, 36, 37, 7, 24, + 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, + 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, + 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, + 29, 22, 36, 45, 48, 43, 14, 31, 7, 10, + 10, 9, 26, 18, 19, 2, 29, 176, 7, 8, + 9, 4, 8, 5, 7, 5, 6, 8, 8, 3, + 18, 3, 3, 21, 26, 9, 8, 24, 15, 10, + 8, 12, 15, 22, 10, 11, 20, 14, 9, 6, + 7, + // Prayer of Manasses + 15, + // Proverbs + 35, 23, 38, 28, 23, 40, 28, 37, 25, 33, + 31, 31, 27, 36, 38, 33, 30, 24, 29, 30, + 31, 31, 36, 77, 31, 29, 29, 30, 49, 35, + 31, + // Ecclesiastes + 18, 26, 22, 17, 20, 12, 30, 17, 18, 20, + 10, 14, + // Song of Solomon + 17, 17, 11, 16, 17, 13, 14, 15, + // Job + 22, 18, 26, 21, 27, 30, 22, 22, 35, 22, + 20, 25, 28, 22, 35, 23, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 34, 24, 41, 35, 32, + 34, 22, + // Wisdom + 16, 25, 19, 20, 24, 27, 30, 21, 19, 21, + 27, 27, 19, 31, 19, 29, 21, 25, 22, + // Sirach + 30, 18, 31, 31, 15, 37, 36, 19, 18, 31, + 34, 18, 26, 27, 20, 30, 32, 33, 31, 32, + 28, 27, 28, 34, 26, 29, 30, 26, 28, 40, + 31, 26, 33, 31, 26, 31, 31, 35, 35, 30, + 27, 27, 33, 24, 26, 20, 25, 25, 16, 29, + 30, + // Psalms of Solomon + 8, 41, 16, 29, 22, 9, 10, 40, 20, 9, + 9, 8, 12, 10, 15, 15, 51, 14, + // Hosea + 11, 25, 5, 19, 15, 12, 16, 14, 17, 15, + 12, 15, 16, 10, + // Amos + 15, 16, 15, 13, 27, 15, 17, 14, 15, + // Micah + 16, 13, 12, 14, 15, 16, 20, + // Joel + 20, 32, 21, 21, + // Obadiah + 21, + // Jonah + 17, 11, 10, 11, + // Nahum + 15, 14, 19, + // Habakkuk + 17, 20, 19, + // Zephaniah + 18, 15, 21, + // Haggai + 15, 24, + // Zechariah + 21, 17, 11, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, + // Malachi + 14, 17, 24, 6, + // Isaiah + 31, 22, 26, 6, 30, 13, 25, 23, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 26, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 20, 12, 25, 24, + // Jeremiah + 19, 37, 25, 31, 31, 30, 34, 23, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 42, 10, 39, 28, 46, 64, 31, 33, + 47, 44, 24, 22, 19, 32, 24, 40, 44, 26, + 22, 22, 32, 30, 28, 28, 16, 44, 38, 46, + 63, 34, + // Baruch + 22, 35, 38, 37, 9, + // Lamentations + 22, 22, 66, 22, 22, + // Epistle of Jeremiah + 73, + // Ezekiel + 28, 13, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, + // Prayer of Azariah + 68, + // Susanna + 64, + // Daniel + 21, 49, 100, 37, 31, 29, 28, 27, 27, 21, + 45, 13, + // Bel and the Dragon + 42, + // I Enoch + 9, 3, 1, 1, 10, 8, 6, 4, 11, 22, + 2, 6, 10, 25, 12, 4, 8, 16, 3, 8, + 10, 14, 4, 6, 7, 6, 5, 3, 2, 3, + 3, 6, 4, 3, 1, 4, 6, 6, 14, 10, + 9, 3, 4, 1, 6, 8, 4, 10, 4, 5, + 5, 9, 7, 10, 4, 8, 3, 6, 3, 25, + 13, 16, 12, 2, 12, 3, 13, 5, 30, 4, + 17, 37, 8, 17, 9, 14, 9, 17, 6, 8, + 10, 20, 11, 6, 10, 6, 4, 3, 77, 43, + 19, 17, 14, 11, 7, 8, 10, 16, 16, 13, + 9, 11, 15, 13, 2, 19, 3, 15, + // Odes + 19, 43, 10, 20, 20, 19, 45, 88, 79, 88, + 55, 32, 79, 46, + // Matthew + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, + // Mark + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, + // Luke + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, + // John + 52, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, + // Acts + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, + 40, 30, 35, 27, 27, 32, 44, 31, + // Romans + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 26, 33, 27, + // I Corinthians + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, + // II Corinthians + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 14, + // Galatians + 24, 21, 29, 31, 26, 18, + // Ephesians + 23, 22, 21, 32, 33, 24, + // Philippians + 30, 30, 21, 23, + // Colossians + 29, 23, 25, 18, + // I Thessalonians + 10, 20, 13, 18, 28, + // II Thessalonians + 12, 17, 18, + // I Timothy + 20, 15, 16, 16, 25, 21, + // II Timothy + 18, 26, 17, 22, + // Titus + 16, 15, 15, + // Philemon + 25, + // Hebrews + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, + // James + 27, 26, 18, 17, 20, + // I Peter + 25, 25, 22, 19, 14, + // II Peter + 21, 22, 18, + // I John + 10, 29, 24, 21, 21, + // II John + 13, + // III John + 15, + // Jude + 25, + // Revelation of John + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 9, 21, 18, 24, 21, 15, + 27, 21 +}; + + +SWORD_NAMESPACE_END + + +#endif diff --git a/include/canon_mt.h b/include/canon_mt.h index c350bb4..306d7c3 100644 --- a/include/canon_mt.h +++ b/include/canon_mt.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_mt.h - Versification data for the Masoretic Text (MT) system * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_mt.h - Versification data for the Masoretic Text (MT) system + * + * $Id: canon_mt.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -80,35 +83,79 @@ struct sbook otbooks_mt[] = { int vm_mt[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, // Exodus - 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + 22, 25, 22, 31, 23, 30, 29, 28, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, // Leviticus - 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 26, 23, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, + 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, + 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33, + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, // Judges - 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, + 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 32, 44, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54, + 53, 46, 28, 20, 32, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 54, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 23, 20, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 11, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 23, 20, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 11, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 23, 25, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 44, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Hosea - 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10, + 9, 25, 5, 19, 15, 11, 16, 14, 17, 15, + 11, 15, 15, 10, // Joel 20, 27, 5, 21, // Amos @@ -128,35 +175,65 @@ int vm_mt[] = { // Haggai 15, 23, // Zechariah - 17, 17, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 17, 17, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 24, // Psalms - 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, + 6, 12, 9, 9, 13, 11, 18, 10, 21, 18, + 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, + 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, + 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, + 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, + 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, + 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, + 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, + 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, + 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, + 10, 8, 12, 15, 21, 10, 20, 14, 9, 6, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, 26, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, + 26, 17, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ruth 22, 23, 18, 22, // Song of Solomon 17, 17, 11, 16, 16, 12, 14, 14, // Ecclesiastes - 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, + 10, 14, // Lamentations 22, 22, 66, 22, 22, // Esther 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, // Daniel - 21, 49, 33, 34, 30, 29, 28, 27, 27, 21, 45, 13, + 21, 49, 33, 34, 30, 29, 28, 27, 27, 21, + 45, 13, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 38, 17, 19, 19, 72, 18, 37, 40, 36, 47, 31, + 11, 20, 38, 17, 19, 19, 72, 18, 37, 40, + 36, 47, 31, // I Chronicles - 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 41, 66, 40, 40, 44, 14, + 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23 + 18, 17, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23 }; diff --git a/include/canon_nrsv.h b/include/canon_nrsv.h index d6042de..6959512 100644 --- a/include/canon_nrsv.h +++ b/include/canon_nrsv.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_nrsv.h - Versification data for the NRSV system * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_nrsv.h - Versification data for the NRSV system + * + * $Id: canon_nrsv.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -39,61 +42,134 @@ SWORD_NAMESPACE_START int vm_nrsv[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, // Exodus - 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, // Leviticus - 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 16, 33, 45, 41, 50, 13, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 50, 13, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33, + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, // Judges - 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // Ruth 22, 23, 18, 22, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, + 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 53, + 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 53, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // I Chronicles - 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, + 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, 36, 47, 31, + 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, + 36, 47, 31, // Esther 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 24, 34, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 30, 24, + 34, 17, // Psalms - 6, 12, 8, 8, 12, 10, 17, 9, 20, 18, 7, 8, 6, 7, 5, 11, 15, 50, 14, 9, 13, 31, 6, 10, 22, 12, 14, 9, 11, 12, 24, 11, 22, 22, 28, 12, 40, 22, 13, 17, 13, 11, 5, 26, 17, 11, 9, 14, 20, 23, 19, 9, 6, 7, 23, 13, 11, 11, 17, 12, 8, 12, 11, 10, 13, 20, 7, 35, 36, 5, 24, 20, 28, 23, 10, 12, 20, 72, 13, 19, 16, 8, 18, 12, 13, 17, 7, 18, 52, 17, 16, 15, 5, 23, 11, 13, 12, 9, 9, 5, 8, 28, 22, 35, 45, 48, 43, 13, 31, 7, 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 13, 10, 7, 12, 15, 21, 10, 20, 14, 9, 6, + 6, 12, 8, 8, 12, 10, 17, 9, 20, 18, + 7, 8, 6, 7, 5, 11, 15, 50, 14, 9, + 13, 31, 6, 10, 22, 12, 14, 9, 11, 12, + 24, 11, 22, 22, 28, 12, 40, 22, 13, 17, + 13, 11, 5, 26, 17, 11, 9, 14, 20, 23, + 19, 9, 6, 7, 23, 13, 11, 11, 17, 12, + 8, 12, 11, 10, 13, 20, 7, 35, 36, 5, + 24, 20, 28, 23, 10, 12, 20, 72, 13, 19, + 16, 8, 18, 12, 13, 17, 7, 18, 52, 17, + 16, 15, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 28, 22, 35, 45, 48, 43, 13, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 13, + 10, 7, 12, 15, 21, 10, 20, 14, 9, 6, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ecclesiastes - 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, + 10, 14, // Song of Solomon 17, 17, 11, 16, 16, 13, 13, 14, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 12, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 12, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Lamentations 22, 22, 66, 22, 22, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, + 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Daniel - 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, 45, 13, + 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, + 45, 13, // Hosea - 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 16, 9, + 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, + 12, 14, 16, 9, // Joel 20, 32, 21, // Amos @@ -113,25 +189,38 @@ int vm_nrsv[] = { // Haggai 15, 23, // Zechariah - 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 18, 6, // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20, + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, // Mark - 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, 33, 44, 37, 72, 47, 20, + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53, + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, // John - 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, // Acts - 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, 40, 30, 35, 27, 27, 32, 44, 31, + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, + 40, 30, 35, 27, 27, 32, 44, 31, // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 23, 33, 27, + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 14, + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 14, // Galatians 24, 21, 29, 31, 26, 18, // Ephesians @@ -153,7 +242,8 @@ int vm_nrsv[] = { // Philemon 25, // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, // James 27, 26, 18, 17, 20, // I Peter @@ -169,7 +259,9 @@ int vm_nrsv[] = { // Jude 25, // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 }; diff --git a/include/canon_nrsva.h b/include/canon_nrsva.h index 47ada7d..3a4c39a 100644 --- a/include/canon_nrsva.h +++ b/include/canon_nrsva.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_nrsva.h - Versification data for the NRSVA system * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_nrsva.h - Versification data for the NRSVA system + * + * $Id: canon_nrsva.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -21,7 +24,6 @@ SWORD_NAMESPACE_START - // Versification system: NRSVA // Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Tob Jdt EsthGr Wis Sir Bar PrAzar Sus Bel 1Macc 2Macc 1Esd PrMan AddPs 3Macc 2Esd 4Macc Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev @@ -97,61 +99,134 @@ struct sbook otbooks_nrsva[] = { int vm_nrsva[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, // Exodus - 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, // Leviticus - 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 16, 33, 45, 41, 50, 13, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 33, 45, 41, 50, 13, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33, + 18, 24, 17, 24, 15, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, // Judges - 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // Ruth 22, 23, 18, 22, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, + 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 53, + 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 53, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // I Chronicles - 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, + 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, 36, 47, 31, + 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, + 36, 47, 31, // Esther 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 24, 34, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 30, 24, + 34, 17, // Psalms - 6, 12, 8, 8, 12, 10, 17, 9, 20, 18, 7, 8, 6, 7, 5, 11, 15, 50, 14, 9, 13, 31, 6, 10, 22, 12, 14, 9, 11, 12, 24, 11, 22, 22, 28, 12, 40, 22, 13, 17, 13, 11, 5, 26, 17, 11, 9, 14, 20, 23, 19, 9, 6, 7, 23, 13, 11, 11, 17, 12, 8, 12, 11, 10, 13, 20, 7, 35, 36, 5, 24, 20, 28, 23, 10, 12, 20, 72, 13, 19, 16, 8, 18, 12, 13, 17, 7, 18, 52, 17, 16, 15, 5, 23, 11, 13, 12, 9, 9, 5, 8, 28, 22, 35, 45, 48, 43, 13, 31, 7, 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 13, 10, 7, 12, 15, 21, 10, 20, 14, 9, 6, + 6, 12, 8, 8, 12, 10, 17, 9, 20, 18, + 7, 8, 6, 7, 5, 11, 15, 50, 14, 9, + 13, 31, 6, 10, 22, 12, 14, 9, 11, 12, + 24, 11, 22, 22, 28, 12, 40, 22, 13, 17, + 13, 11, 5, 26, 17, 11, 9, 14, 20, 23, + 19, 9, 6, 7, 23, 13, 11, 11, 17, 12, + 8, 12, 11, 10, 13, 20, 7, 35, 36, 5, + 24, 20, 28, 23, 10, 12, 20, 72, 13, 19, + 16, 8, 18, 12, 13, 17, 7, 18, 52, 17, + 16, 15, 5, 23, 11, 13, 12, 9, 9, 5, + 8, 28, 22, 35, 45, 48, 43, 13, 31, 7, + 10, 10, 9, 8, 18, 19, 2, 29, 176, 7, + 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, + 3, 18, 3, 3, 21, 26, 9, 8, 24, 13, + 10, 7, 12, 15, 21, 10, 20, 14, 9, 6, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ecclesiastes - 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, + 10, 14, // Song of Solomon 17, 17, 11, 16, 16, 13, 13, 14, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 12, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 12, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Lamentations 22, 22, 66, 22, 22, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, + 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Daniel - 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, 45, 13, + 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, + 45, 13, // Hosea - 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 16, 9, + 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, + 12, 14, 16, 9, // Joel 20, 32, 21, // Amos @@ -171,19 +246,29 @@ int vm_nrsva[] = { // Haggai 15, 23, // Zechariah - 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 18, 6, // Tobit - 22, 14, 17, 21, 22, 18, 16, 21, 6, 13, 18, 22, 17, 15, + 22, 14, 17, 21, 22, 18, 16, 21, 6, 13, + 18, 22, 17, 15, // Judith - 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25, + 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, + 23, 20, 20, 19, 14, 25, // Esther (Greek) - 22, 23, 15, 17, 14, 14, 10, 17, 32, 13, 12, 6, 18, 19, 16, 24, + 22, 23, 15, 17, 14, 14, 10, 17, 32, 13, + 12, 6, 18, 19, 16, 24, // Wisdom - 16, 24, 19, 20, 23, 25, 30, 21, 18, 21, 26, 27, 19, 31, 19, 29, 21, 25, 22, + 16, 24, 19, 20, 23, 25, 30, 21, 18, 21, + 26, 27, 19, 31, 19, 29, 21, 25, 22, // Sirach - 30, 18, 31, 31, 15, 37, 36, 19, 18, 31, 34, 18, 26, 27, 20, 30, 32, 33, 30, 31, 28, 27, 27, 34, 26, 29, 30, 26, 28, 25, 31, 24, 33, 31, 26, 31, 31, 34, 35, 30, 22, 25, 33, 23, 26, 20, 25, 25, 16, 29, 30, + 30, 18, 31, 31, 15, 37, 36, 19, 18, 31, + 34, 18, 26, 27, 20, 30, 32, 33, 30, 31, + 28, 27, 27, 34, 26, 29, 30, 26, 28, 25, + 31, 24, 33, 31, 26, 31, 31, 34, 35, 30, + 22, 25, 33, 23, 26, 20, 25, 25, 16, 29, + 30, // Baruch 22, 35, 37, 37, 9, 73, // Prayer of Azariah @@ -193,9 +278,11 @@ int vm_nrsva[] = { // Bel and the Dragon 42, // I Maccabees - 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 53, 53, 49, 41, 24, + 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, + 74, 53, 53, 49, 41, 24, // II Maccabees - 36, 32, 40, 50, 27, 31, 42, 36, 29, 38, 38, 45, 26, 46, 39, + 36, 32, 40, 50, 27, 31, 42, 36, 29, 38, + 38, 45, 26, 46, 39, // I Esdras 58, 30, 24, 63, 73, 34, 15, 96, 55, // Prayer of Manasses @@ -205,25 +292,39 @@ int vm_nrsva[] = { // III Maccabees 29, 33, 30, 21, 51, 41, 23, // II Esdras - 40, 48, 36, 52, 56, 59, 140, 63, 47, 59, 46, 51, 58, 48, 63, 78, + 40, 48, 36, 52, 56, 59, 140, 63, 47, 59, + 46, 51, 58, 48, 63, 78, // IV Maccabees - 35, 24, 21, 26, 38, 35, 23, 29, 32, 21, 27, 19, 27, 20, 32, 25, 24, 24, + 35, 24, 21, 26, 38, 35, 23, 29, 32, 21, + 27, 19, 27, 20, 32, 25, 24, 24, // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20, + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, // Mark - 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, 33, 44, 37, 72, 47, 20, + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53, + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, // John - 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, // Acts - 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, 40, 30, 35, 27, 27, 32, 44, 31, + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, + 40, 30, 35, 27, 27, 32, 44, 31, // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 23, 33, 27, + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 14, + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 14, // Galatians 24, 21, 29, 31, 26, 18, // Ephesians @@ -245,7 +346,8 @@ int vm_nrsva[] = { // Philemon 25, // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, // James 27, 26, 18, 17, 20, // I Peter @@ -261,7 +363,9 @@ int vm_nrsva[] = { // Jude 25, // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 }; diff --git a/include/canon_null.h b/include/canon_null.h index ade2276..03c72da 100644 --- a/include/canon_null.h +++ b/include/canon_null.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_null.h - Versification data for the null system * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_null.h - Versification data for the null system + * + * $Id: canon_null.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/canon_orthodox.h b/include/canon_orthodox.h new file mode 100644 index 0000000..dad23ca --- /dev/null +++ b/include/canon_orthodox.h @@ -0,0 +1,370 @@ +/****************************************************************************** + * + * canon_orthodox.h - Versification data for the Orthodox system + * + * $Id: canon_orthodox.h 2936 2013-08-02 18:00:19Z chrislit $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + */ + +#ifndef CANON_ORTHODOX_H +#define CANON_ORTHODOX_H + +SWORD_NAMESPACE_START + + +// Versification system: Orthodox +// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Neh Tob Jdt Esth 1Macc 2Macc 3Macc Ps PrMan Job Prov Eccl Song Wis Sir Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek Sus Dan Bel 4Macc Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev + +// This versification system is based on the LXX versification system, q.v. for more information on the method of its compilation. +// However, this versification system differs from the LXX system in that the book order follows that seen in modern Orthodox Bibles and books seen in some editions of the LXX but absent from modern Orthodox Bibles have been omitted. + + +/****************************************************************************** + * [on]tbooks_orthodox - initialize static instance for all canonical + * text names and chapmax + */ +struct sbook otbooks_orthodox[] = { + {"Genesis", "Gen", "Gen", 50}, + {"Exodus", "Exod", "Exod", 40}, + {"Leviticus", "Lev", "Lev", 27}, + {"Numbers", "Num", "Num", 36}, + {"Deuteronomy", "Deut", "Deut", 34}, + {"Joshua", "Josh", "Josh", 24}, + {"Judges", "Judg", "Judg", 21}, + {"Ruth", "Ruth", "Ruth", 4}, + {"I Samuel", "1Sam", "1Sam", 31}, + {"II Samuel", "2Sam", "2Sam", 24}, + {"I Kings", "1Kgs", "1Kgs", 22}, + {"II Kings", "2Kgs", "2Kgs", 25}, + {"I Chronicles", "1Chr", "1Chr", 29}, + {"II Chronicles", "2Chr", "2Chr", 36}, + {"I Esdras", "1Esd", "1Esd", 9}, + {"Ezra", "Ezra", "Ezra", 10}, + {"Nehemiah", "Neh", "Neh", 13}, + {"Tobit", "Tob", "Tob", 14}, + {"Judith", "Jdt", "Jdt", 16}, + {"Esther", "Esth", "Esth", 16}, + {"I Maccabees", "1Macc", "1Macc", 16}, + {"II Maccabees", "2Macc", "2Macc", 15}, + {"III Maccabees", "3Macc", "3Macc", 7}, + {"Psalms", "Ps", "Ps", 151}, + {"Prayer of Manasses", "PrMan", "PrMan", 1}, + {"Job", "Job", "Job", 42}, + {"Proverbs", "Prov", "Prov", 31}, + {"Ecclesiastes", "Eccl", "Eccl", 12}, + {"Song of Solomon", "Song", "Song", 8}, + {"Wisdom", "Wis", "Wis", 19}, + {"Sirach", "Sir", "Sir", 51}, + {"Hosea", "Hos", "Hos", 14}, + {"Amos", "Amos", "Amos", 9}, + {"Micah", "Mic", "Mic", 7}, + {"Joel", "Joel", "Joel", 4}, + {"Obadiah", "Obad", "Obad", 1}, + {"Jonah", "Jonah", "Jonah", 4}, + {"Nahum", "Nah", "Nah", 3}, + {"Habakkuk", "Hab", "Hab", 3}, + {"Zephaniah", "Zeph", "Zeph", 3}, + {"Haggai", "Hag", "Hag", 2}, + {"Zechariah", "Zech", "Zech", 14}, + {"Malachi", "Mal", "Mal", 4}, + {"Isaiah", "Isa", "Isa", 66}, + {"Jeremiah", "Jer", "Jer", 52}, + {"Baruch", "Bar", "Bar", 5}, + {"Lamentations", "Lam", "Lam", 5}, + {"Epistle of Jeremiah", "EpJer", "EpJer", 1}, + {"Ezekiel", "Ezek", "Ezek", 48}, + {"Susanna", "Sus", "Sus", 1}, + {"Daniel", "Dan", "Dan", 12}, + {"Bel and the Dragon", "Bel", "Bel", 1}, + {"IV Maccabees", "4Macc", "4Macc", 18}, + {"", "", "", 0} +}; + +// for ntbooks_orthodox, use ntbooks + +/****************************************************************************** + * Maximum verses per chapter + */ +int vm_orthodox[] = { + // Genesis + 31, 25, 25, 26, 32, 23, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 39, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 33, 20, 31, 29, 44, 36, 30, 23, 23, + 57, 39, 34, 34, 28, 34, 31, 22, 33, 26, + // Exodus + 22, 25, 22, 31, 23, 30, 29, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 37, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 40, 21, 29, 23, 38, + // Leviticus + 17, 16, 17, 35, 26, 40, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, + // Numbers + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 16, 34, 45, 41, 50, 28, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 40, 17, + 54, 42, 56, 29, 34, 13, + // Deuteronomy + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 19, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 26, 24, 19, 19, 27, 69, 29, 20, + 30, 52, 29, 12, + // Joshua + 18, 24, 17, 24, 16, 27, 26, 35, 33, 43, + 23, 24, 33, 15, 64, 10, 18, 28, 54, 9, + 49, 34, 16, 36, + // Judges + 36, 23, 31, 24, 32, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 32, 30, 48, + 25, + // Ruth + 22, 23, 18, 22, + // I Samuel + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, + 16, 23, 29, 23, 44, 25, 12, 25, 11, 32, + 13, + // II Samuel + 27, 32, 39, 12, 26, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 44, 26, + 22, 51, 41, 25, + // I Kings + 53, 71, 39, 34, 32, 38, 51, 66, 28, 33, + 44, 54, 34, 31, 34, 42, 24, 46, 21, 43, + 43, 54, + // II Kings + 22, 25, 27, 44, 27, 35, 20, 29, 37, 36, + 21, 22, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, + // I Chronicles + 54, 55, 24, 43, 41, 81, 40, 40, 44, 14, + 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, + // II Chronicles + 18, 18, 17, 23, 14, 42, 22, 18, 31, 19, + 23, 16, 23, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 31, 31, + // I Esdras + 58, 30, 24, 63, 73, 34, 15, 96, 55, + // Ezra + 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, + // Nehemiah + 11, 20, 37, 23, 19, 19, 73, 18, 38, 40, + 36, 47, 31, + // Tobit + 22, 14, 17, 21, 23, 19, 18, 21, 6, 14, + 19, 22, 19, 15, + // Judith + 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, + 23, 20, 20, 19, 14, 25, + // Esther + 22, 23, 15, 17, 22, 14, 10, 17, 35, 13, + 17, 7, 30, 19, 24, 24, + // I Maccabees + 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, + 74, 53, 54, 49, 41, 24, + // II Maccabees + 36, 32, 40, 50, 27, 31, 42, 36, 29, 38, + 38, 46, 26, 46, 39, + // III Maccabees + 29, 33, 30, 21, 51, 41, 23, + // Psalms + 6, 13, 9, 9, 13, 11, 18, 10, 40, 8, + 9, 6, 7, 6, 11, 15, 51, 15, 10, 14, + 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, + 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, + 12, 6, 27, 18, 12, 10, 15, 21, 23, 21, + 11, 7, 9, 24, 14, 12, 12, 19, 14, 9, + 13, 12, 11, 14, 20, 8, 36, 37, 7, 24, + 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, + 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, + 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, + 29, 22, 36, 45, 48, 43, 14, 31, 7, 10, + 10, 9, 26, 18, 19, 2, 29, 176, 7, 8, + 9, 4, 8, 5, 7, 5, 6, 8, 8, 3, + 18, 3, 3, 21, 26, 9, 8, 24, 15, 10, + 8, 12, 15, 22, 10, 11, 20, 14, 9, 6, + 7, + // Prayer of Manasses + 15, + // Job + 22, 18, 26, 21, 27, 30, 22, 22, 35, 22, + 20, 25, 28, 22, 35, 23, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 34, 24, 41, 35, 32, + 34, 22, + // Proverbs + 35, 23, 38, 28, 23, 40, 28, 37, 25, 33, + 31, 31, 27, 36, 38, 33, 30, 24, 29, 30, + 31, 31, 36, 77, 31, 29, 29, 30, 49, 35, + 31, + // Ecclesiastes + 18, 26, 22, 17, 20, 12, 30, 17, 18, 20, + 10, 14, + // Song of Solomon + 17, 17, 11, 16, 17, 13, 14, 15, + // Wisdom + 16, 25, 19, 20, 24, 27, 30, 21, 19, 21, + 27, 27, 19, 31, 19, 29, 21, 25, 22, + // Sirach + 30, 18, 31, 31, 15, 37, 36, 19, 18, 31, + 34, 18, 26, 27, 20, 30, 32, 33, 31, 32, + 28, 27, 28, 34, 26, 29, 30, 26, 28, 40, + 31, 26, 33, 31, 26, 31, 31, 35, 35, 30, + 27, 27, 33, 24, 26, 20, 25, 25, 16, 29, + 30, + // Hosea + 11, 25, 5, 19, 15, 12, 16, 14, 17, 15, + 12, 15, 16, 10, + // Amos + 15, 16, 15, 13, 27, 15, 17, 14, 15, + // Micah + 16, 13, 12, 14, 15, 16, 20, + // Joel + 20, 32, 21, 21, + // Obadiah + 21, + // Jonah + 17, 11, 10, 11, + // Nahum + 15, 14, 19, + // Habakkuk + 17, 20, 19, + // Zephaniah + 18, 15, 21, + // Haggai + 15, 24, + // Zechariah + 21, 17, 11, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, + // Malachi + 14, 17, 24, 6, + // Isaiah + 31, 22, 26, 6, 30, 13, 25, 23, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 26, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 20, 12, 25, 24, + // Jeremiah + 19, 37, 25, 31, 31, 30, 34, 23, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 42, 10, 39, 28, 46, 64, 31, 33, + 47, 44, 24, 22, 19, 32, 24, 40, 44, 26, + 22, 22, 32, 30, 28, 28, 16, 44, 38, 46, + 63, 34, + // Baruch + 22, 35, 38, 37, 9, + // Lamentations + 22, 22, 66, 22, 22, + // Epistle of Jeremiah + 73, + // Ezekiel + 28, 13, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, + 37, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, + // Susanna + 64, + // Daniel + 21, 49, 100, 37, 31, 29, 28, 27, 27, 21, + 45, 13, + // Bel and the Dragon + 42, + // IV Maccabees + 35, 24, 21, 26, 38, 35, 25, 29, 32, 21, + 27, 20, 27, 20, 32, 25, 24, 24, + // Matthew + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, + // Mark + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, + // Luke + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, + // John + 52, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, + // Acts + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, + 40, 30, 35, 27, 27, 32, 44, 31, + // Romans + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 26, 33, 27, + // I Corinthians + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, + // II Corinthians + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 14, + // Galatians + 24, 21, 29, 31, 26, 18, + // Ephesians + 23, 22, 21, 32, 33, 24, + // Philippians + 30, 30, 21, 23, + // Colossians + 29, 23, 25, 18, + // I Thessalonians + 10, 20, 13, 18, 28, + // II Thessalonians + 12, 17, 18, + // I Timothy + 20, 15, 16, 16, 25, 21, + // II Timothy + 18, 26, 17, 22, + // Titus + 16, 15, 15, + // Philemon + 25, + // Hebrews + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, + // James + 27, 26, 18, 17, 20, + // I Peter + 25, 25, 22, 19, 14, + // II Peter + 21, 22, 18, + // I John + 10, 29, 24, 21, 21, + // II John + 13, + // III John + 15, + // Jude + 25, + // Revelation of John + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 9, 21, 18, 24, 21, 15, + 27, 21 +}; + + +SWORD_NAMESPACE_END + + +#endif diff --git a/include/canon_synodal.h b/include/canon_synodal.h index 417013b..c153d81 100644 --- a/include/canon_synodal.h +++ b/include/canon_synodal.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_synodal.h - Versification data for the Synodal system * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_synodal.h - Versification data for the Synodal system + * + * $Id: canon_synodal.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -128,65 +131,145 @@ struct sbook ntbooks_synodal[] = { int vm_synodal[] = { // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + // Exodus - 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + // Leviticus - 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, 47, 8, 59, 56, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, + 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, + 47, 8, 59, 56, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 15, 34, 45, 41, 50, 13, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 15, 34, 45, 41, 50, 13, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 24, 16, 26, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 36, + 18, 24, 17, 24, 16, 26, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 36, // Judges - 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, // Ruth 22, 23, 18, 22, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, 15, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, + 15, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 53, + 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 53, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // I Chronicles - 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, + 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Prayer of Manasses 12, // Ezra - 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, + 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, + // Nehemiah - 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, 36, 47, 31, + 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, + 36, 47, 31, // I Esdras 58, 31, 24, 63, 70, 34, 15, 92, 55, // Tobit - 22, 14, 17, 21, 22, 18, 17, 21, 6, 13, 18, 22, 18, 15, + 22, 14, 17, 21, 22, 18, 17, 21, 6, 13, + 18, 22, 18, 15, // Judith - 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25, + 16, 28, 10, 15, 24, 21, 32, 36, 14, 23, + 23, 20, 20, 19, 14, 25, // Esther - 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, + 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, + // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 35, 27, 26, 17, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 35, 27, + 26, 17, // Psalms - 6, 12, 9, 9, 13, 11, 18, 10, 39, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 10, 9, 26, 9, 10, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 7, 12, 15, 21, 10, 11, 9, 14, 9, 6, 7, + 6, 12, 9, 9, 13, 11, 18, 10, 39, 7, + 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, + 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, + 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, + 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, + 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, + 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, + 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, + 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, + 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, + 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, + 10, 9, 26, 9, 10, 2, 29, 176, 7, 8, + 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, + 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, + 7, 12, 15, 21, 10, 11, 9, 14, 9, 6, + 7, // Proverbs - 33, 22, 35, 29, 23, 35, 27, 36, 18, 32, 31, 28, 26, 35, 33, 33, 28, 25, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 29, 23, 35, 27, 36, 18, 32, + 31, 28, 26, 35, 33, 33, 28, 25, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ecclesiastes - 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14, + 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, + 10, 14, // Song of Solomon 16, 17, 11, 16, 16, 12, 14, 14, // Wisdom - 16, 24, 19, 20, 24, 27, 30, 21, 19, 21, 27, 28, 19, 31, 19, 29, 20, 25, 21, + 16, 24, 19, 20, 24, 27, 30, 21, 19, 21, + 27, 28, 19, 31, 19, 29, 20, 25, 21, // Sirach - 30, 18, 31, 35, 18, 37, 39, 22, 23, 34, 34, 18, 32, 27, 20, 31, 31, 33, 28, 31, 31, 31, 37, 37, 29, 27, 33, 30, 31, 27, 37, 25, 33, 26, 23, 29, 34, 39, 42, 32, 29, 26, 36, 27, 31, 23, 31, 28, 18, 31, 38, + 30, 18, 31, 35, 18, 37, 39, 22, 23, 34, + 34, 18, 32, 27, 20, 31, 31, 33, 28, 31, + 31, 31, 37, 37, 29, 27, 33, 30, 31, 27, + 37, 25, 33, 26, 23, 29, 34, 39, 42, 32, + 29, 26, 36, 27, 31, 23, 31, 28, 18, 31, + 38, // Isaiah - 31, 22, 25, 6, 30, 13, 25, 22, 21, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 12, 25, 24, + 31, 22, 25, 6, 30, 13, 25, 22, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 12, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Lamentations 22, 22, 66, 22, 22, // Epistle of Jeremiah @@ -194,11 +277,17 @@ int vm_synodal[] = { // Baruch 22, 35, 38, 37, 9, // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, + 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Daniel - 21, 49, 100, 34, 31, 28, 28, 27, 27, 21, 45, 13, 64, 42, + 21, 49, 100, 34, 31, 28, 28, 27, 27, 21, + 45, 13, 64, 42, // Hosea - 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 15, 10, + 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, + 12, 14, 15, 10, // Joel 20, 32, 21, // Amos @@ -218,27 +307,40 @@ int vm_synodal[] = { // Haggai 15, 23, // Zechariah - 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 18, 6, // I Maccabees - 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 53, 53, 49, 41, 24, + 64, 70, 60, 61, 68, 63, 50, 32, 73, 89, + 74, 53, 53, 49, 41, 24, // II Maccabees - 36, 33, 40, 50, 27, 31, 42, 36, 29, 38, 38, 45, 26, 46, 39, + 36, 33, 40, 50, 27, 31, 42, 36, 29, 38, + 38, 45, 26, 46, 39, // III Maccabees 25, 24, 22, 16, 36, 37, 20, // II Esdras - 40, 48, 36, 52, 56, 59, 70, 63, 47, 60, 46, 51, 58, 48, 63, 78, + 40, 48, 36, 52, 56, 59, 70, 63, 47, 60, + 46, 51, 58, 48, 63, 78, // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20, + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, // Mark - 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, 33, 44, 37, 72, 47, 20, + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53, + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, // John - 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, // Acts - 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, 30, 25, 52, 28, 41, 40, 34, 28, 40, 38, 40, 30, 35, 27, 27, 32, 44, 31, + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 40, 38, + 40, 30, 35, 27, 27, 32, 44, 31, // James 27, 26, 18, 17, 20, // I Peter @@ -254,11 +356,14 @@ int vm_synodal[] = { // Jude 25, // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 26, 33, 24, + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 26, 33, 24, // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 32, 21, 13, + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 32, 21, 13, // Galatians 24, 21, 29, 31, 26, 18, // Ephesians @@ -280,9 +385,12 @@ int vm_synodal[] = { // Philemon 25, // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 }; diff --git a/include/canon_synodalp.h b/include/canon_synodalp.h deleted file mode 100644 index 8ec2f9f..0000000 --- a/include/canon_synodalp.h +++ /dev/null @@ -1,173 +0,0 @@ -/****************************************************************************** - * canon_synodalp.h - Versification data for the SynodalP system - * - * Copyright 2010 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - */ - -#ifndef CANON_SYNODALP_H -#define CANON_SYNODALP_H - -SWORD_NAMESPACE_START - - -// Versification system: synodalp -// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev - -// This v11n is essentially the KJV v11n, using its book order & chapter counts, but merged with verse counts similar to those of the Synodal v11n - -/****************************************************************************** - * Maximum verses per chapter - */ - -int vm_synodalp[] = { - // Genesis - 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, - // Exodus - 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, - // Leviticus - 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, 47, 8, 59, 56, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, - // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 35, 15, 34, 45, 41, 50, 13, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13, - // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, 30, 52, 29, 12, - // Joshua - 18, 24, 17, 24, 16, 26, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33, - // Judges - 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, - // Ruth - 22, 23, 18, 22, - // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, 15, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13, - // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, 22, 51, 39, 25, - // I Kings - 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 53, - // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, - // I Chronicles - 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30, - // II Chronicles - 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, - // Ezra - 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, - // Nehemiah - 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, 36, 47, 31, - // Esther - 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, - // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 35, 27, 26, 17, - // Psalms - 6, 12, 9, 9, 13, 11, 18, 10, 39, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 10, 9, 26, 9, 10, 2, 29, 176, 7, 8, 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 7, 12, 15, 21, 10, 11, 9, 14, 9, 6, - // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, - // Ecclesiastes - 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14, - // Song of Solomon - 16, 17, 11, 16, 16, 12, 14, 14, - // Isaiah - 31, 22, 25, 6, 30, 13, 25, 22, 21, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 12, 25, 24, - // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, - // Lamentations - 22, 22, 66, 22, 22, - // Ezekiel - 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, - // Daniel - 21, 49, 33, 34, 31, 28, 28, 27, 27, 21, 45, 13, - // Hosea - 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 15, 10, - // Joel - 20, 32, 21, - // Amos - 15, 16, 15, 13, 27, 14, 17, 14, 15, - // Obadiah - 21, - // Jonah - 16, 11, 10, 11, - // Micah - 16, 13, 12, 13, 15, 16, 20, - // Nahum - 15, 13, 19, - // Habakkuk - 17, 20, 19, - // Zephaniah - 18, 15, 20, - // Haggai - 15, 23, - // Zechariah - 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, - // Malachi - 14, 17, 18, 6, - // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20, - // Mark - 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, 33, 44, 37, 72, 47, 20, - // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53, - // John - 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, - // Acts - 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, 30, 25, 52, 28, 41, 40, 34, 28, 40, 38, 40, 30, 35, 27, 27, 32, 44, 31, - // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 26, 33, 24, - // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, - // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 32, 21, 13, - // Galatians - 24, 21, 29, 31, 26, 18, - // Ephesians - 23, 22, 21, 32, 33, 24, - // Philippians - 30, 30, 21, 23, - // Colossians - 29, 23, 25, 18, - // I Thessalonians - 10, 20, 13, 18, 28, - // II Thessalonians - 12, 17, 18, - // I Timothy - 20, 15, 16, 16, 25, 21, - // II Timothy - 18, 26, 17, 22, - // Titus - 16, 15, 15, - // Philemon - 25, - // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, - // James - 27, 26, 18, 17, 20, - // I Peter - 25, 25, 22, 19, 14, - // II Peter - 21, 22, 18, - // I John - 10, 29, 24, 21, 21, - // II John - 13, - // III John - 15, - // Jude - 25, - // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 -}; - - -SWORD_NAMESPACE_END - - -#endif diff --git a/include/canon_synodalprot.h b/include/canon_synodalprot.h new file mode 100644 index 0000000..07387bd --- /dev/null +++ b/include/canon_synodalprot.h @@ -0,0 +1,316 @@ +/****************************************************************************** + * + * canon_synodalprot.h - Versification data for the SynodalProt system + * + * $Id: canon_synodalprot.h 2930 2013-07-31 12:09:08Z chrislit $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + */ + +#ifndef CANON_SYNODALPROT_H +#define CANON_SYNODALPROT_H + +SWORD_NAMESPACE_START + +// Versification system: SynodalProt +// This versification data is based on the synodal system. The only change is the removal of the deuterocanonical passages: PrMan, 1Esd, Tob, Jdt, Wis, Sir, EpJer, Bar, 1Macc, 2Macc, 3Macc, 2Esd, Dan 13-14, Ps 151, Josh 24:34-36, Prov 4:28-29, 13:14, 18:8, and Dan 3:24-90. + +/****************************************************************************** + * [on]tbooks_synodalProt - initialize static instance for all canonical + * text names and chapmax + */ +struct sbook otbooks_synodalProt[] = { + {"Genesis", "Gen", "Gen", 50}, + {"Exodus", "Exod", "Exod", 40}, + {"Leviticus", "Lev", "Lev", 27}, + {"Numbers", "Num", "Num", 36}, + {"Deuteronomy", "Deut", "Deut", 34}, + {"Joshua", "Josh", "Josh", 24}, + {"Judges", "Judg", "Judg", 21}, + {"Ruth", "Ruth", "Ruth", 4}, + {"I Samuel", "1Sam", "1Sam", 31}, + {"II Samuel", "2Sam", "2Sam", 24}, + {"I Kings", "1Kgs", "1Kgs", 22}, + {"II Kings", "2Kgs", "2Kgs", 25}, + {"I Chronicles", "1Chr", "1Chr", 29}, + {"II Chronicles", "2Chr", "2Chr", 36}, + {"Ezra", "Ezra", "Ezra", 10}, + {"Nehemiah", "Neh", "Neh", 13}, + {"Esther", "Esth", "Esth", 10}, + {"Job", "Job", "Job", 42}, + {"Psalms", "Ps", "Ps", 150}, + {"Proverbs", "Prov", "Prov", 31}, + {"Ecclesiastes", "Eccl", "Eccl", 12}, + {"Song of Solomon", "Song", "Song", 8}, + {"Isaiah", "Isa", "Isa", 66}, + {"Jeremiah", "Jer", "Jer", 52}, + {"Lamentations", "Lam", "Lam", 5}, + {"Ezekiel", "Ezek", "Ezek", 48}, + {"Daniel", "Dan", "Dan", 12}, + {"Hosea", "Hos", "Hos", 14}, + {"Joel", "Joel", "Joel", 3}, + {"Amos", "Amos", "Amos", 9}, + {"Obadiah", "Obad", "Obad", 1}, + {"Jonah", "Jonah", "Jonah", 4}, + {"Micah", "Mic", "Mic", 7}, + {"Nahum", "Nah", "Nah", 3}, + {"Habakkuk", "Hab", "Hab", 3}, + {"Zephaniah", "Zeph", "Zeph", 3}, + {"Haggai", "Hag", "Hag", 2}, + {"Zechariah", "Zech", "Zech", 14}, + {"Malachi", "Mal", "Mal", 4}, + {"", "", "", 0} +}; + +// for ntbooks_synodalprot, use ntbooks_synodal + +/****************************************************************************** + * Maximum verses per chapter + */ + +int vm_synodalProt[] = { + // Genesis + 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 33, 26, + + // Exodus + 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 38, + + // Leviticus + 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, + 47, 8, 59, 56, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 46, 34, + // Numbers + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 35, 15, 34, 45, 41, 50, 13, 32, 22, 29, + 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, + // Deuteronomy + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, + 30, 52, 29, 12, + // Joshua + 18, 24, 17, 24, 16, 26, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 45, 34, 16, 33, + // Judges + 36, 23, 31, 24, 31, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 25, + // Ruth + 22, 23, 18, 22, + // I Samuel + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, + 15, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, + // II Samuel + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, + 22, 51, 39, 25, + // I Kings + 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 53, + // II Kings + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, + // I Chronicles + 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, + 47, 40, 14, 17, 29, 43, 27, 17, 19, 8, + 30, 19, 32, 31, 31, 32, 34, 21, 30, + // II Chronicles + 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, + // Ezra + 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, + + // Nehemiah + 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, + 36, 47, 31, + // Esther + 22, 23, 15, 17, 14, 14, 10, 17, 32, 3, + + // Job + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 22, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 35, 27, + 26, 17, + // Psalms + 6, 12, 9, 9, 13, 11, 18, 10, 39, 7, + 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, + 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, + 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, + 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, + 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, + 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, + 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, + 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, + 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, + 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, + 10, 9, 26, 9, 10, 2, 29, 176, 7, 8, + 9, 4, 8, 5, 6, 5, 6, 8, 8, 3, + 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, + 7, 12, 15, 21, 10, 11, 9, 14, 9, 6, + // Proverbs + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, + // Ecclesiastes + 18, 26, 22, 17, 19, 12, 29, 17, 18, 20, + 10, 14, + // Song of Solomon + 16, 17, 11, 16, 16, 12, 14, 14, + // Isaiah + 31, 22, 25, 6, 30, 13, 25, 22, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 25, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 12, 25, 24, + // Jeremiah + 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 21, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, + // Lamentations + 22, 22, 66, 22, 22, + // Ezekiel + 28, 10, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, + 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, + // Daniel + 21, 49, 33, 34, 31, 28, 28, 27, 27, 21, + 45, 13, + // Hosea + 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, + 12, 14, 15, 10, + // Joel + 20, 32, 21, + // Amos + 15, 16, 15, 13, 27, 14, 17, 14, 15, + // Obadiah + 21, + // Jonah + 16, 11, 10, 11, + // Micah + 16, 13, 12, 13, 15, 16, 20, + // Nahum + 15, 13, 19, + // Habakkuk + 17, 20, 19, + // Zephaniah + 18, 15, 20, + // Haggai + 15, 23, + // Zechariah + 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, + // Malachi + 14, 17, 18, 6, + + // Matthew + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, + // Mark + 45, 28, 35, 41, 43, 56, 37, 38, 50, 52, + 33, 44, 37, 72, 47, 20, + // Luke + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, + // John + 51, 25, 36, 54, 47, 71, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, + // Acts + 26, 47, 26, 37, 42, 15, 60, 40, 43, 48, + 30, 25, 52, 28, 41, 40, 34, 28, 40, 38, + 40, 30, 35, 27, 27, 32, 44, 31, + // James + 27, 26, 18, 17, 20, + // I Peter + 25, 25, 22, 19, 14, + // II Peter + 21, 22, 18, + // I John + 10, 29, 24, 21, 21, + // II John + 13, + // III John + 15, + // Jude + 25, + // Romans + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 26, 33, 24, + // I Corinthians + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, + // II Corinthians + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 32, 21, 13, + // Galatians + 24, 21, 29, 31, 26, 18, + // Ephesians + 23, 22, 21, 32, 33, 24, + // Philippians + 30, 30, 21, 23, + // Colossians + 29, 23, 25, 18, + // I Thessalonians + 10, 20, 13, 18, 28, + // II Thessalonians + 12, 17, 18, + // I Timothy + 20, 15, 16, 16, 25, 21, + // II Timothy + 18, 26, 17, 22, + // Titus + 16, 15, 15, + // Philemon + 25, + // Hebrews + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, + // Revelation of John + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21 +}; + + +SWORD_NAMESPACE_END + + +#endif diff --git a/include/canon_vulg.h b/include/canon_vulg.h index e5d719a..9fa8e04 100644 --- a/include/canon_vulg.h +++ b/include/canon_vulg.h @@ -1,7 +1,10 @@ /****************************************************************************** - * canon_vulg.h - Versification data for the Vulg system * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * canon_vulg.h - Versification data for the Vulg system + * + * $Id: canon_vulg.h 2915 2013-07-23 16:55:54Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -125,71 +128,153 @@ struct sbook ntbooks_vulg[] = { int vm_vulg[] = { // Genesis - 31, 25, 24, 26, 31, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 32, 25, + 31, 25, 24, 26, 31, 22, 24, 22, 29, 32, + 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, + 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, + 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, + 57, 38, 34, 34, 28, 34, 31, 22, 32, 25, // Exodus - 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 36, + 22, 25, 22, 31, 23, 30, 25, 32, 35, 29, + 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, + 36, 31, 33, 18, 40, 37, 21, 43, 46, 38, + 18, 35, 23, 35, 35, 38, 29, 31, 43, 36, // Leviticus - 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 45, 34, + 17, 16, 17, 35, 19, 30, 38, 36, 24, 20, + 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, + 24, 33, 44, 23, 55, 45, 34, // Numbers - 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 34, 15, 34, 45, 41, 50, 13, 32, 22, 30, 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13, + 54, 34, 51, 49, 31, 27, 89, 26, 23, 36, + 34, 15, 34, 45, 41, 50, 13, 32, 22, 30, + 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, + 54, 42, 56, 29, 34, 13, // Deuteronomy - 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, 30, 52, 29, 12, + 46, 37, 29, 49, 33, 25, 26, 20, 29, 22, + 32, 32, 18, 29, 23, 22, 20, 22, 21, 20, + 23, 30, 25, 22, 19, 19, 26, 68, 29, 20, + 30, 52, 29, 12, // Joshua - 18, 24, 17, 25, 16, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 43, 34, 16, 33, + 18, 24, 17, 25, 16, 27, 26, 35, 27, 43, + 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, + 43, 34, 16, 33, // Judges - 36, 23, 31, 24, 32, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 24, + 36, 23, 31, 24, 32, 40, 25, 35, 57, 18, + 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, + 24, // Ruth 22, 23, 18, 22, // I Samuel - 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, 15, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13, + 28, 36, 21, 22, 12, 21, 17, 22, 27, 27, + 15, 25, 23, 52, 35, 23, 58, 30, 24, 43, + 15, 23, 28, 23, 44, 25, 12, 25, 11, 31, + 13, // II Samuel - 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, 22, 51, 39, 25, + 27, 32, 39, 12, 25, 23, 29, 18, 13, 19, + 27, 31, 39, 33, 37, 23, 29, 33, 43, 26, + 22, 51, 39, 25, // I Kings - 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54, + 53, 46, 28, 34, 18, 38, 51, 66, 28, 29, + 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, + 29, 54, // II Kings - 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30, + 18, 25, 27, 44, 27, 33, 20, 29, 37, 36, + 21, 21, 25, 29, 38, 20, 41, 37, 37, 21, + 26, 20, 37, 20, 30, // I Chronicles - 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, 46, 40, 14, 17, 29, 43, 27, 17, 19, 7, 30, 19, 32, 31, 31, 32, 34, 21, 30, + 54, 55, 24, 43, 26, 81, 40, 40, 44, 14, + 46, 40, 14, 17, 29, 43, 27, 17, 19, 7, + 30, 19, 32, 31, 31, 32, 34, 21, 30, // II Chronicles - 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23, + 17, 18, 17, 22, 14, 42, 22, 18, 31, 19, + 23, 16, 22, 15, 19, 14, 19, 34, 11, 37, + 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, + 21, 33, 25, 33, 27, 23, // Ezra 11, 70, 13, 24, 17, 22, 28, 36, 15, 44, // Nehemiah - 11, 20, 31, 23, 19, 19, 73, 18, 38, 39, 36, 46, 31, + 11, 20, 31, 23, 19, 19, 73, 18, 38, 39, + 36, 46, 31, // Tobit - 25, 23, 25, 23, 28, 22, 20, 24, 12, 13, 21, 22, 23, 17, + 25, 23, 25, 23, 28, 22, 20, 24, 12, 13, + 21, 22, 23, 17, // Judith - 12, 18, 15, 17, 29, 21, 25, 34, 19, 20, 21, 20, 31, 18, 15, 31, + 12, 18, 15, 17, 29, 21, 25, 34, 19, 20, + 21, 20, 31, 18, 15, 31, // Esther - 22, 23, 15, 17, 14, 14, 10, 17, 32, 13, 12, 6, 18, 19, 19, 24, + 22, 23, 15, 17, 14, 14, 10, 17, 32, 13, + 12, 6, 18, 19, 19, 24, // Job - 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 23, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 35, 28, 25, 16, + 22, 13, 26, 21, 27, 30, 21, 22, 35, 22, + 20, 25, 28, 22, 35, 23, 16, 21, 29, 29, + 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, + 40, 22, 33, 37, 16, 33, 24, 41, 35, 28, + 25, 16, // Psalms - 6, 13, 9, 10, 13, 11, 18, 10, 39, 8, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 6, 26, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 13, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 10, 9, 26, 9, 10, 2, 29, 176, 7, 8, 9, 4, 8, 5, 7, 5, 6, 8, 8, 3, 18, 3, 3, 21, 27, 9, 8, 24, 14, 10, 8, 12, 15, 21, 10, 11, 9, 14, 9, 6, + 6, 13, 9, 10, 13, 11, 18, 10, 39, 8, + 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, + 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, + 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, + 12, 6, 26, 18, 12, 10, 15, 21, 23, 21, + 11, 7, 9, 24, 13, 12, 12, 18, 14, 9, + 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, + 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, + 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, + 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, + 29, 22, 35, 45, 48, 43, 14, 31, 7, 10, + 10, 9, 26, 9, 10, 2, 29, 176, 7, 8, + 9, 4, 8, 5, 7, 5, 6, 8, 8, 3, + 18, 3, 3, 21, 27, 9, 8, 24, 14, 10, + 8, 12, 15, 21, 10, 11, 9, 14, 9, 6, // Proverbs - 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, + 33, 22, 35, 27, 23, 35, 27, 36, 18, 32, + 31, 28, 25, 35, 33, 33, 28, 24, 29, 30, + 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, + 31, // Ecclesiastes - 18, 26, 22, 17, 19, 11, 30, 17, 18, 20, 10, 14, + 18, 26, 22, 17, 19, 11, 30, 17, 18, 20, + 10, 14, // Song of Solomon 16, 17, 11, 16, 17, 12, 13, 14, // Wisdom - 16, 25, 19, 20, 24, 27, 30, 21, 19, 21, 27, 27, 19, 31, 19, 29, 20, 25, 20, + 16, 25, 19, 20, 24, 27, 30, 21, 19, 21, + 27, 27, 19, 31, 19, 29, 20, 25, 20, // Sirach - 40, 23, 34, 36, 18, 37, 40, 22, 25, 34, 36, 19, 32, 27, 22, 31, 31, 33, 28, 33, 31, 33, 38, 47, 36, 28, 33, 30, 35, 27, 42, 28, 33, 31, 26, 28, 34, 39, 41, 32, 28, 26, 37, 27, 31, 23, 31, 28, 19, 31, 38, + 40, 23, 34, 36, 18, 37, 40, 22, 25, 34, + 36, 19, 32, 27, 22, 31, 31, 33, 28, 33, + 31, 33, 38, 47, 36, 28, 33, 30, 35, 27, + 42, 28, 33, 31, 26, 28, 34, 39, 41, 32, + 28, 26, 37, 27, 31, 23, 31, 28, 19, 31, + 38, // Isaiah - 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, 29, 25, 28, 28, 26, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 12, 25, 24, + 31, 22, 26, 6, 30, 13, 25, 22, 21, 34, + 16, 6, 22, 32, 9, 14, 14, 7, 25, 6, + 17, 25, 18, 23, 12, 21, 13, 29, 24, 33, + 9, 20, 24, 17, 10, 22, 38, 22, 8, 31, + 29, 25, 28, 28, 26, 13, 15, 22, 26, 11, + 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, + 11, 12, 19, 12, 25, 24, // Jeremiah - 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, 40, 44, 26, 22, 19, 32, 20, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34, + 19, 37, 25, 31, 31, 30, 34, 22, 26, 25, + 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, + 14, 30, 40, 10, 38, 24, 22, 17, 32, 24, + 40, 44, 26, 22, 19, 32, 20, 28, 18, 16, + 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, + 64, 34, // Lamentations 22, 22, 66, 22, 22, // Baruch 22, 35, 38, 37, 9, 72, // Ezekiel - 28, 9, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, 26, 20, 27, 31, 25, 24, 23, 35, + 28, 9, 27, 17, 17, 14, 27, 18, 11, 22, + 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, + 32, 31, 49, 27, 17, 21, 36, 26, 21, 26, + 18, 32, 33, 31, 15, 38, 28, 23, 29, 49, + 26, 20, 27, 31, 25, 24, 23, 35, // Daniel - 21, 49, 100, 34, 31, 28, 28, 27, 27, 21, 45, 13, 65, 42, + 21, 49, 100, 34, 31, 28, 28, 27, 27, 21, + 45, 13, 65, 42, // Hosea - 11, 24, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 15, 10, + 11, 24, 5, 19, 15, 11, 16, 14, 17, 15, + 12, 14, 15, 10, // Joel 20, 32, 21, // Amos @@ -209,29 +294,44 @@ int vm_vulg[] = { // Haggai 14, 24, // Zechariah - 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, + 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, + 17, 14, 9, 21, // Malachi 14, 17, 18, 6, // I Maccabees - 67, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 54, 54, 49, 41, 24, + 67, 70, 60, 61, 68, 63, 50, 32, 73, 89, + 74, 54, 54, 49, 41, 24, // II Maccabees - 36, 33, 40, 50, 27, 31, 42, 36, 29, 38, 38, 46, 26, 46, 40, + 36, 33, 40, 50, 27, 31, 42, 36, 29, 38, + 38, 46, 26, 46, 40, // Matthew - 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 26, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20, + 25, 23, 17, 25, 48, 34, 29, 34, 38, 42, + 30, 50, 58, 36, 39, 28, 26, 35, 30, 34, + 46, 46, 39, 51, 46, 75, 66, 20, // Mark - 45, 28, 35, 40, 43, 56, 37, 39, 49, 52, 33, 44, 37, 72, 47, 20, + 45, 28, 35, 40, 43, 56, 37, 39, 49, 52, + 33, 44, 37, 72, 47, 20, // Luke - 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53, + 80, 52, 38, 44, 39, 49, 50, 56, 62, 42, + 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, + 38, 71, 56, 53, // John - 51, 25, 36, 54, 47, 72, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, + 51, 25, 36, 54, 47, 72, 53, 59, 41, 42, + 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, + 25, // Acts - 26, 47, 26, 37, 42, 15, 59, 40, 43, 48, 30, 25, 52, 27, 41, 40, 34, 28, 40, 38, 40, 30, 35, 27, 27, 32, 44, 31, + 26, 47, 26, 37, 42, 15, 59, 40, 43, 48, + 30, 25, 52, 27, 41, 40, 34, 28, 40, 38, + 40, 30, 35, 27, 27, 32, 44, 31, // Romans - 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 23, 33, 27, + 32, 29, 31, 25, 21, 23, 25, 39, 33, 21, + 36, 21, 14, 23, 33, 27, // I Corinthians - 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, + 31, 16, 23, 21, 13, 20, 40, 13, 27, 33, + 34, 31, 13, 40, 58, 24, // II Corinthians - 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 13, + 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, + 33, 21, 13, // Galatians 24, 21, 29, 31, 26, 18, // Ephesians @@ -253,7 +353,8 @@ int vm_vulg[] = { // Philemon 25, // Hebrews - 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, + 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, + 40, 29, 25, // James 27, 26, 18, 17, 20, // I Peter @@ -269,13 +370,16 @@ int vm_vulg[] = { // Jude 25, // Revelation of John - 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21, + 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, + 19, 18, 18, 20, 8, 21, 18, 24, 21, 15, + 27, 21, // Prayer of Manasses 15, // I Esdras 58, 31, 24, 63, 73, 34, 15, 97, 56, // II Esdras - 40, 48, 36, 52, 56, 59, 140, 63, 47, 60, 46, 51, 58, 48, 63, 78, + 40, 48, 36, 52, 56, 59, 140, 63, 47, 60, + 46, 51, 58, 48, 63, 78, // Additional Psalm 7, // Laodiceans diff --git a/include/cipherfil.h b/include/cipherfil.h index cf48389..99085ae 100644 --- a/include/cipherfil.h +++ b/include/cipherfil.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: cipherfil.h 1864 2005-11-20 06:06:40Z scribe $ + * cipherfil.h - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: cipherfil.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/config.h b/include/config.h deleted file mode 100644 index 0f8dbb9..0000000 --- a/include/config.h +++ /dev/null @@ -1,84 +0,0 @@ -/* include/config.h. Generated from config.h.in by configure. */ -/* include/config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `z' library (-lz). */ -#define HAVE_LIBZ 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "sword" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "sword-bugs@crosswire.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "sword" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "sword 1.6.2" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "sword" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "http://crosswire.org/sword" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.6.2" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -#define VERSION "1.6.2" - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif -#endif diff --git a/include/config.h.in b/include/config.h.in index a37d095..cde8a27 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -58,6 +58,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff --git a/include/curlftpt.h b/include/curlftpt.h index 41fd23b..069208b 100644 --- a/include/curlftpt.h +++ b/include/curlftpt.h @@ -1,42 +1,37 @@ /****************************************************************************** -* curlftpt.h - code for CURL impl of FTP Transport -* -* $Id: swbuf.h 2218 2008-12-23 09:33:38Z scribe $ -* -* Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * curlftpt.h - code for CURL impl of FTP Transport + * + * $Id: curlftpt.h 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #ifndef CURLFTPT_H #define CURLFTPT_H #include -#include +#include SWORD_NAMESPACE_START class CURL; -// initialize/cleanup SYSTEMWIDE library with life of this static. -class CURLFTPTransport_init { -public: - CURLFTPTransport_init(); - ~CURLFTPTransport_init(); -}; - -class SWDLLEXPORT CURLFTPTransport : public FTPTransport { +class SWDLLEXPORT CURLFTPTransport : public RemoteTransport { CURL *session; public: diff --git a/include/curlhttpt.h b/include/curlhttpt.h index f48cab4..8079583 100644 --- a/include/curlhttpt.h +++ b/include/curlhttpt.h @@ -1,42 +1,37 @@ /****************************************************************************** -* curlhttpt.h - code for CURL impl of HTTP Transport -* -* $Id: swbuf.h 2218 2008-12-23 09:33:38Z scribe $ -* -* Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * curlhttpt.h - code for CURL impl of HTTP Transport + * + * $Id: curlhttpt.h 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #ifndef CURLHTTPT_H #define CURLHTTPT_H #include -#include +#include SWORD_NAMESPACE_START class CURL; -// initialize/cleanup SYSTEMWIDE library with life of this static. -class CURLHTTPTransport_init { -public: - CURLHTTPTransport_init(); - ~CURLHTTPTransport_init(); -}; - -class SWDLLEXPORT CURLHTTPTransport : public FTPTransport { +class SWDLLEXPORT CURLHTTPTransport : public RemoteTransport { CURL *session; public: diff --git a/include/defs.h b/include/defs.h index d6884d3..fd1ebf5 100644 --- a/include/defs.h +++ b/include/defs.h @@ -1,5 +1,26 @@ +/****************************************************************************** + * + * defs.h - Global defines, mostly platform-specific stuff + * + * $Id: defs.h 2942 2013-08-03 08:39:02Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ // ---------------------------------------------------------------------------- -// Making or using sword as a Windows DLL +// // ---------------------------------------------------------------------------- #ifndef SWORDDEFS_H #define SWORDDEFS_H @@ -48,6 +69,9 @@ SWORD_NAMESPACE_START # define SWDLLEXPORT_CTORFN # endif +# define SWDEPRECATED __declspec(deprecated("** WARNING: deprecated method **")) + + #elif defined(__SWPM__) # ifdef SWMAKINGDLL @@ -64,6 +88,9 @@ SWORD_NAMESPACE_START # define SWDLLEXPORT_CTORFN # endif +# define SWDEPRECATED + + #elif defined(__GNUWIN32__) # ifdef SWMAKINGDLL @@ -80,6 +107,9 @@ SWORD_NAMESPACE_START # define SWDLLEXPORT_CTORFN # endif +# define SWDEPRECATED __attribute__((__deprecated__)) + + #elif defined(__BORLANDC__) # ifdef SWMAKINGDLL # define SWDLLEXPORT _export @@ -95,12 +125,26 @@ SWORD_NAMESPACE_START # define SWDLLEXPORT_CTORFN # endif +#define COMMENT SLASH(/) +#define SLASH(s) /##s +# define SWDEPRECATED COMMENT + + +#elif defined(__GNUC__) +# define SWDLLEXPORT +# define SWDLLEXPORT_DATA(type) type +# define SWDLLEXPORT_CTORFN +# define SWDEPRECATED __attribute__((__deprecated__)) + + #else # define SWDLLEXPORT # define SWDLLEXPORT_DATA(type) type # define SWDLLEXPORT_CTORFN +# define SWDEPRECATED #endif + // For ostream, istream ofstream #if defined(__BORLANDC__) && defined( _RTLDLL ) # define SWDLLIMPORT __import @@ -108,9 +152,12 @@ SWORD_NAMESPACE_START # define SWDLLIMPORT #endif + + enum {DIRECTION_LTR = 0, DIRECTION_RTL, DIRECTION_BIDI}; -enum {FMT_UNKNOWN = 0, FMT_PLAIN, FMT_THML, FMT_GBF, FMT_HTML, FMT_HTMLHREF, FMT_RTF, FMT_OSIS, FMT_WEBIF, FMT_TEI}; -enum {ENC_UNKNOWN = 0, ENC_LATIN1, ENC_UTF8, ENC_UTF16, ENC_RTF, ENC_HTML}; +enum {FMT_UNKNOWN = 0, FMT_PLAIN, FMT_THML, FMT_GBF, FMT_HTML, FMT_HTMLHREF, FMT_RTF, FMT_OSIS, FMT_WEBIF, FMT_TEI, FMT_XHTML}; +enum {ENC_UNKNOWN = 0, ENC_LATIN1, ENC_UTF8, ENC_SCSU, ENC_UTF16, ENC_RTF, ENC_HTML}; +enum {BIB_BIBTEX = 0, /* possible future formats: BIB_MARCXML, BIB_MARC21, BIB_DCMI BIB_OSISHEADER, BIB_SBL_XHTML, BIB_MLA_XHTML, BIB_APA_XHTML, BIB_CHICAGO_XHTML */}; SWORD_NAMESPACE_END #endif //SWORDDEFS_H diff --git a/include/echomod.h b/include/echomod.h index c3873b4..978a3eb 100644 --- a/include/echomod.h +++ b/include/echomod.h @@ -1,10 +1,11 @@ /****************************************************************************** - * echomod.h - code for class 'EchoMod' - a test module that just echo back - * text of key. * - * $Id: echomod.h 1864 2005-11-20 06:06:40Z scribe $ + * echomod.h - code for class 'EchoMod' - a test module that just echo back + * text of key. * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: echomod.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -34,7 +35,7 @@ class SWDLLEXPORT EchoMod : public SWText public: EchoMod(); virtual ~EchoMod(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; }; SWORD_NAMESPACE_END diff --git a/include/encfiltmgr.h b/include/encfiltmgr.h index 8afc208..bf62756 100644 --- a/include/encfiltmgr.h +++ b/include/encfiltmgr.h @@ -1,9 +1,12 @@ /****************************************************************************** - * swencodingmgr.h - definition of class SWEncodingMgr, subclass of - * used to transcode all module text to a requested - * markup. * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * encfiltmgr.h - definition of class SWEncodingMgr, subclass of + * used to transcode all module text to a requested + * markup + * + * $Id: encfiltmgr.h 2846 2013-06-29 14:48:47Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -37,6 +40,7 @@ class SWDLLEXPORT EncodingFilterMgr : public SWFilterMgr { protected: SWFilter *latin1utf8; + SWFilter *scsuutf8; SWFilter *targetenc; diff --git a/include/entriesblk.h b/include/entriesblk.h index 833be03..6ef7a1e 100644 --- a/include/entriesblk.h +++ b/include/entriesblk.h @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * entriesblk.h - Implementation of EntriesBlock + * + * $Id: entriesblk.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #ifndef ENTRIESBLK_H #define ENTRIESBLK_H diff --git a/include/femain.h b/include/femain.h index 5f4da3f..3eec2c6 100644 --- a/include/femain.h +++ b/include/femain.h @@ -1,8 +1,10 @@ -/* +/****************************************************************************** * - * $Id: femain.h 1688 2005-01-01 04:42:26Z scribe $ + * femain.h - Implementation of FEMain * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: femain.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/filemgr.h b/include/filemgr.h index 6ee584d..eedfbcc 100644 --- a/include/filemgr.h +++ b/include/filemgr.h @@ -1,23 +1,24 @@ /****************************************************************************** -* filemgr.h - definition of class FileMgr used for pooling file handles -* -* $Id: filemgr.h 2295 2009-03-29 17:11:27Z scribe $ -* -* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * filemgr.h - definition of class FileMgr used for pooling file handles + * + * $Id: filemgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #ifndef FILEMGR_H #define FILEMGR_H diff --git a/include/flatapi.h b/include/flatapi.h index 1123a0e..4c59ba6 100644 --- a/include/flatapi.h +++ b/include/flatapi.h @@ -1,10 +1,10 @@ /****************************************************************************** - * swordapi.h - This file contains an api usable by non-C++ - * environments * - * $Id: flatapi.h 2324 2009-04-20 18:40:15Z scribe $ + * flatapi.h - This file contains an api usable by non-C++ environments * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: flatapi.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/ftplib.h b/include/ftplib.h index 75a90ae..8eb722f 100644 --- a/include/ftplib.h +++ b/include/ftplib.h @@ -1,28 +1,33 @@ /***************************************************************************/ /* ftplib.h - header file for callable ftp access routines */ /* Copyright (C) 1996, 1997 Thomas Pfau, pfau@cnj.digex.net */ -/* 73 Catherine Street, South Bound Brook, NJ, 08880 */ -/* */ -/* This library is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU Library General Public */ -/* License as published by the Free Software Foundation; either */ -/* version 2 of the License, or (at your option) any later version. */ -/* */ -/* This library is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */ -/* Library General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU Library General Public */ -/* License along with this progam; if not, write to the */ -/* Free Software Foundation, Inc., 59 Temple Place - Suite 330, */ -/* Boston, MA 02111-1307, USA. */ -/* */ +/* 73 Catherine Street, South Bound Brook, NJ, 08880 */ +/* */ +/* This library is free software; you can redistribute it and/or */ +/* modify it under the terms of the GNU Library General Public */ +/* License as published by the Free Software Foundation; either */ +/* version 2 of the License, or (at your option) any later version. */ +/* */ +/* This library is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */ +/* Library General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU Library General Public */ +/* License along with this progam; if not, write to the */ +/* Free Software Foundation, Inc., 59 Temple Place - Suite 330, */ +/* Boston, MA 02111-1307, USA. */ +/* */ /***************************************************************************/ #if !defined(__FTPLIB_H) #define __FTPLIB_H +#ifndef _FTPLIB_NO_COMPAT +#define _FTPLIB_NO_COMPAT +#endif + + #if defined(__unix__) || defined(VMS) #define GLOBALDEF #define GLOBALREF extern @@ -50,13 +55,14 @@ /* connection modes */ #define FTPLIB_PASSIVE 1 #define FTPLIB_PORT 2 - /* connection option names */ #define FTPLIB_CONNMODE 1 #define FTPLIB_CALLBACK 2 #define FTPLIB_IDLETIME 3 #define FTPLIB_CALLBACKARG 4 #define FTPLIB_CALLBACKBYTES 5 +#define FTPLIB_CALLBACK_WRITER 6 +#define FTPLIB_CALLBACK_WRITERARG 7 #ifdef __cplusplus extern "C" { @@ -64,6 +70,7 @@ extern "C" { typedef struct NetBuf netbuf; typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg); +typedef int (*FtpCallbackWriter)(netbuf *nControl, const void *buffer, size_t size, void *arg); /* v1 compatibility stuff */ #if !defined(_FTPLIB_NO_COMPAT) diff --git a/include/ftplibftpt.h b/include/ftplibftpt.h index d07c68b..135cd83 100644 --- a/include/ftplibftpt.h +++ b/include/ftplibftpt.h @@ -1,43 +1,38 @@ /****************************************************************************** -* ftplibftpt.h - code for ftplib impl of FTP Transport -* -* $Id: swbuf.h 2218 2008-12-23 09:33:38Z scribe $ -* -* Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * ftplibftpt.h - code for ftplib impl of FTP Transport + * (FTPLibFTPTransport) + * + * $Id: ftplibftpt.h 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #ifndef FTPLIBFTPT_H #define FTPLIBFTPT_H #include -#include +#include typedef struct NetBuf netbuf; SWORD_NAMESPACE_START -// initialize/cleanup SYSTEMWIDE library with life of this static. -class FTPLibFTPTransport_init { -public: - FTPLibFTPTransport_init(); - ~FTPLibFTPTransport_init(); -}; - - -class SWDLLEXPORT FTPLibFTPTransport : public FTPTransport { +class SWDLLEXPORT FTPLibFTPTransport : public RemoteTransport { netbuf *ftpConnection; char assureLoggedIn(); diff --git a/include/ftptrans.h b/include/ftptrans.h deleted file mode 100644 index 87502d2..0000000 --- a/include/ftptrans.h +++ /dev/null @@ -1,84 +0,0 @@ -/****************************************************************************** -* ftptrans.h - code for FTP Transport -* -* $Id: swbuf.h 2218 2008-12-23 09:33:38Z scribe $ -* -* Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ - -// TODO: Rename this to RemoteTransport in 1.7.x - -#ifndef FTPTRANS_H -#define FTPTRANS_H - -#include -#include -#include - - -SWORD_NAMESPACE_START - -/** Class for reporting status -*/ -class SWDLLEXPORT StatusReporter { -public: - virtual ~StatusReporter() {}; - /** Messages before stages of a batch download */ - virtual void preStatus(long totalBytes, long completedBytes, const char *message); - - /** frequently called throughout a download, to report status */ - virtual void statusUpdate(double dtTotal, double dlNow); -}; - - -/** TODO: document -* A base class to be used for reimplementation of network services. -*/ -class SWDLLEXPORT FTPTransport { // TODO: rename to more generic RemoteTransport - -protected: - StatusReporter *statusReporter; - bool passive; - bool term; - SWBuf host; - SWBuf u; - SWBuf p; - -public: - FTPTransport(const char *host, StatusReporter *statusReporter = 0); - virtual ~FTPTransport(); - - /*********** - * override this method in your real impl - * - * if destBuf then write to buffer instead of file - */ - virtual char getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf = 0); - - - int copyDirectory(const char *urlPrefix, const char *dir, const char *dest, const char *suffix); - - virtual std::vector getDirList(const char *dirURL); - void setPassive(bool passive) { this->passive = passive; } - void setUser(const char *user) { u = user; } - void setPasswd(const char *passwd) { p = passwd; } - void terminate() { term = true; } -}; - - -SWORD_NAMESPACE_END - -#endif diff --git a/include/gbffootnotes.h b/include/gbffootnotes.h index 22ca18f..15351ad 100644 --- a/include/gbffootnotes.h +++ b/include/gbffootnotes.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: gbffootnotes.h 1688 2005-01-01 04:42:26Z scribe $ + * gbffootnotes.h - Implementation of GBFFootnotes * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbffootnotes.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfheadings.h b/include/gbfheadings.h index b847f79..6c7ee31 100644 --- a/include/gbfheadings.h +++ b/include/gbfheadings.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: gbfheadings.h 2068 2007-08-31 06:40:23Z scribe $ + * gbfheadings.h - Implementation of GBFHeadings * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfheadings.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfhtml.h b/include/gbfhtml.h index 5879d8e..433d6f3 100644 --- a/include/gbfhtml.h +++ b/include/gbfhtml.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: gbfhtml.h 1688 2005-01-01 04:42:26Z scribe $ + * gbfhtml.h - Implementation of GBFHTML * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfhtml.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfhtmlhref.h b/include/gbfhtmlhref.h index 0c849ad..5934fa6 100644 --- a/include/gbfhtmlhref.h +++ b/include/gbfhtmlhref.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: gbfhtmlhref.h 1688 2005-01-01 04:42:26Z scribe $ + * gbfhtmlhref.h - Implementation of GBFHTMLHREF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfhtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,6 +30,7 @@ SWORD_NAMESPACE_START /** this filter converts GBF text to HTML text with hrefs */ class SWDLLEXPORT GBFHTMLHREF : public SWBasicFilter { + bool renderNoteNumbers; protected: class MyUserData : public BasicFilterUserData { public: @@ -41,6 +44,7 @@ protected: virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); public: GBFHTMLHREF(); + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } }; SWORD_NAMESPACE_END diff --git a/include/gbfmorph.h b/include/gbfmorph.h index 87e5b78..1352b9c 100644 --- a/include/gbfmorph.h +++ b/include/gbfmorph.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: gbfmorph.h 2068 2007-08-31 06:40:23Z scribe $ + * gbfmorph.h - Implementation of GBFMorph * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfmorph.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfosis.h b/include/gbfosis.h index edcbc87..7462118 100644 --- a/include/gbfosis.h +++ b/include/gbfosis.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: gbfosis.h 1864 2005-11-20 06:06:40Z scribe $ + * gbfosis.h - Implementation of GBFOSIS * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfosis.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfplain.h b/include/gbfplain.h index 3ac9f98..c661d29 100644 --- a/include/gbfplain.h +++ b/include/gbfplain.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: gbfplain.h 2068 2007-08-31 06:40:23Z scribe $ + * gbfplain.h - Implementation of GBFPlain * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfplain.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997k-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfredletterwords.h b/include/gbfredletterwords.h index 26941b8..4fa1963 100644 --- a/include/gbfredletterwords.h +++ b/include/gbfredletterwords.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: gbfredletterwords.h 1688 2005-01-01 04:42:26Z scribe $ + * gbfredletterwords.h - Implementation of GBFRedLetterWords * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfredletterwords.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfrtf.h b/include/gbfrtf.h index 907dfbd..6305767 100644 --- a/include/gbfrtf.h +++ b/include/gbfrtf.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: gbfrtf.h 1688 2005-01-01 04:42:26Z scribe $ + * gbfrtf.h - Implementation of GBFRTF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfrtf.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfstrongs.h b/include/gbfstrongs.h index 0d08eb2..14534a3 100644 --- a/include/gbfstrongs.h +++ b/include/gbfstrongs.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: gbfstrongs.h 1688 2005-01-01 04:42:26Z scribe $ + * gbfstrongs.h - Implementation of GBFStrongs * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfstrongs.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfthml.h b/include/gbfthml.h index 0c650ab..2659a81 100644 --- a/include/gbfthml.h +++ b/include/gbfthml.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: gbfthml.h 1688 2005-01-01 04:42:26Z scribe $ + * gbfhtml.h - Implementation of GBFHTML * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfthml.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfwebif.h b/include/gbfwebif.h index ae96f92..5ecf512 100644 --- a/include/gbfwebif.h +++ b/include/gbfwebif.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: gbfwebif.h 1688 2005-01-01 04:42:26Z scribe $ + * gbfwebif.h - Implementation of GBFWEBIF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfwebif.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -21,13 +23,13 @@ #ifndef GBFWEBIF_H #define GBFWEBIF_H -#include +#include SWORD_NAMESPACE_START -/** this filter converts GBF text to HTML text with hrefs +/** this filter converts GBF text to classed XHTML for web interfaces */ -class SWDLLEXPORT GBFWEBIF : public GBFHTMLHREF { +class SWDLLEXPORT GBFWEBIF : public GBFXHTML { const SWBuf baseURL; const SWBuf passageStudyURL; diff --git a/include/gbfwordjs.h b/include/gbfwordjs.h index 5f31d29..ef93792 100644 --- a/include/gbfwordjs.h +++ b/include/gbfwordjs.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: gbfwordjs.h 1688 2005-01-01 04:42:26Z scribe $ + * gbfwordjs.h - Implementation of GBFWordJS * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfwordjs.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/gbfxhtml.h b/include/gbfxhtml.h new file mode 100644 index 0000000..616ccd0 --- /dev/null +++ b/include/gbfxhtml.h @@ -0,0 +1,52 @@ +/****************************************************************************** + * + * gbfxhtml.h - Implementation of GBFXHTML + * + * $Id: gbfxhtml.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef GBFXHTML_H +#define GBFXHTML_H + +#include + +SWORD_NAMESPACE_START + +/** this filter converts GBF text to classed XHTML text + */ +class SWDLLEXPORT GBFXHTML : public SWBasicFilter { + bool renderNoteNumbers; +protected: + class MyUserData : public BasicFilterUserData { + public: + MyUserData(const SWModule *module, const SWKey *key); + bool hasFootnotePreTag; + SWBuf version; + }; + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); + } + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); +public: + GBFXHTML(); + virtual const char *getHeader() const; + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/greeklexattribs.h b/include/greeklexattribs.h index 8dfb7d6..4055b5a 100644 --- a/include/greeklexattribs.h +++ b/include/greeklexattribs.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: greeklexattribs.h 1864 2005-11-20 06:06:40Z scribe $ + * greeklexattribs.h - Implementation of GreekLexAttribs * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: greeklexattribs.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/hebrewmcim.h b/include/hebrewmcim.h index 3c9aa63..ffcb9a1 100644 --- a/include/hebrewmcim.h +++ b/include/hebrewmcim.h @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * hebrewmcim.h - Implementation of HebrewMCIM + * + * $Id: hebrewmcim.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #ifndef HEBREWMCIM_H #define HEBREWMCIM_H diff --git a/include/hrefcom.h b/include/hrefcom.h index 83d71e6..638b561 100644 --- a/include/hrefcom.h +++ b/include/hrefcom.h @@ -1,11 +1,12 @@ /****************************************************************************** - * hrefcom.h - code for class 'HREFCom'- a module that produces HTML HREFs - * pointing to actual text desired. Uses standard - * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: hrefcom.h 1688 2005-01-01 04:42:26Z scribe $ + * hrefcom.h - code for class 'HREFCom'- a module that produces HTML HREFs + * pointing to actual text desired. Uses standard + * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: hrefcom.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -40,7 +41,7 @@ public: HREFCom(const char *ipath, const char *prefix, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0); virtual ~HREFCom(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; // OPERATORS ----------------------------------------------------------------- diff --git a/include/installmgr.h b/include/installmgr.h index b3972b6..56ebf7e 100644 --- a/include/installmgr.h +++ b/include/installmgr.h @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * installmgr.h - Implementation of InstallMgr + * + * $Id: installmgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #ifndef INSTALLMGR_H #define INSTALLMGR_H @@ -11,7 +33,7 @@ SWORD_NAMESPACE_START class SWMgr; class SWModule; class SWConfig; -class FTPTransport; +class RemoteTransport; class StatusReporter; /** A remote installation source configuration @@ -55,19 +77,19 @@ protected: bool passive; SWBuf u, p; - /** override this method and provide your own custom FTPTransport subclass + /** override this method and provide your own custom RemoteTransport subclass */ - virtual FTPTransport *createFTPTransport(const char *host, StatusReporter *statusReporter); + virtual RemoteTransport *createFTPTransport(const char *host, StatusReporter *statusReporter); - /** override this method and provide your own custom HTTP RemoteTransport (still called FTPTransport in pre 1.7.x) subclass + /** override this method and provide your own custom HTTP RemoteTransport */ - virtual FTPTransport *createHTTPTransport(const char *host, StatusReporter *statusReporter); + virtual RemoteTransport *createHTTPTransport(const char *host, StatusReporter *statusReporter); /** we have a transport member to set as current running transport so we * can ask it to terminate below, if user requests */ - FTPTransport *transport; + RemoteTransport *transport; public: @@ -109,9 +131,9 @@ public: */ virtual int removeModule(SWMgr *manager, const char *modName); - /** mostly an internally used method to ftp download from an remote source to a local destination + /** mostly an internally used method to remote download from a remote source to a local destination */ - virtual int ftpCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer = false, const char *suffix = ""); + virtual int remoteCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer = false, const char *suffix = ""); /** call to install a module from a local path (fromLocation) or remote InstallSource (is) (leave the other 0) */ @@ -214,7 +236,7 @@ A sample implementation, roughly taken from the windows installmgr: return false; } */ - virtual bool getCipherCode(const char *modName, SWConfig *config) { return false; } + virtual bool getCipherCode(const char *modName, SWConfig *config) { (void) modName; (void) config; return false; } diff --git a/include/latin1utf16.h b/include/latin1utf16.h index 582a89b..a8f982a 100644 --- a/include/latin1utf16.h +++ b/include/latin1utf16.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: latin1utf16.h 1688 2005-01-01 04:42:26Z scribe $ + * latin1utf16.h - Implementation of Latin1UTF16 * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: latin1utf16.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/latin1utf8.h b/include/latin1utf8.h index 1de302d..09767e9 100644 --- a/include/latin1utf8.h +++ b/include/latin1utf8.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: latin1utf8.h 1688 2005-01-01 04:42:26Z scribe $ + * latin1utf8.h - Implementation of Latin1UTF8 * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: latin1utf8.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/listkey.h b/include/listkey.h index 2c0a611..a388a06 100644 --- a/include/listkey.h +++ b/include/listkey.h @@ -1,12 +1,12 @@ /****************************************************************************** - * listkey.h - code for base class 'listkey'. listkey is the basis for all - * types of keys for indexing into modules - * (e.g. verse, word, - * place, etc.) * - * $Id: listkey.h 2195 2008-09-11 00:20:58Z scribe $ + * listkey.h - code for base class 'listkey'. listkey is the basis for all + * types of keys for indexing into modules + * (e.g. verse, word, place, etc.) * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: listkey.h 2893 2013-07-16 03:07:02Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -64,26 +64,36 @@ public: /** Clears out elements of list */ virtual void clear(); + // deprecated, use clear(), instead + SWDEPRECATED virtual void ClearList() { clear(); } - /** deprecated, use clear(), instead - */ - virtual void ClearList() { clear(); } - /** Returns number of elements in list - * @return number of elements in list + /** Returns number of key elements in list + * @return number of key elements in list */ - virtual int Count(); + virtual int getCount() const; + //deprecated, use getCount + SWDEPRECATED virtual int Count() { return getCount(); } /** Removes current element from list */ - virtual void Remove(); + virtual void remove(); + // deprecated use remove + SWDEPRECATED virtual void Remove() { remove(); } + - /** Sets key to element number + /** Sets container to subkey element number and repositions that subkey to either top or bottom * - * @param ielement element number to set to + * @param ielement - element number to set to + * @param pos - set the subkey element to position (TOP) or BOTTOM * @return error status + * deprecated use setToElement */ - virtual char SetToElement(int ielement, SW_POSITION = TOP); + virtual char setToElement(int ielement, SW_POSITION = TOP); + // deprecated use setToElement + SWDEPRECATED virtual char SetToElement(int ielement, SW_POSITION pos = TOP) { return setToElement(ielement, pos); } + + /** Gets a key element number * @@ -91,9 +101,10 @@ public: * @return Key or null on error */ virtual SWKey *getElement(int pos = -1); + virtual const SWKey *getElement(int pos = -1) const; // deprecated, use above function - virtual SWKey *GetElement(int pos = -1) { return getElement(pos); } + SWDEPRECATED virtual SWKey *GetElement(int pos = -1) { return getElement(pos); } /** Adds an element to the list * @param ikey the element to add @@ -124,15 +135,16 @@ public: virtual void increment(int step = 1); virtual bool isTraversable() const { return true; } - virtual long Index() const { return arraypos; } + virtual long getIndex() const { return arraypos; } virtual const char *getRangeText() const; virtual const char *getOSISRefRangeText() const; + virtual const char *getShortText() const; /** * Returns the index for the new one given as as parameter. * The first parameter is the new index. */ - virtual long Index(long index) { SetToElement(index); return Index (); } + virtual void setIndex(long index) { setToElement(index); } virtual const char *getText() const; virtual void setText(const char *ikey); virtual void sort(); diff --git a/include/localemgr.h b/include/localemgr.h index 9e30160..ac9492c 100644 --- a/include/localemgr.h +++ b/include/localemgr.h @@ -1,10 +1,11 @@ /****************************************************************************** - * localemgr.h - definition of class LocaleMgr used to interact with - * registered locales for a sword installation * - * $Id: localemgr.h 1864 2005-11-20 06:06:40Z scribe $ + * localemgr.h - definition of class LocaleMgr used to interact with + * registered locales for a sword installation * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: localemgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/lzsscomprs.h b/include/lzsscomprs.h index 67732a3..b960a55 100644 --- a/include/lzsscomprs.h +++ b/include/lzsscomprs.h @@ -1,9 +1,11 @@ /****************************************************************************** - * lzsscomprs.h - definition of Class SWCompress used for data compression * - * $Id: lzsscomprs.h 1688 2005-01-01 04:42:26Z scribe $ + * lzsscomprs.h - definition of Class SWCompress used for data + * compression * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: lzsscomprs.h 2935 2013-08-02 11:06:30Z scribe $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,54 +30,15 @@ SWORD_NAMESPACE_START -// The following are constant sizes used by the compression algorithm. -// -// N - This is the size of the ring buffer. It is set -// to 4K. It is important to note that a position -// within the ring buffer requires 12 bits. -// -// F - This is the maximum length of a character sequence -// that can be taken from the ring buffer. It is set -// to 18. Note that a length must be 3 before it is -// worthwhile to store a position/length pair, so the -// length can be encoded in only 4 bits. Or, put yet -// another way, it is not necessary to encode a length -// of 0-18, it is necessary to encode a length of -// 3-18, which requires 4 bits. -// -// THRESHOLD - It takes 2 bytes to store an offset and -// a length. If a character sequence only -// requires 1 or 2 characters to store -// uncompressed, then it is better to store -// it uncompressed than as an offset into -// the ring buffer. -// -// Note that the 12 bits used to store the position and the 4 bits -// used to store the length equal a total of 16 bits, or 2 bytes. - -#define N 4096 -#define F 18 -#define THRESHOLD 3 -#define NOT_USED N - - - -class SWDLLEXPORT LZSSCompress:public SWCompress +class SWDLLEXPORT LZSSCompress : public SWCompress { - static unsigned char m_ring_buffer[N + F - 1]; - static short int m_match_position; - static short int m_match_length; - static short int m_lson[N + 1]; - static short int m_rson[N + 257]; - static short int m_dad[N + 1]; - void InitTree (); - void InsertNode (short int Pos); - void DeleteNode (short int Node); +class Private; + Private *p; public: - LZSSCompress (); - virtual ~ LZSSCompress (); - virtual void Encode (void); - virtual void Decode (void); + LZSSCompress (); + virtual ~LZSSCompress(); + virtual void Encode(void); + virtual void Decode(void); }; SWORD_NAMESPACE_END diff --git a/include/markupfiltmgr.h b/include/markupfiltmgr.h index 5d9faa6..abef624 100644 --- a/include/markupfiltmgr.h +++ b/include/markupfiltmgr.h @@ -1,9 +1,10 @@ /****************************************************************************** - * swmarkupmgr.h - definition of class SWMarkupMgr, subclass of - * used to transcode all module text to a requested - * markup. * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * markupfiltmgr.h - definition of class SWMarkupMgr, subclass of + * used to transcode all module text to a requested + * markup + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/multimapwdef.h b/include/multimapwdef.h index 89b79a9..956a231 100644 --- a/include/multimapwdef.h +++ b/include/multimapwdef.h @@ -1,5 +1,27 @@ -#ifndef MULTIMAPWDEF -#define MULTIMAPWDEF +/****************************************************************************** + * + * multimapwdef.h - Implementation of multimapwithdefault + * + * $Id: multimapwdef.h 2935 2013-08-02 11:06:30Z scribe $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef MULTIMAPWDEF_H +#define MULTIMAPWDEF_H #include @@ -19,14 +41,14 @@ public: } T& operator[](const Key& k) { - if (find(k) == this->end()) { - insert(value_type(k, T())); + if (this->find(k) == this->end()) { + this->insert(value_type(k, T())); } - return (*(find(k))).second; + return (*(this->find(k))).second; } bool has(const Key& k, const T &val) const { - typename std::multimap::const_iterator start = lower_bound(k); - typename std::multimap::const_iterator end = upper_bound(k); + typename std::multimap::const_iterator start = this->lower_bound(k); + typename std::multimap::const_iterator end = this->upper_bound(k); for (; start!=end; start++) { if (start->second == val) return true; diff --git a/include/nullim.h b/include/nullim.h index 217c38f..b07c99e 100644 --- a/include/nullim.h +++ b/include/nullim.h @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * nullim.h - Implementation of NullIM + * + * $Id: nullim.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #ifndef NULLIM_H #define NULLIM_H diff --git a/include/osisenum.h b/include/osisenum.h new file mode 100644 index 0000000..29b312d --- /dev/null +++ b/include/osisenum.h @@ -0,0 +1,40 @@ +/****************************************************************************** + * + * osisenum.h - Implementation of OSISEnum + * + * $Id: osisenum.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef OSISENUM_H +#define OSISENUM_H + +#include + +SWORD_NAMESPACE_START + +/** This Filter shows/hides headings in a OSIS text + */ +class SWDLLEXPORT OSISEnum : public SWOptionFilter { +public: + OSISEnum(); + virtual ~OSISEnum(); + virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/osisfootnotes.h b/include/osisfootnotes.h index 2478ce0..c5105d6 100644 --- a/include/osisfootnotes.h +++ b/include/osisfootnotes.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osisfootnotes.h 1688 2005-01-01 04:42:26Z scribe $ + * osisfootnotes.h - Implementation of OSISFootnotes * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisfootnotes.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osisglosses.h b/include/osisglosses.h new file mode 100644 index 0000000..028638d --- /dev/null +++ b/include/osisglosses.h @@ -0,0 +1,40 @@ +/****************************************************************************** + * + * osisglosses.h - Implementation of OSISGlosses + * + * $Id: osisglosses.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef OSISGLOSSES_H +#define OSISGLOSSES_H + +#include + +SWORD_NAMESPACE_START + +/** This Filter shows/hides headings in a OSIS text + */ +class SWDLLEXPORT OSISGlosses : public SWOptionFilter { +public: + OSISGlosses(); + virtual ~OSISGlosses(); + virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/osisheadings.h b/include/osisheadings.h index fd1460a..2b4a56d 100644 --- a/include/osisheadings.h +++ b/include/osisheadings.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osisheadings.h 1688 2005-01-01 04:42:26Z scribe $ + * osisheadings.h - Implementation of OSISHeadings * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisheadings.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -22,16 +24,17 @@ #define OSISHEADINGS_H #include +#include SWORD_NAMESPACE_START /** This Filter shows/hides headings in a OSIS text */ -class SWDLLEXPORT OSISHeadings : public SWOptionFilter { +class SWDLLEXPORT OSISHeadings : public SWOptionFilter, public SWBasicFilter { public: OSISHeadings(); - virtual ~OSISHeadings(); - virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key); + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); }; SWORD_NAMESPACE_END diff --git a/include/osishtmlhref.h b/include/osishtmlhref.h index 4b381ab..dedd79b 100644 --- a/include/osishtmlhref.h +++ b/include/osishtmlhref.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osishtmlhref.h 2569 2010-10-14 14:13:34Z scribe $ + * osishtmlhref.h - Implementation of OSISHTMLHREF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osishtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,6 +32,7 @@ SWORD_NAMESPACE_START class SWDLLEXPORT OSISHTMLHREF : public SWBasicFilter { private: bool morphFirst; + bool renderNoteNumbers; protected: // used by derived classes so we have it in the header class TagStacks; @@ -58,6 +61,7 @@ protected: public: OSISHTMLHREF(); void setMorphFirst(bool val = true) { morphFirst = val; } + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } }; SWORD_NAMESPACE_END diff --git a/include/osislemma.h b/include/osislemma.h index c61dad4..e8ee747 100644 --- a/include/osislemma.h +++ b/include/osislemma.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osislemma.h 1688 2005-01-01 04:42:26Z scribe $ + * osislemma.h - Implementation of OSISLemma * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osislemma.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osismorph.h b/include/osismorph.h index 85cd98f..b7454fd 100644 --- a/include/osismorph.h +++ b/include/osismorph.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: osismorph.h 1688 2005-01-01 04:42:26Z scribe $ + * osismorph.h - Implementation of OSISMorph * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osismorph.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osismorphsegmentation.h b/include/osismorphsegmentation.h index 807237d..d039011 100644 --- a/include/osismorphsegmentation.h +++ b/include/osismorphsegmentation.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osismorphsegmentation.h,v 1.3 2005/09/02 22:15:30 joachim Exp $ + * osismorphsegmentation.h - Implementation of OSISMorphSegmentation * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osismorphsegmentation.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osisosis.h b/include/osisosis.h index 8f0304d..831864d 100644 --- a/include/osisosis.h +++ b/include/osisosis.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osisosis.h 1688 2005-01-01 04:42:26Z scribe $ + * osisosis.h - Implementation of OSISOSIS * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisosis.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osisplain.h b/include/osisplain.h index facbd67..5d728ca 100644 --- a/include/osisplain.h +++ b/include/osisplain.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osisplain.h 2187 2008-07-22 11:00:16Z scribe $ + * osisplain.h - Implementation of OSISPlain * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisplain.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osisredletterwords.h b/include/osisredletterwords.h index af63291..f8bdf07 100644 --- a/include/osisredletterwords.h +++ b/include/osisredletterwords.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osisredletterwords.h 1688 2005-01-01 04:42:26Z scribe $ + * osisredletterwords.h - Implementation of OSISRedLetterWords * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisredletterwords.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osisreferencelinks.h b/include/osisreferencelinks.h new file mode 100644 index 0000000..4c75850 --- /dev/null +++ b/include/osisreferencelinks.h @@ -0,0 +1,55 @@ +/****************************************************************************** + * + * osisreferencelinks.h - SWFilter descendant to toggle OSIS reference + * links with specified type/subType + * + * $Id: osisreferencelinks.h 2995 2013-12-28 06:32:26Z greg.hellings $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef OSISREFERENCELINKS_H +#define OSISREFERENCELINKS_H + +#include + +SWORD_NAMESPACE_START + +/** This Filter hides reference links with a particular type/subtype in an OSIS text + */ +class SWDLLEXPORT OSISReferenceLinks : public SWOptionFilter { + SWBuf optionName; + SWBuf optionTip; + SWBuf type; + SWBuf subType; +public: + + /** + * @param optionName - name of this option + * @param optionTip - user help tip for this option + * @param type - which reference types to hide + * @param subType - which reference subTypes to hide (optional) + * @param defaultValue - default value of option "On" or "Off" (optional) + */ + OSISReferenceLinks(const char *optionName, const char *optionTip, const char *type, const char *subType = 0, const char *defaultValue = "On"); + virtual ~OSISReferenceLinks(); + virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); +}; + +SWORD_NAMESPACE_END +#endif + + diff --git a/include/osisrtf.h b/include/osisrtf.h index e5ac9a7..8392356 100644 --- a/include/osisrtf.h +++ b/include/osisrtf.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osisrtf.h 1973 2006-09-20 04:09:16Z scribe $ + * osisrtf.h - Implementation of OSISRTF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisrtf.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osisruby.h b/include/osisruby.h deleted file mode 100644 index 07cbe49..0000000 --- a/include/osisruby.h +++ /dev/null @@ -1,38 +0,0 @@ -/****************************************************************************** - * - * $Id: osisruby.h 1688 2005-01-01 04:42:26Z scribe $ - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#ifndef OSISRUBY_H -#define OSISRUBY_H - -#include - -SWORD_NAMESPACE_START - -/** This Filter shows/hides headings in a OSIS text - */ -class SWDLLEXPORT OSISRuby : public SWOptionFilter { -public: - OSISRuby(); - virtual ~OSISRuby(); - virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); -}; - -SWORD_NAMESPACE_END -#endif diff --git a/include/osisscripref.h b/include/osisscripref.h index d3e7362..5cb5d89 100644 --- a/include/osisscripref.h +++ b/include/osisscripref.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osisscripref.h 1688 2005-01-01 04:42:26Z scribe $ + * osisscripref.h - Implementation of OSISScripRef * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisscripref.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osisstrongs.h b/include/osisstrongs.h index c40d8c2..36a4c6d 100644 --- a/include/osisstrongs.h +++ b/include/osisstrongs.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: osisstrongs.h 1688 2005-01-01 04:42:26Z scribe $ + * osisstrongs.h - Implementation of OSISStrongs * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisstrongs.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osisvariants.h b/include/osisvariants.h index 76f4806..e561d70 100644 --- a/include/osisvariants.h +++ b/include/osisvariants.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osisvariants.h 1688 2005-01-01 04:42:26Z scribe $ + * osisvariants.h - Implementation of OSISVariants * - * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisvariants.h 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -29,25 +31,11 @@ SWORD_NAMESPACE_START /** This Filter shows/hides textual variants */ class SWDLLEXPORT OSISVariants : public SWOptionFilter { - char option; - - static const char primary[]; - static const char secondary[]; - static const char all[]; - - static const char optName[]; - static const char optTip[]; - StringList options; public: OSISVariants(); virtual ~OSISVariants(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual StringList getOptionValues() { return options; } }; SWORD_NAMESPACE_END diff --git a/include/osiswebif.h b/include/osiswebif.h index 2de6b89..c58a379 100644 --- a/include/osiswebif.h +++ b/include/osiswebif.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: osiswebif.h 1946 2006-07-15 20:41:24Z scribe $ + * osiswebif.h - Implementation of OSISWEBIF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osiswebif.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -21,20 +23,19 @@ #ifndef OSISWEBIF_H #define OSISWEBIF_H -#include +#include SWORD_NAMESPACE_START /** this filter converts OSIS text to HTML text with hrefs */ -class SWDLLEXPORT OSISWEBIF : public OSISHTMLHREF { +class SWDLLEXPORT OSISWEBIF : public OSISXHTML { const SWBuf baseURL; const SWBuf passageStudyURL; bool javascript; protected: virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); - virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key); public: OSISWEBIF(); void setJavascript(bool mode) { javascript = mode; } diff --git a/include/osiswordjs.h b/include/osiswordjs.h index d278d11..fe6a316 100644 --- a/include/osiswordjs.h +++ b/include/osiswordjs.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: osisstrongs.h 1688 2005-01-01 04:42:26Z scribe $ + * osiswordjs.h - Implementation of OSISWordJS * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osiswordjs.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/osisxhtml.h b/include/osisxhtml.h new file mode 100644 index 0000000..4065dcc --- /dev/null +++ b/include/osisxhtml.h @@ -0,0 +1,74 @@ +/****************************************************************************** + * + * osisxhtml.h - Render filter for classed XHTML of an OSIS module + * + * $Id: osisxhtml.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef OSISXHTML_H +#define OSISXHTML_H + +#include + +SWORD_NAMESPACE_START + +/** this filter converts OSIS text to classed XHTML + */ +class SWDLLEXPORT OSISXHTML : public SWBasicFilter { +private: + bool morphFirst; + bool renderNoteNumbers; +protected: + + class TagStack; + // used by derived classes so we have it in the header + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key); + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); + + + class MyUserData : public BasicFilterUserData { + public: + bool osisQToTick; + bool inXRefNote; + bool BiblicalText; + int suspendLevel; + SWBuf wordsOfChristStart; + SWBuf wordsOfChristEnd; + TagStack *quoteStack; + TagStack *hiStack; + TagStack *titleStack; + TagStack *lineStack; + int consecutiveNewlines; + SWBuf lastTransChange; + SWBuf w; + SWBuf fn; + SWBuf version; + + MyUserData(const SWModule *module, const SWKey *key); + ~MyUserData(); + void outputNewline(SWBuf &buf); + }; +public: + OSISXHTML(); + void setMorphFirst(bool val = true) { morphFirst = val; } + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } + virtual const char *getHeader() const; +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/osisxlit.h b/include/osisxlit.h new file mode 100644 index 0000000..041981e --- /dev/null +++ b/include/osisxlit.h @@ -0,0 +1,40 @@ +/****************************************************************************** + * + * osisxlit.h - Implementation of OSISXlit + * + * $Id: osisxlit.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef OSISXLIT_H +#define OSISXLIT_H + +#include + +SWORD_NAMESPACE_START + +/** This Filter shows/hides headings in a OSIS text + */ +class SWDLLEXPORT OSISXlit : public SWOptionFilter { +public: + OSISXlit(); + virtual ~OSISXlit(); + virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/papyriplain.h b/include/papyriplain.h index 5498222..602b87d 100644 --- a/include/papyriplain.h +++ b/include/papyriplain.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: papyriplain.h 1688 2005-01-01 04:42:26Z scribe $ + * papyriplain.h - Implementation of PapyriPlain * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: papyriplain.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -18,8 +20,8 @@ * */ -#ifndef PapyriPLAIN_H -#define PapyriPLAIN_H +#ifndef PAPYRIPLAIN_H +#define PAPYRIPLAIN_H #include diff --git a/include/plainfootnotes.h b/include/plainfootnotes.h deleted file mode 100644 index 74a8c4a..0000000 --- a/include/plainfootnotes.h +++ /dev/null @@ -1,41 +0,0 @@ -/*************************************************************************** - * - * $Id: plainfootnotes.h 1688 2005-01-01 04:42:26Z scribe $ - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#ifndef PLAINFOOTNOTES_H -#define PLAINFOOTNOTES_H - -#include - -SWORD_NAMESPACE_START - -class SWKey; - -/**Shows or hides footnotes in plain text. - *@author The team of BibleTime - */ -class SWDLLEXPORT PLAINFootnotes : public SWOptionFilter { -public: - PLAINFootnotes(); - virtual ~PLAINFootnotes(); - virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); -}; - -SWORD_NAMESPACE_END -#endif diff --git a/include/plainhtml.h b/include/plainhtml.h deleted file mode 100644 index e09821a..0000000 --- a/include/plainhtml.h +++ /dev/null @@ -1,38 +0,0 @@ -/*************************************************************************** - * - * $Id: plainhtml.h 1688 2005-01-01 04:42:26Z scribe $ - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#ifndef PLAINHTML_H -#define PLAINHTML_H - -#include - -SWORD_NAMESPACE_START - -/** this filter converts plain text to HTML text - * @author Torsten Uhlmann, begin : Tue Jun 15 15:34:26 CEST 1999 - */ -class SWDLLEXPORT PLAINHTML : public SWFilter { -public: - PLAINHTML(); - virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); -}; - -SWORD_NAMESPACE_END -#endif diff --git a/include/rawcom.h b/include/rawcom.h index 4811b40..26241a1 100644 --- a/include/rawcom.h +++ b/include/rawcom.h @@ -1,10 +1,11 @@ /****************************************************************************** - * rawcom.h - code for class 'RawCom'- a module that reads raw commentary - * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawcom.h 2303 2009-04-06 13:38:34Z scribe $ + * rawcom.h - code for class 'RawCom'- a module that reads raw commentary + * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawcom.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -41,13 +42,13 @@ public: const char *ilang = 0, const char *versification = "KJV"); virtual ~RawCom(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; virtual void increment(int steps = 1); virtual void decrement(int steps = 1) { increment(-steps); } // write interface ---------------------------- - virtual bool isWritable(); + virtual bool isWritable() const; static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse::createModule(path, v11n); } virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry diff --git a/include/rawcom4.h b/include/rawcom4.h index f489799..e5e39c4 100644 --- a/include/rawcom4.h +++ b/include/rawcom4.h @@ -1,10 +1,11 @@ /****************************************************************************** - * rawcom.h - code for class 'RawCom4'- a module that reads raw commentary - * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawcom.h 1864 2005-11-20 06:06:40Z scribe $ + * rawcom4.h - code for class 'RawCom4'- a module that reads raw commentary + * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawcom4.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -41,13 +42,13 @@ public: const char *ilang = 0, const char *versification = "KJV"); virtual ~RawCom4(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; virtual void increment(int steps = 1); virtual void decrement(int steps = 1) { increment(-steps); } // write interface ---------------------------- - virtual bool isWritable(); + virtual bool isWritable() const; static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse4::createModule(path, v11n); } virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry diff --git a/include/rawfiles.h b/include/rawfiles.h index 5cb765b..e7db160 100644 --- a/include/rawfiles.h +++ b/include/rawfiles.h @@ -1,11 +1,12 @@ /****************************************************************************** - * rawfiles.h - code for class 'RawFiles'- a module that produces HTML HREFs - * pointing to actual text desired. Uses standard + * + * rawfiles.h - code for class 'RawFiles'- a module that produces HTML + * HREFs pointing to actual text desired. Uses standard * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawfiles.h 1864 2005-11-20 06:06:40Z scribe $ + * $Id: rawfiles.h 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -33,7 +34,7 @@ SWORD_NAMESPACE_START class SWDLLEXPORT RawFiles : public RawVerse, public SWCom { - char *getNextFilename(); + const char *getNextFilename(); public: @@ -43,13 +44,13 @@ public: SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0); virtual ~RawFiles(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; // write interface ---------------------------- /** Is the module writable? :) * @return yes or no */ - virtual bool isWritable(); + virtual bool isWritable() const; /** Creates a new module * @param path The first parameter is path of the new module diff --git a/include/rawgenbook.h b/include/rawgenbook.h index ba07478..400f3da 100644 --- a/include/rawgenbook.h +++ b/include/rawgenbook.h @@ -1,10 +1,12 @@ /****************************************************************************** - * rawtext.h - code for class 'RawText'- a module that reads raw text files: - * ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawgenbook.h 2303 2009-04-06 13:38:34Z scribe $ + * rawgenbook.h - code for class 'RawGenBook'- a module that reads raw + * text files: + * ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawgenbook.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -44,14 +46,14 @@ public: SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *keyType = "TreeKey"); virtual ~RawGenBook(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; // write interface ---------------------------- - virtual bool isWritable(); + virtual bool isWritable() const; static char createModule(const char *ipath); virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry virtual void linkEntry(const SWKey * linkKey); // Link current module entry to other module entry virtual void deleteEntry(); // Delete current module entry - virtual SWKey *CreateKey() const; + virtual SWKey *createKey() const; // end write interface ------------------------ virtual bool hasEntry(const SWKey *k) const; diff --git a/include/rawld.h b/include/rawld.h index 782900b..7e0aa25 100644 --- a/include/rawld.h +++ b/include/rawld.h @@ -1,10 +1,11 @@ /****************************************************************************** - * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and - * dictionary files: *.dat *.idx * - * $Id: rawld.h 2303 2009-04-06 13:38:34Z scribe $ + * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and + * dictionary files: *.dat *.idx * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawld.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -31,7 +32,7 @@ SWORD_NAMESPACE_START class SWDLLEXPORT RawLD : public RawStr, public SWLD { - char getEntry(long away = 0); + char getEntry(long away = 0) const; public: @@ -39,15 +40,15 @@ public: RawLD(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, - SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0); + SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, bool caseSensitive = false, bool strongsPadding = true); virtual ~RawLD(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; virtual void increment(int steps = 1); virtual void decrement(int steps = 1) { increment(-steps); } // write interface ---------------------------- - virtual bool isWritable(); + virtual bool isWritable() const; static char createModule(const char *path) { return RawStr::createModule (path); } virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry diff --git a/include/rawld4.h b/include/rawld4.h index d0118df..cc2110b 100644 --- a/include/rawld4.h +++ b/include/rawld4.h @@ -1,10 +1,11 @@ /****************************************************************************** - * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and - * dictionary files: *.dat *.idx * - * $Id: rawld4.h 2303 2009-04-06 13:38:34Z scribe $ + * rawld4.cpp - code for class 'RawLD4'- a module that reads raw + * lexicon and dictionary files: *.dat *.idx * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawld4.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -31,7 +32,7 @@ SWORD_NAMESPACE_START class SWDLLEXPORT RawLD4 : public RawStr4, public SWLD { - char getEntry(long away = 0); + char getEntry(long away = 0) const; public: @@ -39,15 +40,15 @@ public: RawLD4(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, - SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0); + SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0, bool caseSensitive = false, bool strongsPadding = true); virtual ~RawLD4(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; virtual void increment(int steps = 1); virtual void decrement(int steps = 1) { increment(-steps); } // write interface ---------------------------- - virtual bool isWritable(); + virtual bool isWritable() const; static char createModule(const char *path) { return RawStr4::createModule(path); } virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry diff --git a/include/rawstr.h b/include/rawstr.h index 41d65d5..58fc141 100644 --- a/include/rawstr.h +++ b/include/rawstr.h @@ -1,12 +1,13 @@ /***************************************************************************** - * rawstr.h - code for class 'RawStr'- a module that reads raw text - * files: ot and nt using indexs ??.bks ??.cps ??.vss - * and provides lookup and parsing functions based on - * class StrKey * - * $Id: rawstr.h 2303 2009-04-06 13:38:34Z scribe $ + * rawstr.h - code for class 'RawStr'- a module that reads raw text + * files: ot and nt using indexs ??.bks ??.cps ??.vss + * and provides lookup and parsing functions based on + * class StrKey * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawstr.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -36,6 +37,7 @@ class FileDesc; class SWDLLEXPORT RawStr { static int instance; // number of instantiated RawStr objects or derivitives char *path; + bool caseSensitive; mutable long lastoff; // for caching and optimizing @@ -48,12 +50,12 @@ protected: public: static char nl; - RawStr(const char *ipath, int fileMode = -1); + RawStr(const char *ipath, int fileMode = -1, bool caseSensitive = false); virtual ~RawStr(); void getIDXBuf(long ioffset, char **buf) const; void getIDXBufDat(long ioffset, char **buf) const; signed char findOffset(const char *key, __u32 *start, __u16 *size, long away = 0, __u32 *idxoff = 0) const; - void readText(__u32 start, __u16 *size, char **idxbuf, SWBuf &buf); + void readText(__u32 start, __u16 *size, char **idxbuf, SWBuf &buf) const; static signed char createModule(const char *path); }; diff --git a/include/rawstr4.h b/include/rawstr4.h index 91710bc..7767cb9 100644 --- a/include/rawstr4.h +++ b/include/rawstr4.h @@ -1,12 +1,13 @@ /***************************************************************************** - * rawstr.h - code for class 'RawStr'- a module that reads raw text - * files: ot and nt using indexs ??.bks ??.cps ??.vss - * and provides lookup and parsing functions based on - * class StrKey * - * $Id: rawstr4.h 2303 2009-04-06 13:38:34Z scribe $ + * rawstr4.h - code for class 'RawStr4'- a module that reads raw text + * files: ot and nt using indexs ??.bks ??.cps ??.vss + * and provides lookup and parsing functions based on + * class StrKey * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawstr4.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -36,6 +37,7 @@ class SWBuf; class SWDLLEXPORT RawStr4 { static int instance; // number of instantiated RawStr4 objects or derivitives char *path; + bool caseSensitive; mutable long lastoff; // for caching and optimizations protected: @@ -47,12 +49,12 @@ protected: void doLinkEntry(const char *destkey, const char *srckey); public: char nl; - RawStr4(const char *ipath, int fileMode = -1); + RawStr4(const char *ipath, int fileMode = -1, bool caseSensitive = false); virtual ~RawStr4(); void getIDXBuf(long ioffset, char **buf) const; void getIDXBufDat(long ioffset, char **buf) const; signed char findOffset(const char *key, __u32 *start, __u32 *size, long away = 0, __u32 *idxoff = 0) const; - void readText(__u32 start, __u32 *size, char **idxbuf, SWBuf &buf); + void readText(__u32 start, __u32 *size, char **idxbuf, SWBuf &buf) const; static signed char createModule(const char *path); }; diff --git a/include/rawtext.h b/include/rawtext.h index cfff611..55dcac1 100644 --- a/include/rawtext.h +++ b/include/rawtext.h @@ -1,10 +1,11 @@ /****************************************************************************** - * rawtext.h - code for class 'RawText'- a module that reads raw text files: - * ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawtext.h 2303 2009-04-06 13:38:34Z scribe $ + * rawtext.h - code for class 'RawText'- a module that reads raw text files: + * ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawtext.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -38,11 +39,11 @@ public: RawText(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *versification = "KJV"); virtual ~RawText(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; virtual void increment(int steps = 1); virtual void decrement(int steps = 1) { increment(-steps); } // write interface ---------------------------- - virtual bool isWritable(); + virtual bool isWritable() const; static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse::createModule(path, v11n); } virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry diff --git a/include/rawtext4.h b/include/rawtext4.h index a3d0369..6de04b3 100644 --- a/include/rawtext4.h +++ b/include/rawtext4.h @@ -1,10 +1,12 @@ /****************************************************************************** - * rawtext.h - code for class 'RawText4'- a module that reads raw text files: - * ot and nt using indexs ??.bks ??.cps ??.vss * - * $Id: rawtext.h 1864 2005-11-20 06:06:40Z scribe $ + * rawtext4.h - code for class 'RawText4'- a module that reads raw + * text files: + * ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawtext4.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -39,11 +41,11 @@ public: RawText4(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *versification = "KJV"); virtual ~RawText4(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; virtual void increment(int steps = 1); virtual void decrement(int steps = 1) { increment(-steps); } // write interface ---------------------------- - virtual bool isWritable(); + virtual bool isWritable() const; static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse4::createModule(path, v11n); } virtual void setEntry(const char *inbuf, long len = -1); // Modify current module entry virtual void linkEntry(const SWKey *linkKey); // Link current module entry to other module entry diff --git a/include/rawverse.h b/include/rawverse.h index 3ce4794..0b63491 100644 --- a/include/rawverse.h +++ b/include/rawverse.h @@ -1,8 +1,26 @@ /****************************************************************************** - * rawverse.h - code for class 'RawVerse'- a module that reads raw text + * + * rawverse.h - code for class 'RawVerse'- a module that reads raw text * files: ot and nt using indexs ??.bks ??.cps ??.vss * and provides lookup and parsing functions based on * class VerseKey + * + * $Id: rawverse.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * */ #ifndef RAWVERSE_H @@ -33,7 +51,7 @@ public: RawVerse(const char *ipath, int fileMode = -1); virtual ~RawVerse(); void findOffset(char testmt, long idxoff, long *start, unsigned short *end) const; - void readText(char testmt, long start, unsigned short size, SWBuf &buf); + void readText(char testmt, long start, unsigned short size, SWBuf &buf) const; static char createModule(const char *path, const char *v11n = "KJV"); }; diff --git a/include/rawverse4.h b/include/rawverse4.h index fee51c3..a78ed71 100644 --- a/include/rawverse4.h +++ b/include/rawverse4.h @@ -1,10 +1,29 @@ /****************************************************************************** - * rawverse.h - code for class 'RawVerse'- a module that reads raw text - * files: ot and nt using indexs ??.bks ??.cps ??.vss - * and provides lookup and parsing functions based on - * class VerseKey + * + * rawverse4.h - code for class 'RawVerse4'- a module that reads raw + * text files: ot and nt using indexs ??.bks ??.cps + * ??.vss and provides lookup and parsing functions based + * on class VerseKey + * + * $Id: rawverse4.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * */ + #ifndef RAWVERSE4_H #define RAWVERSE4_H @@ -33,7 +52,7 @@ public: RawVerse4(const char *ipath, int fileMode = -1); virtual ~RawVerse4(); void findOffset(char testmt, long idxoff, long *start, unsigned long *end) const; - void readText(char testmt, long start, unsigned long size, SWBuf &buf); + void readText(char testmt, long start, unsigned long size, SWBuf &buf) const; static char createModule(const char *path, const char *v11n = "KJV"); }; diff --git a/include/remotetrans.h b/include/remotetrans.h new file mode 100644 index 0000000..d20d96b --- /dev/null +++ b/include/remotetrans.h @@ -0,0 +1,84 @@ +/****************************************************************************** + * + * remotetrans.h - code for Remote Transport + * + * $Id: remotetrans.h 2932 2013-07-31 14:07:01Z scribe $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef REMOTETRANS_H +#define REMOTETRANS_H + +#include +#include +#include + + +SWORD_NAMESPACE_START + +/** Class for reporting status +*/ +class SWDLLEXPORT StatusReporter { +public: + virtual ~StatusReporter() {}; + /** Messages before stages of a batch download */ + virtual void preStatus(long totalBytes, long completedBytes, const char *message); + + /** frequently called throughout a download, to report status */ + SWDEPRECATED virtual void statusUpdate(double dtTotal, double dlNow); + virtual void update(unsigned long totalBytes, unsigned long completedBytes); +}; + + +/** +* A base class to be used for reimplementation of network services. +*/ +class SWDLLEXPORT RemoteTransport { + +protected: + StatusReporter *statusReporter; + bool passive; + bool term; + SWBuf host; + SWBuf u; + SWBuf p; + +public: + RemoteTransport(const char *host, StatusReporter *statusReporter = 0); + virtual ~RemoteTransport(); + + /*********** + * override this method in your real impl + * + * if destBuf then write to buffer instead of file + */ + virtual char getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf = 0); + + + int copyDirectory(const char *urlPrefix, const char *dir, const char *dest, const char *suffix); + + virtual std::vector getDirList(const char *dirURL); + void setPassive(bool passive) { this->passive = passive; } + void setUser(const char *user) { u = user; } + void setPasswd(const char *passwd) { p = passwd; } + void terminate() { term = true; } +}; + + +SWORD_NAMESPACE_END + +#endif diff --git a/include/roman.h b/include/roman.h index 37e4d1d..cdbb362 100644 --- a/include/roman.h +++ b/include/roman.h @@ -1,7 +1,10 @@ /****************************************************************************** - * roman.h - roman numeral functions * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * roman.h - roman numeral functions + * + * $Id: roman.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/rtfhtml.h b/include/rtfhtml.h index 4fba5ed..e29f7ef 100644 --- a/include/rtfhtml.h +++ b/include/rtfhtml.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: rtfhtml.h 1688 2005-01-01 04:42:26Z scribe $ + * rtfhtml.h - Implementation of RTFHTML * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rtfhtml.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/sapphire.h b/include/sapphire.h index a5e21ad..96f3bf5 100644 --- a/include/sapphire.h +++ b/include/sapphire.h @@ -1,19 +1,42 @@ -/* sapphire.h -- Interface for the Saphire II stream cipher. +/****************************************************************************** + * + * sapphire.h - the Saphire II stream cipher class + * + * $Id: sapphire.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ - Dedicated to the Public Domain the author and inventor - (Michael Paul Johnson). This code comes with no warranty. - Use it at your own risk. - Ported from the Pascal implementation of the Sapphire Stream - Cipher 9 December 1994. - Added hash-specific functions 27 December 1994. - Made index variable initialization key-dependent, - made the output function more resistant to cryptanalysis, - and renamed to Sapphire II Stream Cipher 2 January 1995. - - unsigned char is assumed to be 8 bits. If it is not, the - results of assignments need to be reduced to 8 bits with - & 0xFF or % 0x100, whichever is faster. -*/ +/****************************************************************************** + * + * Original license notice & credits: + * Dedicated to the Public Domain the author and inventor + * (Michael Paul Johnson). This code comes with no warranty. + * Use it at your own risk. + * Ported from the Pascal implementation of the Sapphire Stream + * Cipher 9 December 1994. + * Added hash-specific functions 27 December 1994. + * Made index variable initialization key-dependent, + * made the output function more resistant to cryptanalysis, + * and renamed to Sapphire II Stream Cipher 2 January 1995. + * + * unsigned char is assumed to be 8 bits. If it is not, the + * results of assignments need to be reduced to 8 bits with + * & 0xFF or % 0x100, whichever is faster. + */ #ifndef NULL #define NULL 0 diff --git a/include/scsuutf8.h b/include/scsuutf8.h new file mode 100644 index 0000000..7a36733 --- /dev/null +++ b/include/scsuutf8.h @@ -0,0 +1,42 @@ +/****************************************************************************** + * + * scsuutf8.h - SWFilter descendant to convert a SCSU character to UTF-8 + * + * $Id: scsuutf8.h 2846 2013-06-29 14:48:47Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef SCSUUTF8_H +#define SCSUUTF8_H + +#include + +SWORD_NAMESPACE_START + +/** This filter converts SCSU compressed (encoded) text to UTF-8 + */ +class SWDLLEXPORT SCSUUTF8 : public SWFilter { + unsigned long c, d; + unsigned char* UTF8Output(unsigned long, unsigned char* text); + +public: + SCSUUTF8(); + virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/stringmgr.h b/include/stringmgr.h index fe2eb5e..c7f67f2 100644 --- a/include/stringmgr.h +++ b/include/stringmgr.h @@ -1,10 +1,11 @@ /****************************************************************************** - * stringmgr.h - A class which provides string handling functions which can - * be reimplemented by frontends * - * $Id: stringmgr.h 2098 2007-10-07 18:57:07Z scribe $ + * stringmgr.h - A class which provides string handling functions which + * can be reimplemented by frontends * - * Copyright 2005 CrossWire Bible Society (http://www.crosswire.org) + * $Id: stringmgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -108,7 +109,7 @@ inline char *toupperstr_utf8(char *t, unsigned int max = 0) { inline SWBuf &toupperstr(SWBuf &b) { char *utf8 = 0; stdstr(&utf8, b.c_str(), 2); - toupperstr(utf8, strlen(utf8)*2); + toupperstr(utf8, (unsigned int)strlen(utf8)*2); b = utf8; delete [] utf8; return b; diff --git a/include/strkey.h b/include/strkey.h index 29cb0a9..8a10340 100644 --- a/include/strkey.h +++ b/include/strkey.h @@ -1,9 +1,10 @@ /****************************************************************************** - * strkey.h - code for class 'strkey'- a standard Biblical verse key * - * $Id: strkey.h 1864 2005-11-20 06:06:40Z scribe $ + * strkey.h - code for class 'strkey'- a standard Biblical verse key * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: strkey.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/swbasicfilter.h b/include/swbasicfilter.h index c3f9aee..29ea8a0 100644 --- a/include/swbasicfilter.h +++ b/include/swbasicfilter.h @@ -1,12 +1,13 @@ /****************************************************************************** - * swbasicfilter.h - definition of class SWBasicFilter. An SWFilter - * impl that provides some basic methods that - * many filter will need and can use as a starting - * point. * - * $Id: swbasicfilter.h 1984 2006-10-08 05:06:52Z scribe $ + * swbasicfilter.h - definition of class SWBasicFilter. An SWFilter + * impl that provides some basic methods that + * many filter will need and can use as a starting + * point * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swbasicfilter.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -55,7 +56,7 @@ public: * *buf address and change *buf to point past * the last char of the written sequence. */ -class SWDLLEXPORT SWBasicFilter : public SWFilter { +class SWDLLEXPORT SWBasicFilter : public virtual SWFilter { class Private; diff --git a/include/swbuf.h b/include/swbuf.h index eac0e70..0344299 100644 --- a/include/swbuf.h +++ b/include/swbuf.h @@ -1,23 +1,24 @@ /****************************************************************************** -* swbuf.h - code for SWBuf used as a transport and utility for data buffers -* -* $Id: swbuf.h 2378 2009-05-04 23:18:51Z scribe $ -* -* Copyright 2003 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * swbuf.h - code for SWBuf used as a transport and utility for data buffers + * + * $Id: swbuf.h 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #ifndef SWBUF_H #define SWBUF_H @@ -47,8 +48,6 @@ class SWDLLEXPORT SWBuf { char *endAlloc; char fillByte; unsigned long allocSize; - static char *nullStr; - static char junkBuf[JUNKBUFSIZE]; inline void assureMore(size_t pastEnd) { if (size_t(endAlloc-end) < pastEnd) { @@ -81,6 +80,8 @@ class SWDLLEXPORT SWBuf { public: + static char *nullStr; + /****************************************************************************** * SWBuf Constructor - Creates an empty SWBuf object * @@ -143,7 +144,7 @@ public: * @param pos The position of the requested character. * @return The character at the specified position */ - inline char &charAt(unsigned long pos) { return ((pos <= (unsigned long)(end - buf)) ? buf[pos] : ((*junkBuf=0),*junkBuf)); } + inline char &charAt(unsigned long pos) { return ((pos <= (unsigned long)(end - buf)) ? buf[pos] : (*nullStr)); } /** * @return size() and length() return only the number of characters of the string. @@ -232,7 +233,7 @@ public: * @param str Append this. * @param max Append only max chars. */ - void append(const char *str, long max = -1); + SWBuf &append(const char *str, long max = -1); /** * SWBuf::append - appends a value to the current value of this SWBuf @@ -240,17 +241,38 @@ public: * @param str Append this. * @param max Append only max chars. */ - inline void append(const SWBuf &str, long max = -1) { append(str.c_str(), max); } + inline SWBuf &append(const SWBuf &str, long max = -1) { return append(str.c_str(), max); } /** * SWBuf::append - appends a value to the current value of this SWBuf * If the allocated memory is not enough, it will be resized accordingly. * @param ch Append this. */ - inline void append(char ch) { + inline SWBuf &append(char ch) { + assureMore(1); + *end++ = ch; + *end = 0; + return *this; + } + inline SWBuf &append(const unsigned char ch) { assureMore(1); *end++ = ch; *end = 0; + return *this; + } + + /** + * SWBuf::append - appends a wide charachter value to the current value of this SWBuf + * If the allocated memory is not enough, it will be resized accordingly. + * NOTE: This is dangerous, as wchar_t is currently different sizes on different + * platforms (stupid windoze; stupid c++ spec for not mandating 4byte). + * @param ch Append this. + */ + inline SWBuf &append(wchar_t wch) { + assureMore(sizeof(wchar_t)*2); + for (unsigned int i = 0; i < sizeof(wchar_t); i++) *end++ = ((char *)&wch)[i]; + for (unsigned int i = 0; i < sizeof(wchar_t); i++) end[i] = 0; + return *this; } /** @@ -269,7 +291,7 @@ public: * @param format The format string. Same syntax as printf, for example. * @param ... Add all arguments here. */ - void appendFormatted(const char *format, ...); + SWBuf &appendFormatted(const char *format, ...); /** * SWBuf::insert - inserts the given string at position into this string @@ -402,6 +424,11 @@ public: */ inline bool endsWith(const SWBuf &postfix) const { return (size() >= postfix.size())?!strncmp(end-postfix.size(), postfix.c_str(), postfix.size()):false; } + /** + * @return returns the index of a substring if it is found in this buffer; otherwise, returns < 0 + */ + inline long indexOf(const SWBuf &needle) const { const char *ch = strstr(buf, needle.c_str()); return (ch) ? ch - buf : -1; } + inline int compare(const SWBuf &other) const { return strcmp(c_str(), other.c_str()); } inline bool operator ==(const SWBuf &other) const { return compare(other) == 0; } inline bool operator !=(const SWBuf &other) const { return compare(other) != 0; } diff --git a/include/swcacher.h b/include/swcacher.h index a68cb16..55374e8 100644 --- a/include/swcacher.h +++ b/include/swcacher.h @@ -1,10 +1,12 @@ /****************************************************************************** - * swcacher.h - definition of class SWCacher used to provide an interface for - * objects that cache and want a standard interface for cleaning up. * - * $Id: swcacher.h 1688 2005-01-01 04:42:26Z scribe $ + * swcacher.h - definition of class SWCacher used to provide an + * interface for objects that cache and want a standard + * interface for cleaning up. * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swcacher.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/swcipher.h b/include/swcipher.h index d9fad23..46e10b4 100644 --- a/include/swcipher.h +++ b/include/swcipher.h @@ -1,9 +1,11 @@ /****************************************************************************** - * swcipher.h - definition of Class SWCipher used for data cipher/decipher * - * $Id: swcipher.h 1864 2005-11-20 06:06:40Z scribe $ + * swcipher.h - definition of Class SWCipher used for data + * cipher/decipher * - * Copyright 1999 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swcipher.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/swcom.h b/include/swcom.h index 3b07ccd..ec2222b 100644 --- a/include/swcom.h +++ b/include/swcom.h @@ -1,22 +1,23 @@ /****************************************************************************** - * swcom.h - code for base class 'SWCom'. SWCom is the basis for all - * types of commentary modules. - * It is traditionally close to the same as the SWText - * module type, but has defaults set which more - * closely represent how a commentary will be used and how - * the bulk of our commentaries expect to be used. For example, - * most commentaries consist of entries for a range of text - * (Matt.1.1-6: "Matthew begins with by telling us..."). This - * same entry will be returned when any verse between Matt.1.1-6 - * is requested from the engine. This is done with verse linking. - * Since linking is used heavily in commentaries, the flag - * skipConsecutiveLinks is defaulted to true so when the - * commentary is incremented, it will go to the next ENTRY, - * not the next verse (likely Matt.1.7, from our example above). * - * $Id: swcom.h 2362 2009-04-29 07:21:35Z scribe $ + * swcom.h - code for base class 'SWCom'. SWCom is the basis for all + * types of commentary modules. + * It is traditionally close to the same as the SWText + * module type, but has defaults set which more + * closely represent how a commentary will be used and how + * the bulk of our commentaries expect to be used. For example, + * most commentaries consist of entries for a range of text + * (Matt.1.1-6: "Matthew begins with by telling us..."). This + * same entry will be returned when any verse between Matt.1.1-6 + * is requested from the engine. This is done with verse linking. + * Since linking is used heavily in commentaries, the flag + * skipConsecutiveLinks is defaulted to true so when the + * commentary is incremented, it will go to the next ENTRY, + * not the next verse (likely Matt.1.7, from our example above). * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swcom.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -68,10 +69,10 @@ public: const char *versification = "KJV"); virtual ~SWCom(); - virtual SWKey *CreateKey() const; + virtual SWKey *createKey() const; - virtual long Index() const; - virtual long Index(long iindex); + virtual long getIndex() const; + virtual void setIndex(long iindex); diff --git a/include/swcomprs.h b/include/swcomprs.h index e7a772e..9b06fe1 100644 --- a/include/swcomprs.h +++ b/include/swcomprs.h @@ -1,9 +1,11 @@ /****************************************************************************** - * swcomprs.h - definition of Class SWCompress used for data compression * - * $Id: swcomprs.h 1688 2005-01-01 04:42:26Z scribe $ + * swcomprs.h - definition of Class SWCompress used for data + * compression * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swcomprs.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/swconfig.h b/include/swconfig.h index 2139d3e..71fe735 100644 --- a/include/swconfig.h +++ b/include/swconfig.h @@ -1,10 +1,11 @@ /****************************************************************************** - * swconfig.h - definition of Class SWConfig used for saving and retrieval - * of configuration information * - * $Id: swconfig.h 2180 2008-07-13 20:29:25Z scribe $ + * swconfig.h - definition of Class SWConfig used for saving and + * retrieval of configuration information * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swconfig.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/swdisp.h b/include/swdisp.h index ca56a6e..f18e03d 100644 --- a/include/swdisp.h +++ b/include/swdisp.h @@ -1,10 +1,11 @@ /****************************************************************************** - * swdisp.h - code for base class 'swdisp'. swdisp is the basis for all + * + * swdisp.h - code for base class 'swdisp'. swdisp is the basis for all * types of displays (e.g. raw textout, curses, xwindow, etc.) * - * $Id: swdisp.h 1825 2005-06-10 09:03:37Z jansorg $ + * $Id: swdisp.h 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -36,7 +37,7 @@ class SWModule; class SWDLLEXPORT SWDisplay : public SWObject { static SWClass classdef; public: - SWDisplay () { myclass = &classdef; }; + SWDisplay() { myclass = &classdef; }; virtual ~SWDisplay() {}; /** casts a module to a character pointer and displays it to @@ -46,7 +47,8 @@ public: * @param imodule module to display * @return error status */ - virtual char Display (SWModule & imodule); + virtual char display(SWModule &imodule) = 0; + SWDEPRECATED char Display(SWModule &imodule) { return display(imodule); } }; SWORD_NAMESPACE_END diff --git a/include/swfilter.h b/include/swfilter.h index 8e16e22..4dbba82 100644 --- a/include/swfilter.h +++ b/include/swfilter.h @@ -1,10 +1,11 @@ /****************************************************************************** - * swfilter.h - definition of class SWFilter used to filter text between - * different formats * - * $Id: swfilter.h 1864 2005-11-20 06:06:40Z scribe $ + * swfilter.h - definition of class SWFilter used to filter text between + * different formats * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swfilter.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -42,13 +43,20 @@ class SWDLLEXPORT SWFilter { public: virtual ~SWFilter() {} - /** This is the main filter function + /** This method processes and appropriately modifies the text given it + * for a particular filter task + * * @param text The text to be filtered/converted * @param key Current key That was used. * @param module Current module. * @return 0 */ virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0) = 0; + + /** This method can supply a header associated with the processing done with this filter. + * A typical example is a suggested CSS style block for classed containers. + */ + virtual const char *getHeader() const { return ""; } }; SWORD_NAMESPACE_END diff --git a/include/swfiltermgr.h b/include/swfiltermgr.h index 49923fe..2160d5a 100644 --- a/include/swfiltermgr.h +++ b/include/swfiltermgr.h @@ -1,10 +1,11 @@ /****************************************************************************** - * swfiltermgr.h - definition of class SWFilterMgr used as an interface to - * manage filters on a module * - * $Id: swfiltermgr.h 1864 2005-11-20 06:06:40Z scribe $ + * swfiltermgr.h - definition of class SWFilterMgr used as an interface to + * manage filters on a module * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swfiltermgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/swgenbook.h b/include/swgenbook.h index d4f3d8f..b463fff 100644 --- a/include/swgenbook.h +++ b/include/swgenbook.h @@ -1,23 +1,24 @@ /****************************************************************************** -* swgenbook.h -* -* $Id: swgenbook.h 2303 2009-04-06 13:38:34Z scribe $ -* -* Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * swgenbook.h - Implementation of SWGenBook + * + * $Id: swgenbook.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #ifndef SWGENBOOK_H #define SWGENBOOK_H @@ -35,7 +36,7 @@ SWORD_NAMESPACE_START class SWDLLEXPORT SWGenBook : public SWModule { protected: - char *entkeytxt; + mutable char *entkeytxt; mutable TreeKey *tmpTreeKey; TreeKey &getTreeKey(const SWKey *k = 0) const; @@ -48,7 +49,7 @@ public: SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0); virtual ~SWGenBook(); - virtual SWKey *CreateKey() const = 0; + virtual SWKey *createKey() const = 0; // OPERATORS ----------------------------------------------------------------- diff --git a/include/swinputmeth.h b/include/swinputmeth.h index e2d14e2..b1ad274 100644 --- a/include/swinputmeth.h +++ b/include/swinputmeth.h @@ -1,10 +1,23 @@ -/** - * Title: - * Description: - * Copyright: Copyright (c) 2001 CrossWire Bible Society under the terms of the GNU GPL - * Company: - * @author Troy A. Griffitts - * @version 1.0 +/****************************************************************************** + * + * swinputmeth.h - Implementation of SWInputMethod + * + * $Id: swinputmeth.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * */ #ifndef SWINPUTMETHOD_H diff --git a/include/swkey.h b/include/swkey.h index eea2135..89786f0 100644 --- a/include/swkey.h +++ b/include/swkey.h @@ -1,11 +1,12 @@ /****************************************************************************** - * swkey.h - code for base class 'swkey'. swkey is the basis for all - * types of keys for indexing into modules (e.g. verse, word, - * place, etc.) * - * $Id: swkey.h 2324 2009-04-20 18:40:15Z scribe $ + * swkey.h - code for base class 'swkey'. swkey is the basis for all + * types of keys for indexing into modules (e.g. verse, word, + * place, etc.) * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swkey.h 2926 2013-07-31 02:06:33Z scribe $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -27,6 +28,7 @@ #include #include +#include #include SWORD_NAMESPACE_START @@ -102,8 +104,8 @@ protected: char *keytext; mutable char *rangeText; mutable bool boundSet; - char persist; - char error; + bool persist; + mutable char error; char *localeName; SWLocale *getPrivateLocale() const; @@ -111,8 +113,8 @@ protected: public: - // misc pointer for whatever - void *userData; + // misc storage for whatever + __u64 userData; /** initializes instance of SWKey from a string * All keys can be reduced to a string representation which should be able @@ -124,7 +126,7 @@ public: /** Copy Constructor * @param k The SWKey object to copy. */ - SWKey(SWKey const &k); + SWKey(const SWKey &k); /** Destructor, cleans up this instance of SWKey */ @@ -136,23 +138,27 @@ public: */ virtual SWKey *clone() const; + /** Gets whether this key should persist in any module to which it is set * otherwise just a copy will be used in the module. * @return 1 - persists in module; 0 - a copy is attempted */ - char Persist() const; + bool isPersist() const; + SWDEPRECATED char Persist() const { return isPersist(); } /** Sets whether this key should persist in any module to which it is set * otherwise just a copy will be used in the module. * @param ipersist value which to set persist; * @return 1 - persists in module; 0 - a copy is attempted */ - char Persist(signed char ipersist); + SWDEPRECATED char Persist(signed char ipersist) { setPersist(ipersist!=0); return isPersist(); } + void setPersist(bool ipersist); /** Gets and clears error status * @return error status */ - virtual char Error(); + SWDEPRECATED char Error() { return popError(); } + virtual char popError(); virtual void setError(char err) { error = err; } /** Sets this SWKey with a character string @@ -203,10 +209,6 @@ public: */ virtual void increment(int steps = 1); - /** deprecated, use isTraversible - */ - char Traversable() { return (isTraversable()) ? 1:0; } - /** Whether or not this key can be ++ -- incremented */ virtual bool isTraversable() const { return false; } @@ -216,11 +218,11 @@ public: /** Use this function to get an index position within a module. */ - virtual long Index() const { return index; } + virtual long getIndex() const { return index; } /** See documentation for @ref Index() */ - virtual long Index(long iindex) { index = iindex; return index; } + virtual void setIndex(long iindex) { index = iindex; } SWKEY_OPERATORS diff --git a/include/swld.h b/include/swld.h index bc14ca0..397a0bc 100644 --- a/include/swld.h +++ b/include/swld.h @@ -1,10 +1,11 @@ /****************************************************************************** - * swld.h - code for base class 'SWLD'. SWLD is the basis for all - * types of Lexicon and Dictionary modules (hence the 'LD'). * - * $Id: swld.h 2303 2009-04-06 13:38:34Z scribe $ + * swld.h - code for base class 'SWLD'. SWLD is the basis for all + * types of Lexicon and Dictionary modules (hence the 'LD'). * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swld.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -34,18 +35,19 @@ SWORD_NAMESPACE_START */ class SWDLLEXPORT SWLD : public SWModule { protected: - char *entkeytxt; + mutable char *entkeytxt; static void strongsPad(char *buf); + bool strongsPadding; public: /** Initializes data for instance of SWLD */ SWLD(const char *imodname = 0, const char *imoddesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, - SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0); + SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, bool strongsPadding = true); virtual ~SWLD(); - virtual SWKey *CreateKey() const; + virtual SWKey *createKey() const; /** Sets/gets module KeyText, getting from saved text if key is persistent * @@ -53,7 +55,7 @@ public: * [0] - only get * @return pointer to keytext */ - virtual const char *KeyText(const char *ikeytext = 0); + virtual const char *getKeyText() const; virtual void setPosition(SW_POSITION pos); diff --git a/include/swlocale.h b/include/swlocale.h index 1b77a6d..94ee17a 100644 --- a/include/swlocale.h +++ b/include/swlocale.h @@ -1,10 +1,11 @@ /****************************************************************************** - * swlocale.h - definition of Class SWLocale used for retrieval - * of locale lookups * - * $Id: swlocale.h 2191 2008-08-16 16:16:03Z scribe $ + * swlocale.h - definition of Class SWLocale used for retrieval + * of locale lookups * - * Copyright 2000 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swlocale.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/swlog.h b/include/swlog.h index 9aa6109..ab6fc58 100644 --- a/include/swlog.h +++ b/include/swlog.h @@ -1,9 +1,10 @@ /****************************************************************************** - * swlog.h - definition of class SWLog used for logging messages * - * $Id: swlog.h 2080 2007-09-17 06:21:29Z scribe $ + * swlog.h - definition of class SWLog used for logging messages * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swlog.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/swmacs.h b/include/swmacs.h index 4da07b0..8502912 100644 --- a/include/swmacs.h +++ b/include/swmacs.h @@ -1,9 +1,10 @@ /****************************************************************************** - * swmacs.h - generic macros * - * $Id: swmacs.h 1688 2005-01-01 04:42:26Z scribe $ + * swmacs.h - generic macros * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swmacs.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/swmgr.h b/include/swmgr.h index 6e7236f..5c98d11 100644 --- a/include/swmgr.h +++ b/include/swmgr.h @@ -1,10 +1,11 @@ /****************************************************************************** - * swmgr.h - definition of class SWMgr used to interact with an install - * base of sword modules. * - * $Id: swmgr.h 2340 2009-04-26 13:51:42Z scribe $ + * swmgr.h - definition of class SWMgr used to interact with an install + * base of sword modules. * - * Copyright 1998-2008 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swmgr.h 2941 2013-08-03 07:08:24Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -42,12 +43,13 @@ * some of the existing ones. They can always use help, and will also prove to be good examples * if you decide to start a new project. * - * Well known frontends are:\n - * -BibleTime (http://www.bibletime.info)\n - * -BPBible (http://bpbible.com)\n - * -MacSword (http://www.macsword.com)\n - * -Xiphos (http://xiphos.org)\n - * -SWORD for Windows (http://crosswire.org/sword/software/biblecs/)\n + * Well known frontends are: + * -BibleTime (http://www.bibletime.info) + * -BPBible (http://bpbible.com) + * -Eloquent (http://www.macsword.com) + * -PocketSword (http://crosswire.org/pocketsword/) + * -SWORD for Windows (http://crosswire.org/sword/software/biblecs/) + * -Xiphos (http://xiphos.org) */ #ifndef SWMGR_H @@ -84,11 +86,9 @@ class SWOptionFilter; * SWMgr exposes an installed module set and can be asked to configure the desired * markup and options which modules will produce. * - * @version $Id: swmgr.h 2340 2009-04-26 13:51:42Z scribe $ + * @version $Id: swmgr.h 2941 2013-08-03 07:08:24Z chrislit $ */ class SWDLLEXPORT SWMgr { - - private: bool mgrModeMultiMod; bool augmentHome; @@ -100,7 +100,7 @@ protected: SWConfig *mysysconfig; SWConfig *homeConfig; void CreateMods(bool multiMod = false); - SWModule *CreateMod(const char *name, const char *driver, ConfigEntMap §ion); + virtual SWModule *createModule(const char *name, const char *driver, ConfigEntMap §ion); void DeleteMods(); char configType; // 0 = file; 1 = directory OptionFilterMap optionFilters; @@ -111,6 +111,7 @@ protected: SWFilter *teiplain; SWOptionFilter *transliterator; FilterList cleanupFilters; + FilterMap extraFilters; StringList options; virtual void init(); // use to initialize before loading modules virtual char AddModToConfig(FileDesc *conffd, const char *fname); @@ -157,6 +158,14 @@ protected: public: + // constants which represent module types used in SWModule::getType + static const char *MODTYPE_BIBLES; + static const char *MODTYPE_COMMENTARIES; + static const char *MODTYPE_LEXDICTS; + static const char *MODTYPE_GENBOOKS; + static const char *MODTYPE_DAILYDEVOS; + + static bool isICU; static const char *globalConfPath; static SWBuf getHomeDir(); diff --git a/include/swmodule.h b/include/swmodule.h index 86ff822..9c733dc 100644 --- a/include/swmodule.h +++ b/include/swmodule.h @@ -1,11 +1,12 @@ /****************************************************************************** - * swmodule.h - code for base class 'module'. Module is the basis for all - * types of modules (e.g. texts, commentaries, maps, lexicons, - * etc.) * - * $Id: swmodule.h 2318 2009-04-10 21:22:16Z scribe $ + * swmodule.h - code for base class 'module'. Module is the basis for + * all types of modules (e.g. texts, commentaries, maps, + * lexicons, etc.) * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swmodule.h 2944 2013-08-03 09:43:40Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,6 +31,9 @@ #include #include +#ifndef _WIN32_WCE +#include +#endif #include @@ -43,7 +47,8 @@ class SWFilter; #define SEARCHFLAG_MATCHWHOLEENTRY 4096 #define SWMODULE_OPERATORS \ - operator const char *() { return RenderText(); } \ + SWDEPRECATED operator const char *() { static SWBuf unsafeTmp = renderText(); return unsafeTmp.c_str(); } \ + operator SWBuf() { return renderText(); } \ operator SWKey &() { return *getKey(); } \ operator SWKey *() { return getKey(); } \ SWModule &operator <<(const char *inbuf) { setEntry(inbuf); return *this; } \ @@ -84,8 +89,19 @@ typedef std::map < SWBuf, AttributeList, std::less < SWBuf > > AttributeTypeList // Just leave for now. This lets us always able to call module->flush() // to manually flush a cache, and doesn't hurt if there is no work done. + class SWDLLEXPORT SWModule : public SWCacher, public SWSearchable { +class StdOutDisplay : public SWDisplay { + char display(SWModule &imodule) + { + #ifndef _WIN32_WCE + std::cout << imodule.renderText(); + #endif + return 0; + } +}; + protected: ConfigEntMap ownConfig; @@ -93,7 +109,7 @@ protected: mutable AttributeTypeList entryAttributes; mutable bool procEntAttr; - char error; + mutable char error; bool skipConsecutiveLinks; /** the current key */ @@ -112,8 +128,8 @@ protected: /** this module's display object */ SWDisplay *disp; - static SWDisplay rawdisp; - SWBuf entryBuf; + static StdOutDisplay rawdisp; + mutable SWBuf entryBuf; /** filters to be executed to remove all markup (for searches) */ FilterList *stripFilters; @@ -130,7 +146,7 @@ protected: /** filters to be executed to decode text for display */ FilterList *encodingFilters; - int entrySize; + mutable int entrySize; mutable long entryIndex; // internal common storage for index static void prepText(SWBuf &buf); @@ -165,12 +181,13 @@ public: * * @return error status */ - virtual char Error(); + virtual char popError(); + SWDEPRECATED virtual char Error() { return popError(); } /** * @return True if this module is encoded in Unicode, otherwise returns false. */ - virtual bool isUnicode() const { return (encoding == (char)ENC_UTF8); } + virtual bool isUnicode() const { return (encoding == (char)ENC_UTF8 || encoding == (char)ENC_SCSU); } // These methods are useful for modules that come from a standard SWORD install (most do). // SWMgr will call setConfig. The user may use getConfig and getConfigEntry (if they @@ -179,6 +196,14 @@ public: virtual const ConfigEntMap &getConfig() const { return *config; } virtual const char *getConfigEntry(const char *key) const; + /** + * Returns bibliographic data for a module in the requested format + * + * @param bibFormat format of the bibliographic data + * @return bibliographic data in the requested format as a string (BibTeX by default) + */ + virtual SWBuf getBibliography(unsigned char bibFormat = BIB_BIBTEX) const; + /** * @return The size of the text entry for the module's current key position. */ @@ -201,15 +226,15 @@ public: /** * @deprecated Use setKey() instead. */ - char SetKey(const SWKey *ikey) { return setKey(ikey); } + SWDEPRECATED char SetKey(const SWKey *ikey) { return setKey(ikey); } /** * @deprecated Use setKey() instead. */ - char SetKey(const SWKey &ikey) { return setKey(ikey); } + SWDEPRECATED char SetKey(const SWKey &ikey) { return setKey(ikey); } /** * @deprecated Use setKey() instead. */ - char Key(const SWKey & ikey) { return setKey(ikey); } + SWDEPRECATED char Key(const SWKey & ikey) { return setKey(ikey); } /** Gets the current module key * @return the current key of this module @@ -218,7 +243,7 @@ public: /** * @deprecated Use getKey() instead. */ - SWKey &Key() const { return *getKey(); } + SWDEPRECATED SWKey &Key() const { return *getKey(); } /** * Sets/gets module KeyText @@ -226,10 +251,7 @@ public: * @param ikeytext Value which to set keytext; [0]-only get * @return pointer to keytext */ - virtual const char *KeyText(const char *ikeytext = 0) { - if (ikeytext) setKey(ikeytext); - return *getKey(); - } + SWDEPRECATED const char *KeyText(const char *ikeytext = 0) { if (ikeytext) setKey(ikeytext); return *getKey(); } /** * gets the key text for the module. @@ -241,14 +263,19 @@ public: } - virtual long Index() const { return entryIndex; } - virtual long Index(long iindex) { entryIndex = iindex; return entryIndex; } + virtual long getIndex() const { return entryIndex; } + virtual void setIndex(long iindex) { entryIndex = iindex; } + // deprecated, use getIndex() + SWDEPRECATED long Index() const { return getIndex(); } + // deprecated, use setIndex(...) + SWDEPRECATED long Index(long iindex) { setIndex(iindex); return getIndex(); } /** Calls this module's display object and passes itself * * @return error status */ - virtual char Display(); + virtual char display(); + SWDEPRECATED char Display() { return display(); } /** Gets display driver * @@ -265,78 +292,82 @@ public: /** * @deprecated Use get/setDisplay() instead. */ - SWDisplay *Disp(SWDisplay * idisp = 0) { - if (idisp) - setDisplay(idisp); - return getDisplay(); - } + SWDEPRECATED SWDisplay *Disp(SWDisplay * idisp = 0) { if (idisp) setDisplay(idisp); return getDisplay(); } /** Gets module name * * @return pointer to modname */ - virtual char *Name() const; + const char *getName() const; + SWDEPRECATED const char *Name() const { return getName(); } /** Sets module name * * @param imodname Value which to set modname; [0]-only get * @return pointer to modname */ - virtual char *Name(const char *imodname); + SWDEPRECATED const char *Name(const char *imodname) { stdstr(&modname, imodname); return getName(); } /** Gets module description * * @return pointer to moddesc */ - virtual char *Description() const; + const char *getDescription() const; + SWDEPRECATED const char *Description() const { return getDescription(); } /** Sets module description * * @param imoddesc Value which to set moddesc; [0]-only get * @return pointer to moddesc */ - virtual char *Description(const char *imoddesc); + SWDEPRECATED const char *Description(const char *imoddesc) { stdstr(&moddesc, imoddesc); return getDescription(); } /** Gets module type * * @return pointer to modtype */ - virtual char *Type() const; + const char *getType() const; + SWDEPRECATED const char *Type() const { return getType(); } /** Sets module type * * @param imodtype Value which to set modtype; [0]-only get * @return pointer to modtype */ - virtual char *Type(const char *imodtype); + SWDEPRECATED const char *Type(const char *imodtype) { setType(imodtype); return getType(); } + void setType(const char *imodtype) { stdstr(&modtype, imodtype); } /** Sets/gets module direction * * @param newdir Value which to set direction; [-1]-only get * @return new direction */ - virtual char Direction(signed char newdir = -1); + virtual char getDirection() const; + SWDEPRECATED char Direction(signed char newdir = -1) { char retVal = getDirection(); if (newdir != -1) return direction = newdir; return retVal; } /** Sets/gets module encoding * * @param enc Value which to set encoding; [-1]-only get * @return Encoding */ - virtual char Encoding(signed char enc = -1); + char getEncoding() const { return encoding; } + SWDEPRECATED char Encoding(signed char enc = -1) { char retVal = getEncoding(); if (enc != -1) encoding = enc; return retVal; } /** Sets/gets module markup * - * @param markup Vvalue which to set markup; [-1]-only get + * @param markup Value which to set markup; [-1]-only get * @return Markup */ - virtual char Markup(signed char markup = -1); + char getMarkup() const { return markup; } + SWDEPRECATED char Markup(signed char imarkup = -1) { char retVal = getMarkup(); if (imarkup != -1) markup = imarkup; return retVal; } /** Sets/gets module language * * @param imodlang Value which to set modlang; [0]-only get * @return pointer to modlang */ - virtual char *Lang(const char *imodlang = 0); + const char *getLanguage() const { return modlang; } + SWDEPRECATED const char *Lang(char *imodlang = 0) { if (imodlang != 0) stdstr(&modlang, imodlang); return getLanguage(); } // search interface ------------------------------------------------- @@ -366,36 +397,32 @@ public: void *percentUserData = 0); // for backward compat-- deprecated - virtual ListKey &Search(const char *istr, int searchType = 0, int flags = 0, - SWKey * scope = 0, - bool * justCheckIfSupported = 0, - void (*percent) (char, void *) = &nullPercent, - void *percentUserData = 0) { - return search(istr, searchType, flags, scope, justCheckIfSupported, percent, percentUserData); - } + SWDEPRECATED ListKey &Search(const char *istr, int searchType = 0, int flags = 0, SWKey * scope = 0, bool * justCheckIfSupported = 0, void (*percent) (char, void *) = &nullPercent, void *percentUserData = 0) { return search(istr, searchType, flags, scope, justCheckIfSupported, percent, percentUserData); } /** Allocates a key of specific type for module - * The different reimplementatiosn of SWModule (e.g. SWText) support SWKey implementations, which support special. - * This functions returns a SWKey object which works with the current implementation of SWModule. For example for the SWText class it returns a VerseKey object. + * The different reimplementations of SWModule (e.g. SWText) support SWKey implementations, + * which support special. This functions returns a SWKey object which works with the current + * implementation of SWModule. For example for the SWText class it returns a VerseKey object. * @see VerseKey, ListKey, SWText, SWLD, SWCom - * @return pointer to allocated key + * @return pointer to allocated key. Caller is responsible for deleting the object */ - virtual SWKey *CreateKey() const; + virtual SWKey *createKey() const; + SWDEPRECATED SWKey *CreateKey() const { return createKey(); } /** This function is reimplemented by the different kinds * of module objects * @return the raw module text of the current entry */ - virtual SWBuf &getRawEntryBuf() = 0; + virtual SWBuf &getRawEntryBuf() const = 0; - virtual const char *getRawEntry() { return getRawEntryBuf().c_str(); } + const char *getRawEntry() const { return getRawEntryBuf().c_str(); } // write interface ---------------------------- /** Is the module writable? :) * @return yes or no */ - virtual bool isWritable() { return false; } + virtual bool isWritable() const { return false; } /** Creates a new, empty module * @param path path where to create the new module @@ -438,14 +465,14 @@ public: * @param buf the buffer to filter * @param key key location from where this buffer was extracted */ - virtual void filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey *key); + virtual void filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey *key) const; /** FilterBuffer a text buffer * @param filters the FilterList of filters to iterate * @param buf the buffer to filter * @param key key location from where this buffer was extracted */ - virtual void filterBuffer(FilterList *filters, SWBuf &buf, const SWKey *key); + virtual void filterBuffer(FilterList *filters, SWBuf &buf, const SWKey *key) const; /** Adds a RenderFilter to this module's renderFilters queue. * Render Filters are called when the module is asked to produce @@ -453,10 +480,11 @@ public: * @param newfilter the filter to add * @return *this */ - virtual SWModule &AddRenderFilter(SWFilter *newfilter) { - renderFilters->push_back(newfilter); + virtual SWModule &addRenderFilter(SWFilter *newFilter) { + renderFilters->push_back(newFilter); return *this; } + SWDEPRECATED SWModule &AddRenderFilter(SWFilter *newFilter) { return addRenderFilter(newFilter); } /** Retrieves a container of render filters associated with this * module. @@ -470,30 +498,32 @@ public: * @param oldfilter the filter to remove * @return *this */ - virtual SWModule &RemoveRenderFilter(SWFilter *oldfilter) { - renderFilters->remove(oldfilter); + virtual SWModule &removeRenderFilter(SWFilter *oldFilter) { + renderFilters->remove(oldFilter); return *this; } + SWDEPRECATED SWModule &RemoveRenderFilter(SWFilter *oldFilter) { return removeRenderFilter(oldFilter); } /** Replaces a RenderFilter in this module's renderfilters queue * @param oldfilter the filter to remove * @param newfilter the filter to add in its place * @return *this */ - virtual SWModule &ReplaceRenderFilter(SWFilter *oldfilter, SWFilter *newfilter) { + virtual SWModule &replaceRenderFilter(SWFilter *oldFilter, SWFilter *newFilter) { FilterList::iterator iter; for (iter = renderFilters->begin(); iter != renderFilters->end(); iter++) { - if (*iter == oldfilter) - *iter = newfilter; + if (*iter == oldFilter) + *iter = newFilter; } return *this; } + SWDEPRECATED SWModule &ReplaceRenderFilter(SWFilter *oldFilter, SWFilter *newFilter) { return replaceRenderFilter(oldFilter, newFilter); } /** RenderFilter run a buf through this module's Render Filters * @param buf the buffer to filter * @param key key location from where this buffer was extracted */ - virtual void renderFilter(SWBuf &buf, const SWKey *key) { + virtual void renderFilter(SWBuf &buf, const SWKey *key) const { filterBuffer(renderFilters, buf, key); } @@ -504,39 +534,42 @@ public: * @param newfilter the filter to add * @return *this */ - virtual SWModule &AddEncodingFilter(SWFilter *newfilter) { - encodingFilters->push_back(newfilter); + virtual SWModule &addEncodingFilter(SWFilter *newFilter) { + encodingFilters->push_back(newFilter); return *this; } + SWDEPRECATED SWModule &AddEncodingFilter(SWFilter *newFilter) { return addEncodingFilter(newFilter); } /** Removes an EncodingFilter from this module's encodingFilters queue * @param oldfilter the filter to remove * @return *this */ - virtual SWModule &RemoveEncodingFilter(SWFilter *oldfilter) { - encodingFilters->remove(oldfilter); + virtual SWModule &removeEncodingFilter(SWFilter *oldFilter) { + encodingFilters->remove(oldFilter); return *this; } + SWDEPRECATED SWModule &RemoveEncodingFilter(SWFilter *oldFilter) { return removeEncodingFilter(oldFilter); } /** Replaces an EncodingFilter in this module's encodingfilters queue * @param oldfilter the filter to remove * @param newfilter the filter to add in its place * @return *this */ - virtual SWModule &ReplaceEncodingFilter(SWFilter *oldfilter, SWFilter *newfilter) { + virtual SWModule &replaceEncodingFilter(SWFilter *oldFilter, SWFilter *newFilter) { FilterList::iterator iter; for (iter = encodingFilters->begin(); iter != encodingFilters->end(); iter++) { - if (*iter == oldfilter) - *iter = newfilter; + if (*iter == oldFilter) + *iter = newFilter; } return *this; } + SWDEPRECATED SWModule &ReplaceEncodingFilter(SWFilter *oldFilter, SWFilter *newFilter) { return replaceEncodingFilter(oldFilter, newFilter); } /** encodingFilter run a buf through this module's Encoding Filters * @param buf the buffer to filter * @param key key location from where this buffer was extracted */ - virtual void encodingFilter(SWBuf &buf, const SWKey *key) { + virtual void encodingFilter(SWBuf &buf, const SWKey *key) const { filterBuffer(encodingFilters, buf, key); } @@ -546,25 +579,27 @@ public: * @param newfilter the filter to add * @return *this */ - virtual SWModule &AddStripFilter(SWFilter *newfilter) { - stripFilters->push_back(newfilter); + virtual SWModule &addStripFilter(SWFilter *newFilter) { + stripFilters->push_back(newFilter); return *this; } + SWDEPRECATED SWModule &AddStripFilter(SWFilter *newFilter) { return addStripFilter(newFilter); } /** Adds a RawFilter to this module's rawFilters queue - * @param newfilter the filter to add + * @param newFilter the filter to add * @return *this */ - virtual SWModule &AddRawFilter(SWFilter *newfilter) { + virtual SWModule &addRawFilter(SWFilter *newfilter) { rawFilters->push_back(newfilter); return *this; } + SWDEPRECATED SWModule &AddRawFilter(SWFilter *newFilter) { return addRawFilter(newFilter); } /** StripFilter run a buf through this module's Strip Filters * @param buf the buffer to filter * @param key key location from where this buffer was extracted */ - virtual void stripFilter(SWBuf &buf, const SWKey *key) { + virtual void stripFilter(SWBuf &buf, const SWKey *key) const { filterBuffer(stripFilters, buf, key); } @@ -573,7 +608,7 @@ public: * @param buf the buffer to filter * @param key key location from where this buffer was extracted */ - virtual void rawFilter(SWBuf &buf, const SWKey *key) { + virtual void rawFilter(SWBuf &buf, const SWKey *key) const { filterBuffer(rawFilters, buf, key); } @@ -584,16 +619,17 @@ public: * @param newfilter the filter to add * @return *this */ - virtual SWModule &AddOptionFilter(SWOptionFilter *newfilter) { - optionFilters->push_back(newfilter); + virtual SWModule &addOptionFilter(SWOptionFilter *newFilter) { + optionFilters->push_back(newFilter); return *this; } + SWDEPRECATED SWModule &AddOptionFilter(SWOptionFilter *newFilter) { return addOptionFilter(newFilter); } /** OptionFilter a text buffer * @param buf the buffer to filter * @param key key location from where this buffer was extracted */ - virtual void optionFilter(SWBuf &buf, const SWKey *key) { + virtual void optionFilter(SWBuf &buf, const SWKey *key) const { filterBuffer(optionFilters, buf, key); } @@ -605,7 +641,8 @@ public: * @param len max len to process * @return result buffer */ - virtual const char *StripText(const char *buf = 0, int len = -1); + virtual const char *stripText(const char *buf = 0, int len = -1); + SWDEPRECATED const char *StripText(const char *buf = 0, int len = -1) { return stripText(buf, len); } /** Produces renderable text of the current module entry or supplied text * @@ -615,19 +652,26 @@ public: * @param render for internal use * @return result buffer */ - virtual const char *RenderText(const char *buf = 0, int len = -1, bool render = true); + SWBuf renderText(const char *buf = 0, int len = -1, bool render = true); + SWDEPRECATED const char *RenderText(const char *buf = 0, int len = -1, bool render = true) { return renderText(buf, len, render); } + + /** Produces any header data which might be useful which is associated with the + * processing done with this filter. A typical example is a suggested + * CSS style block for classed containers. + */ + virtual const char *getRenderHeader() const; /** Produces plain text, without markup, of the module entry at the supplied key * @param tmpKey desired module entry * @return result buffer */ - virtual const char *StripText(const SWKey *tmpKey); + virtual const char *stripText(const SWKey *tmpKey); /** Produces renderable text of the module entry at the supplied key * @param tmpKey key to use to grab text * @return this module's text at specified key location massaged by Render filters */ - virtual const char *RenderText(const SWKey *tmpKey); + SWBuf renderText(const SWKey *tmpKey); /** Whether or not to only hit one entry when iterating encounters * consecutive links when iterating @@ -638,10 +682,11 @@ public: /** Whether or not to only hit one entry when iterating encounters * consecutive links when iterating */ - virtual bool getSkipConsecutiveLinks() { return skipConsecutiveLinks; } + virtual bool isSkipConsecutiveLinks() { return skipConsecutiveLinks; } + SWDEPRECATED bool getSkipConsecutiveLinks() { return isSkipConsecutiveLinks(); } - virtual bool isLinked(const SWKey *k1, const SWKey *k2) const { return false; } - virtual bool hasEntry(const SWKey *k) const { return false; } + virtual bool isLinked(const SWKey *, const SWKey *) const { return false; } + virtual bool hasEntry(const SWKey *) const { return false; } /** Entry Attributes are special data pertaining to the current entry. * To see what Entry Attributes exists for a specific entry of a module, @@ -656,7 +701,8 @@ public: * engine processing turns them off (like searching) temporarily for * optimization. */ - virtual void processEntryAttributes(bool val) const { procEntAttr = val; } + virtual void setProcessEntryAttributes(bool val) const { procEntAttr = val; } + SWDEPRECATED void processEntryAttributes(bool val) const { setProcessEntryAttributes(val); } /** Whether or not we're processing Entry Attributes */ diff --git a/include/swobject.h b/include/swobject.h index 6f60a57..8866c37 100644 --- a/include/swobject.h +++ b/include/swobject.h @@ -1,24 +1,25 @@ /****************************************************************************** -* swobject.h - definition for SWObject used as lowest base class for many -* SWORD objects -* -* $Id: swobject.h 1790 2005-05-03 03:49:04Z scribe $ -* -* Copyright 2005 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * swobject.h - definition for SWObject used as lowest base class for + * many SWORD objects + * + * $Id: swobject.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #ifndef SWOBJECT_H #define SWOBJECT_H @@ -48,7 +49,7 @@ public: * It is used because dynamic_cast is not available on all plattforms supported * by Sword. Use SWDYNAMIC_CAST(classname, object) instead of dynamic_cast(object). */ -class SWObject { +class SWDLLEXPORT SWObject { protected: SWClass * myclass; diff --git a/include/swoptfilter.h b/include/swoptfilter.h index f1b00a6..0f2aed5 100644 --- a/include/swoptfilter.h +++ b/include/swoptfilter.h @@ -1,6 +1,8 @@ /*************************************************************************** * - * $Id: swoptfilter.h 1864 2005-11-20 06:06:40Z scribe $ + * swoptfilter.h - Implenetation of SWOptionFilter + * + * $Id: swoptfilter.h 2980 2013-09-14 21:51:47Z scribe $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -35,13 +37,14 @@ typedef std::list < SWBuf > StringList; /** Base class for all option filters. */ -class SWDLLEXPORT SWOptionFilter : public SWFilter { +class SWDLLEXPORT SWOptionFilter : public virtual SWFilter { protected: SWBuf optionValue; const char *optName; const char *optTip; const StringList *optValues; bool option; + bool isBooleanVal; public: SWOptionFilter(); @@ -49,6 +52,12 @@ public: virtual ~SWOptionFilter(); + /** many options are simple Off/On boolean type, and frontends may wish to show these + * with checkmarks or the like to the end user. This is a convenience method + * to allow a frontend to check if this filter has only Off/On values + */ + bool isBoolean() { return isBooleanVal; } + /** gets the name of the option of this filter * @return option name */ diff --git a/include/swsearchable.h b/include/swsearchable.h index 928352e..16102a8 100644 --- a/include/swsearchable.h +++ b/include/swsearchable.h @@ -1,10 +1,11 @@ /****************************************************************************** - * swsearchable.h - definition of class SWSearchable used to provide an - * interface for objects that be searched. * - * $Id: swsearchable.h 2054 2007-05-25 17:31:39Z scribe $ + * swsearchable.h - definition of class SWSearchable used to provide an + * interface for objects that be searched. * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swsearchable.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/swtext.h b/include/swtext.h index 37a2f16..11520a4 100644 --- a/include/swtext.h +++ b/include/swtext.h @@ -1,10 +1,11 @@ /****************************************************************************** - * swtext.h - code for base class 'SWText'. SWText is the basis for all - * types of text modules * - * $Id: swtext.h 2324 2009-04-20 18:40:15Z scribe $ + * swtext.h - code for base class 'SWText'. SWText is the basis for all + * types of text modules * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swtext.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -57,10 +58,10 @@ public: virtual ~SWText(); /** Create the correct key (VerseKey) for use with SWText */ - virtual SWKey *CreateKey() const; + virtual SWKey *createKey() const; - virtual long Index() const; - virtual long Index(long iindex); + virtual long getIndex() const; + virtual void setIndex(long iindex); // OPERATORS ----------------------------------------------------------------- diff --git a/include/swunicod.h b/include/swunicod.h deleted file mode 100644 index 3bf4e95..0000000 --- a/include/swunicod.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - - -#ifndef SWUNICOD_H -#define SWUNICOD_H - -#include -SWORD_NAMESPACE_START - -/** Converts a 32-bit unsigned integer UTF-32 value into a UTF-8 encoded 1-6 byte array - * @param utf32 the UTF-32 Unicode code point value - * @param utf8 pointer to an array of 6 unsigned chars to contain the UTF-8 value - * @return utf8 - */ -unsigned char* UTF32to8 (unsigned long utf32, unsigned char * utf8); - - -/** Converts a UTF-8 encoded 1-6 byte array into a 32-bit unsigned integer UTF-32 value - * @param utf8 pointer to an array of 6 unsigned chars containing the UTF-8 value, starting in the utf8[0] - * @param utf32 the UTF-32 Unicode code point value - * @return utf32 - */ -unsigned long UTF8to32 (unsigned char * utf8, unsigned long utf32); - -SWORD_NAMESPACE_END - -#endif diff --git a/include/swversion.h b/include/swversion.h index d3c0ab1..2235a66 100644 --- a/include/swversion.h +++ b/include/swversion.h @@ -1,9 +1,11 @@ /****************************************************************************** - * swversion.h - definition of class SWVersion used to compare version info * - * $Id: swversion.h 1763 2005-04-03 23:57:03Z scribe $ + * swversion.h - definition of class SWVersion used to compare version + * info * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swversion.h 3007 2014-01-14 04:47:16Z greg.hellings $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -22,6 +24,13 @@ #ifndef SWVERSION_H #define SWVERSION_H +#define SWORD_VERSION_NUM 107002000 +#define SWORD_VERSION_STR "1.7.2" +#define SWORD_VERSION_MAJOR 1 +#define SWORD_VERSION_MINOR 7 +#define SWORD_VERSION_MICRO 2 +#define SWORD_VERSION_NANO 0 + #include SWORD_NAMESPACE_START diff --git a/include/swversion.h.in b/include/swversion.h.in new file mode 100644 index 0000000..919380f --- /dev/null +++ b/include/swversion.h.in @@ -0,0 +1,74 @@ +/****************************************************************************** + * + * swversion.h - definition of class SWVersion used to compare version + * info + * + * $Id: swversion.h.in 2959 2013-08-13 03:55:38Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef SWVERSION_H +#define SWVERSION_H + +#define SWORD_VERSION_NUM @SWORD_VERSION_NUM@ +#define SWORD_VERSION_STR "@SWORD_VERSION_STR@" +#define SWORD_VERSION_MAJOR @SWORD_VERSION_MAJOR@ +#define SWORD_VERSION_MINOR @SWORD_VERSION_MINOR@ +#define SWORD_VERSION_MICRO @SWORD_VERSION_MICRO@ +#define SWORD_VERSION_NANO @SWORD_VERSION_NANO@ + +#include +SWORD_NAMESPACE_START + +/** A basic tool class to handle program version numbers. +*/ +class SWDLLEXPORT SWVersion { + public: + /** The different version subnumbers. + */ + int major, minor, minor2, minor3; + /**The constructor. + * @param version Version string to be parsed. + */ + SWVersion(const char *version = "0.0"); + /** Compare 2 Versions with each other. + * @param vi Version number to compare with. + * @return >0:this>vi; 0:this==vi; <0:this(const SWVersion &vi) const {return (compare(vi) > 0);} + bool operator<(const SWVersion &vi) const {return (compare(vi) < 0);} + bool operator>=(const SWVersion &vi) const {return (compare(vi) >= 0);} + bool operator<=(const SWVersion &vi) const {return (compare(vi) <= 0);} + bool operator==(const SWVersion &vi) const {return (compare(vi) == 0);} + + /** Current sword library version. + * Use this to check (e.g. at compile time) if the + * version of the sword lib is recent enough for your program. + */ + static SWVersion currentVersion; +}; + +SWORD_NAMESPACE_END +#endif + diff --git a/include/sysdata.h b/include/sysdata.h index 0a6b899..b95b836 100644 --- a/include/sysdata.h +++ b/include/sysdata.h @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * sysdata.h - + * + * $Id: sysdata.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #ifndef SIZEDTYPES_H #define SIZEDTYPES_H /* @@ -18,9 +40,15 @@ typedef unsigned short __u16; typedef signed int __s32; typedef unsigned int __u32; -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -//typedef __signed__ long long __s64; -//typedef unsigned long long __u64; +#ifdef __GNUC__ +__extension__ typedef __signed__ long long __s64; +__extension__ typedef unsigned long long __u64; +#elif defined(__BORLANDC__) +typedef signed __int64 __s64; +typedef unsigned __int64 __u64; +#else +typedef signed long long __s64; +typedef unsigned long long __u64; #endif #undef __swswap16 diff --git a/include/teihtmlhref.h b/include/teihtmlhref.h index 302c38e..99b2755 100644 --- a/include/teihtmlhref.h +++ b/include/teihtmlhref.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: + * teihtmlhref.h - Implementation of TEIHTMLHREF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: teihtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -29,6 +31,7 @@ SWORD_NAMESPACE_START */ class SWDLLEXPORT TEIHTMLHREF : public SWBasicFilter { private: + bool renderNoteNumbers; protected: class MyUserData : public BasicFilterUserData { @@ -45,6 +48,7 @@ protected: virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); public: TEIHTMLHREF(); + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } }; SWORD_NAMESPACE_END diff --git a/include/teiplain.h b/include/teiplain.h index b0fe06d..c6376e5 100644 --- a/include/teiplain.h +++ b/include/teiplain.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: + * teiplain.h - Implementation of TEIPlain * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: teiplain.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/teirtf.h b/include/teirtf.h index d8a7b7f..e9793d3 100644 --- a/include/teirtf.h +++ b/include/teirtf.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: + * teirtf.h - Implementation of TEIRTF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: teirtf.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/teixhtml.h b/include/teixhtml.h new file mode 100644 index 0000000..c948608 --- /dev/null +++ b/include/teixhtml.h @@ -0,0 +1,55 @@ +/****************************************************************************** + * + * teixhtml.h - Implementation of TEIXHTML + * + * $Id: teixhtml.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef TEIXHTML_H +#define TEIXHTML_H + +#include + +SWORD_NAMESPACE_START + +/** this filter converts TEI text to XHTML text + */ +class SWDLLEXPORT TEIXHTML : public SWBasicFilter { +private: + bool renderNoteNumbers; + +protected: + class MyUserData : public BasicFilterUserData { + public: + bool BiblicalText; + SWBuf lastHi; + + SWBuf version; + MyUserData(const SWModule *module, const SWKey *key); + }; + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); + } + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); +public: + TEIXHTML(); + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/thmlfootnotes.h b/include/thmlfootnotes.h index 6106b13..133ff2e 100644 --- a/include/thmlfootnotes.h +++ b/include/thmlfootnotes.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlfootnotes.h 1688 2005-01-01 04:42:26Z scribe $ + * thmlfootnotes.h - Implementation of ThMLFootnotes * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlfootnotes.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlgbf.h b/include/thmlgbf.h index 0975a24..03cd88d 100644 --- a/include/thmlgbf.h +++ b/include/thmlgbf.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlgbf.h 1688 2005-01-01 04:42:26Z scribe $ + * thmlgbf.h - Implementation of ThMLGBF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlgbf.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlheadings.h b/include/thmlheadings.h index 18aadc5..2cbe4cb 100644 --- a/include/thmlheadings.h +++ b/include/thmlheadings.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlheadings.h 1688 2005-01-01 04:42:26Z scribe $ + * thmlheadings.h - Implementation of ThMLHeadings * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlheadings.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlhtml.h b/include/thmlhtml.h index 26871a6..2f32cc4 100644 --- a/include/thmlhtml.h +++ b/include/thmlhtml.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlhtml.h 1688 2005-01-01 04:42:26Z scribe $ + * thmlhtml.h - Implementation of ThMLHTML * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlhtml.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlhtmlhref.h b/include/thmlhtmlhref.h index 2f91fcd..8ce802e 100644 --- a/include/thmlhtmlhref.h +++ b/include/thmlhtmlhref.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlhtmlhref.h 2157 2008-05-13 23:37:56Z scribe $ + * thmlhtmlhref.h - Implementation of ThMLHTMLHREF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlhtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,6 +32,7 @@ SWORD_NAMESPACE_START */ class SWDLLEXPORT ThMLHTMLHREF : public SWBasicFilter { SWBuf imgPrefix; + bool renderNoteNumbers; protected: class MyUserData : public BasicFilterUserData { public: @@ -48,6 +51,7 @@ public: ThMLHTMLHREF(); virtual const char *getImagePrefix() { return imgPrefix.c_str(); } virtual void setImagePrefix(const char *newImgPrefix) { imgPrefix = newImgPrefix; } + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } }; SWORD_NAMESPACE_END #endif /* _THMLHTMLHREF_H */ diff --git a/include/thmllemma.h b/include/thmllemma.h index 40a056a..54efbc6 100644 --- a/include/thmllemma.h +++ b/include/thmllemma.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmllemma.h 1688 2005-01-01 04:42:26Z scribe $ + * thmllemma.h - Implementation of ThMLLemma * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmllemma.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlmorph.h b/include/thmlmorph.h index 66e55bd..bdb1f54 100644 --- a/include/thmlmorph.h +++ b/include/thmlmorph.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlmorph.h 1688 2005-01-01 04:42:26Z scribe $ + * thmlmorph.h - Implementation of ThMLMorph * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlmorph.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlosis.h b/include/thmlosis.h index c3a2a13..23a7386 100644 --- a/include/thmlosis.h +++ b/include/thmlosis.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlosis.h 1804 2005-05-07 06:26:10Z scribe $ + * thmlosis.h - Implementation of ThMLOSIS * - * Copyright 2003 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlosis.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlplain.h b/include/thmlplain.h index 499dbf6..df0d4bc 100644 --- a/include/thmlplain.h +++ b/include/thmlplain.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlplain.h 2068 2007-08-31 06:40:23Z scribe $ + * thmlplain.h - Implementation of ThMLPlain * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlplain.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlrtf.h b/include/thmlrtf.h index dfeecb2..9b7d3f2 100644 --- a/include/thmlrtf.h +++ b/include/thmlrtf.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlrtf.h 1688 2005-01-01 04:42:26Z scribe $ + * thmlrtf.h - Implementation of ThMLRTF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlrtf.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlscripref.h b/include/thmlscripref.h index 58b4820..9c5ecea 100644 --- a/include/thmlscripref.h +++ b/include/thmlscripref.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlscripref.h 1688 2005-01-01 04:42:26Z scribe $ + * thmlscripref.h - Implementation of ThMLScripRef * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlscripref.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlstrongs.h b/include/thmlstrongs.h index dfb97b3..8ea6963 100644 --- a/include/thmlstrongs.h +++ b/include/thmlstrongs.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlstrongs.h 1688 2005-01-01 04:42:26Z scribe $ + * thmlstrongs.h - Implementation of ThMLStrongs * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlstrongs.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlvariants.h b/include/thmlvariants.h index 9adda8c..4251c62 100644 --- a/include/thmlvariants.h +++ b/include/thmlvariants.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlvariants.h 1864 2005-11-20 06:06:40Z scribe $ + * thmlvariants.h - Implementation of ThMLVariants * - * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlvariants.h 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,25 +30,10 @@ SWORD_NAMESPACE_START /** This Filter shows/hides textual variants */ class SWDLLEXPORT ThMLVariants : public SWOptionFilter { - char option; - - static const char primary[]; - static const char secondary[]; - static const char all[]; - - static const char optName[]; - static const char optTip[]; - StringList options; - public: ThMLVariants(); virtual ~ThMLVariants(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual StringList getOptionValues() { return options; } }; SWORD_NAMESPACE_END diff --git a/include/thmlwebif.h b/include/thmlwebif.h index 25201d7..5efeddd 100644 --- a/include/thmlwebif.h +++ b/include/thmlwebif.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: thmlwebif.h 1688 2005-01-01 04:42:26Z scribe $ + * thmlwebif.h - Implementation of ThMLWEBIF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlwebif.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -21,13 +23,13 @@ #ifndef _ThMLWEBIF_H #define _ThMLWEBIF_H -#include +#include SWORD_NAMESPACE_START /** this filter converts ThML text to HTML text with hrefs */ -class SWDLLEXPORT ThMLWEBIF : public ThMLHTMLHREF { +class SWDLLEXPORT ThMLWEBIF : public ThMLXHTML { const SWBuf baseURL; const SWBuf passageStudyURL; @@ -36,5 +38,7 @@ protected: public: ThMLWEBIF(); }; + SWORD_NAMESPACE_END -#endif /* _ThMLWEBIF_H */ + +#endif diff --git a/include/thmlwordjs.h b/include/thmlwordjs.h index 9d7b83d..ae80292 100644 --- a/include/thmlwordjs.h +++ b/include/thmlwordjs.h @@ -1,8 +1,10 @@ /*************************************************************************** * - * $Id: thmlstrongs.h 1688 2005-01-01 04:42:26Z scribe $ + * thmlwordjs.h - Implementation of ThMLWordJS * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlwordjs.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/thmlxhtml.h b/include/thmlxhtml.h new file mode 100644 index 0000000..b0b5ef3 --- /dev/null +++ b/include/thmlxhtml.h @@ -0,0 +1,60 @@ +/****************************************************************************** + * + * thmlxhtml.h - Implementation of ThMLXHTML + * + * $Id: thmlxhtml.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef _THMLXHTML_H +#define _THMLXHTML_H + +#include +#include + +SWORD_NAMESPACE_START + +/** this filter converts ThML text to classed XHTML + */ +class SWDLLEXPORT ThMLXHTML : public SWBasicFilter { + SWBuf imgPrefix; + bool renderNoteNumbers; +protected: + class MyUserData : public BasicFilterUserData { + public: + MyUserData(const SWModule *module, const SWKey *key);//: BasicFilterUserData(module, key) {} + bool inscriptRef; + bool SecHead; + bool BiblicalText; + SWBuf version; + XMLTag startTag; + }; + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); + } + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); +public: + ThMLXHTML(); + virtual const char *getImagePrefix() { return imgPrefix.c_str(); } + virtual void setImagePrefix(const char *newImgPrefix) { imgPrefix = newImgPrefix; } + virtual const char *getHeader() const; + void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; } +}; + +SWORD_NAMESPACE_END + +#endif diff --git a/include/treekey.h b/include/treekey.h index 749460b..02b944e 100644 --- a/include/treekey.h +++ b/include/treekey.h @@ -1,9 +1,10 @@ /****************************************************************************** - * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: treekey.h 2280 2009-03-07 15:34:36Z scribe $ + * treekey.h - code for class 'TreeKey' * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: treekey.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -123,8 +124,8 @@ public: virtual void decrement(int steps = 1) = 0; virtual void increment(int steps = 1) = 0; virtual bool isTraversable() const { return true; } - virtual long Index() const { return getOffset(); } - virtual long Index(long iindex) { setOffset(iindex); return getOffset(); } + virtual long getIndex() const { return getOffset(); } + virtual void setIndex(long iindex) { setOffset(iindex); } /** Set the key to this path. If the path doesn't exist, then * nodes are created as necessary diff --git a/include/treekeyidx.h b/include/treekeyidx.h index e6515e5..e818bfc 100644 --- a/include/treekeyidx.h +++ b/include/treekeyidx.h @@ -1,9 +1,10 @@ /****************************************************************************** - * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: treekeyidx.h 2280 2009-03-07 15:34:36Z scribe $ + * treekeyidx.h - code for class 'TreeKeyIdx' * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: treekeyidx.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/unicodertf.h b/include/unicodertf.h index ace8b05..a07757c 100644 --- a/include/unicodertf.h +++ b/include/unicodertf.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: unicodertf.h 1688 2005-01-01 04:42:26Z scribe $ + * unicodertf.h - Implementation of UnicodeRTF * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: unicodertf.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/url.h b/include/url.h index c57ace0..f0850a3 100644 --- a/include/url.h +++ b/include/url.h @@ -1,23 +1,24 @@ /****************************************************************************** -* url.h - code for an URL parser utility class -* -* $Id: url.h 1763 2005-04-03 23:57:03Z scribe $ -* -* Copyright 2003 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * url.h - code for an URL parser utility class + * + * $Id: url.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #ifndef URL_H #define URL_H diff --git a/include/utf16utf8.h b/include/utf16utf8.h index ed17116..c22cd40 100644 --- a/include/utf16utf8.h +++ b/include/utf16utf8.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf16utf8.h 1688 2005-01-01 04:42:26Z scribe $ + * utf16utf8.h - Implementation of UTF16UTF8 * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf16utf8.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8arabicpoints.h b/include/utf8arabicpoints.h index 34707a5..aca0c6c 100644 --- a/include/utf8arabicpoints.h +++ b/include/utf8arabicpoints.h @@ -1,10 +1,11 @@ /****************************************************************************** * - * UTF8ArabicPoints - SWFilter descendant to remove UTF-8 Arabic vowel points + * utf8arabicpoints.h - SWFilter descendant to remove UTF-8 Arabic + * vowel points * - * $Id: utf8arabicpoints.h 1688 2008-11-30 04:42:26Z refdoc $ + * $Id: utf8arabicpoints.h 2865 2013-07-08 13:44:37Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8arshaping.h b/include/utf8arshaping.h index 047b02f..6534050 100644 --- a/include/utf8arshaping.h +++ b/include/utf8arshaping.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8arshaping.h 1688 2005-01-01 04:42:26Z scribe $ + * utf8arshaping.h - Implementation of UTF8arShaping * - * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8arshaping.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8bidireorder.h b/include/utf8bidireorder.h index a673920..9ca90fd 100644 --- a/include/utf8bidireorder.h +++ b/include/utf8bidireorder.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8bidireorder.h 1688 2005-01-01 04:42:26Z scribe $ + * utf8bidireorder.h - Implementation of UTF8BiDiReorder * - * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8bidireorder.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8cantillation.h b/include/utf8cantillation.h index c268655..9b32489 100644 --- a/include/utf8cantillation.h +++ b/include/utf8cantillation.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8cantillation.h 1688 2005-01-01 04:42:26Z scribe $ + * utf8cantillation.h - Implementation of UTF8Cantillation * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8cantillation.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8greekaccents.h b/include/utf8greekaccents.h index 847fd5c..83ec957 100644 --- a/include/utf8greekaccents.h +++ b/include/utf8greekaccents.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8greekaccents.h 1688 2005-01-01 04:42:26Z scribe $ + * utf8greekaccents.h - Implementation of UTF8GreekAccents * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8greekaccents.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8hebrewpoints.h b/include/utf8hebrewpoints.h index d3cc70b..4b97ddb 100644 --- a/include/utf8hebrewpoints.h +++ b/include/utf8hebrewpoints.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8hebrewpoints.h 1688 2005-01-01 04:42:26Z scribe $ + * utf8hebrewpoints.h - Implementation of UTF8HebrewPoints * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8hebrewpoints.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8html.h b/include/utf8html.h index ee7d07e..83c152a 100644 --- a/include/utf8html.h +++ b/include/utf8html.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8html.h 1688 2005-01-01 04:42:26Z scribe $ + * utf8html.h - Implementation of UTF8HTML * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8html.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8latin1.h b/include/utf8latin1.h index 5b3c544..b3d9ac1 100644 --- a/include/utf8latin1.h +++ b/include/utf8latin1.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8latin1.h 1688 2005-01-01 04:42:26Z scribe $ + * utf8latin1.h - Implementation of UTF8Latin1 * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8latin1.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8nfc.h b/include/utf8nfc.h index b91fe37..c8798cc 100644 --- a/include/utf8nfc.h +++ b/include/utf8nfc.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8nfc.h 1688 2005-01-01 04:42:26Z scribe $ + * utf8nfc.h - Implementation of UTF8NFC * - * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8nfc.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8nfkd.h b/include/utf8nfkd.h index 70a33e5..347225e 100644 --- a/include/utf8nfkd.h +++ b/include/utf8nfkd.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8nfkd.h 1688 2005-01-01 04:42:26Z scribe $ + * utf8nfkd.h - Implementation of UTF8NFKD * - * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8nfkd.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utf8transliterator.h b/include/utf8transliterator.h index d3b23c7..130a519 100644 --- a/include/utf8transliterator.h +++ b/include/utf8transliterator.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8transliterator.h 2473 2009-10-26 06:06:09Z chrislit $ + * utf8transliterator.h - Implementation of UTF8Transliterator * - * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8transliterator.h 2906 2013-07-17 22:34:43Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -54,10 +56,6 @@ struct SWTransData { typedef std::map SWTransMap; typedef std::pair SWTransPair; -// Chris, please add more javadoc-style documentation in this header file -// so that the information will show up in the doxygen-generated -// api-docs. - /** This Filter uses ICU for transliteration */ class SWDLLEXPORT UTF8Transliterator : public SWOptionFilter { @@ -69,17 +67,20 @@ private: static const char optName[]; static const char optTip[]; + StringList options; + +#ifdef ICU_CUSTOM_RESOURCE_BUILDING static const char SW_RB_RULE_BASED_IDS[]; static const char SW_RB_RULE[]; static const char SW_RESDATA[]; - StringList options; static SWTransMap transMap; UErrorCode utf8status; void Load(UErrorCode &status); - void registerTrans(const UnicodeString& ID, const UnicodeString& resource, UTransDirection dir, UErrorCode &status); - bool addTrans(const char* newTrans, SWBuf* transList); + void registerTrans(const UnicodeString& ID, const UnicodeString& resource, UTransDirection dir, UErrorCode &status); bool checkTrans(const UnicodeString& ID, UErrorCode &status); +#endif + bool addTrans(const char* newTrans, SWBuf* transList); Transliterator *createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status); public: diff --git a/include/utf8utf16.h b/include/utf8utf16.h index 0c51bea..afa1c26 100644 --- a/include/utf8utf16.h +++ b/include/utf8utf16.h @@ -1,8 +1,10 @@ /****************************************************************************** * - * $Id: utf8utf16.h 1688 2005-01-01 04:42:26Z scribe $ + * utf8utf16.h - Implementation of UTF8UTF16 * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utf8utf16.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/utilstr.h b/include/utilstr.h index a93299f..573b4a1 100644 --- a/include/utilstr.h +++ b/include/utilstr.h @@ -1,9 +1,10 @@ /****************************************************************************** - * utilstr.h - prototypes for string utility functions * - * $Id: utilstr.h 2446 2009-08-24 00:43:27Z scribe $ + * utilstr.h - prototypes for string utility functions * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utilstr.h 2981 2013-09-15 00:05:26Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -57,6 +58,19 @@ extern const unsigned char SW_toupper_array[256]; __u32 getUniCharFromUTF8(const unsigned char **buf); +/****************************************************************************** + * getUTF8FromUniChar - retrieves us UTF8 string from a + * Unicode codepoint + * + * ENT: uchar - unicode codepoint value + * + * RET: buf - a UTF8 string which consists of the proper UTF8 sequence of + * bytes for the given Unicode codepoint + */ + +SWBuf getUTF8FromUniChar(__u32 uchar); + + /****************************************************************************** * assureValidUTF8 - iterates the supplied UTF-8 buffer and checks for validity * replacing invalid bytes if necessary and returning a @@ -70,6 +84,21 @@ __u32 getUniCharFromUTF8(const unsigned char **buf); */ SWBuf assureValidUTF8(const char *buf); +/**** + * This can be called to convert a UTF8 stream to an SWBuf which manages + * a wchar_t[] + * access buffer with (wchar_t *)SWBuf::getRawData(); + * + */ +SWBuf utf8ToWChar(const char *buf); + +/**** + * This can be called to convert a wchar_t[] to a UTF-8 SWBuf + * + */ +SWBuf wcharToUTF8(const wchar_t *buf); + + SWORD_NAMESPACE_END #endif diff --git a/include/utilxml.h b/include/utilxml.h index 5a9c994..d385628 100644 --- a/include/utilxml.h +++ b/include/utilxml.h @@ -1,9 +1,10 @@ /****************************************************************************** - * utilxml.h - definition of class that deal with xml constructs * - * $Id: utilxml.h 2378 2009-05-04 23:18:51Z scribe $ + * utilxml.h - definition of class that deal with xml constructs * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utilxml.h 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -46,7 +47,6 @@ private: void parse() const; const char *getPart(const char *buf, int partNum = 0, char partSplit = '|') const; - static const char *nullstr; public: XMLTag(const char *tagString = 0); @@ -54,7 +54,7 @@ public: ~XMLTag(); void setText(const char *tagString); - inline const char *getName() const { return (name)?name:nullstr; } + inline const char *getName() const { return (name) ? name : SWBuf::nullStr; } inline bool isEmpty() const { if (!parsed) diff --git a/include/versekey.h b/include/versekey.h index 6b6ecfe..acddc9d 100644 --- a/include/versekey.h +++ b/include/versekey.h @@ -1,9 +1,11 @@ /****************************************************************************** - * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: versekey.h 2508 2010-03-23 09:19:15Z scribe $ + * versekey.h - code for class 'VerseKey'- a standard Biblical verse + * key * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: versekey.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -26,7 +28,7 @@ #include #include #include -#include +#include #include @@ -55,19 +57,15 @@ class SWDLLEXPORT VerseKey : public SWKey { static int instance; ListKey internalListKey; - const VerseMgr::System *refSys; + const VersificationMgr::System *refSys; /** flag for auto normalization */ char autonorm; - /** flag for headings on/off - */ - char headings; - - /** initialize and allocate books array + /** flag for intros on/off */ - void initstatics(); + char intros; /** initializes this VerseKey() */ @@ -79,15 +77,7 @@ class SWDLLEXPORT VerseKey : public SWKey { // private with no bounds check void setFromOther(const VerseKey &vk); - /** Binary search to find the index closest, but less - * than the given value. - * - * @param array long * to array to search - * @param size number of elements in the array - * @param value value to find - * @return the index into the array that is less than but closest to value - */ - int findindex(long *array, int size, long value); + void checkBounds(); // internal upper/lower bounds optimizations mutable long lowerBound, upperBound; // if autonorms is on @@ -108,13 +98,13 @@ protected: signed char suffix; /************************************************************************ - * VerseKey::getBookAbbrev - Attempts to find a book no from a name or + * VerseKey::getBookFromAbbrev - Attempts to find a book no from a name or * abbreviation * * ENT: @param abbr - key for which to search; * RET: @return book number or < 0 = not valid */ - virtual int getBookAbbrev(const char *abbr) const; + virtual int getBookFromAbbrev(const char *abbr) const; /** Refresh keytext based on testament|book|chapter|verse * default auto normalization to true @@ -177,36 +167,38 @@ public: */ virtual ~VerseKey(); - /** sets the lower boundary for this VerseKey - * and returns the new boundary + /** sets the lower boundary for this VerseKey * - * @param ub the new upper boundary for this VerseKey - * @return the lower boundary the key was set to + * @param lb the new lower boundary for this VerseKey */ - VerseKey &LowerBound(const VerseKey &ub); + void setLowerBound(const VerseKey &lb); + SWDEPRECATED VerseKey &LowerBound(const VerseKey &lb) { setLowerBound(lb); return getLowerBound(); } - /** sets the upper boundary for this VerseKey - * and returns the new boundary - * @param ub the new upper boundary for this VerseKey + /** sets the upper boundary for this VerseKey + * @param ub the new upper boundary for this VerseKey * @return the upper boundary the key was set to */ - VerseKey &UpperBound(const VerseKey &ub); + void setUpperBound(const VerseKey &ub); + SWDEPRECATED VerseKey &UpperBound(const VerseKey &ub) { setUpperBound(ub); return getUpperBound(); } - /** gets the lower boundary of this VerseKey - * @return the lower boundary of this VerseKey + /** gets the lower boundary of this VerseKey + * @return the lower boundary of this VerseKey */ - VerseKey &LowerBound() const; + VerseKey &getLowerBound() const; + SWDEPRECATED VerseKey &LowerBound() const { return getLowerBound(); } - /** gets the upper boundary of this VerseKey - * @return the upper boundary of this VerseKey + /** gets the upper boundary of this VerseKey + * @return the upper boundary of this VerseKey */ - VerseKey &UpperBound() const; + VerseKey &getUpperBound() const; + SWDEPRECATED VerseKey &UpperBound() const { return getUpperBound(); } - /** clears the boundaries of this VerseKey + /** clears the boundaries of this VerseKey */ - void ClearBounds(); + void clearBounds(); + SWDEPRECATED void ClearBounds() { clearBounds(); } - /** Creates a new SWKey based on the current VerseKey + /** Creates a new SWKey based on the current VerseKey * see also the Copy Constructor */ virtual SWKey *clone() const; @@ -260,30 +252,44 @@ public: * * @return value of testament */ - virtual char Testament() const { return getTestament(); } // deprecated virtual char getTestament() const; + /** + * @deprecated Use getTestament() instead. + */ + SWDEPRECATED char Testament() const { return getTestament(); } // deprecated + virtual int getTestamentMax() const { return 2; } /** Gets book * * @return value of book */ - virtual char Book() const { return getBook(); } // deprecated virtual char getBook() const; + /** + * @deprecated Use getBook() instead. + */ + SWDEPRECATED char Book() const { return getBook(); } // deprecated + virtual int getBookMax() const { return BMAX[testament-1]; } /** Gets chapter * * @return value of chapter */ - virtual int Chapter() const { return getChapter(); } // deprecated virtual int getChapter() const; + /** + * @deprecated Use getChapter() instead. + */ + SWDEPRECATED int Chapter() const { return getChapter(); } // deprecated virtual int getChapterMax() const; /** Gets verse * * @return value of verse */ - virtual int Verse() const { return getVerse(); } // deprecated virtual int getVerse() const; + /** + * @deprecated Use getVerse() instead. + */ + SWDEPRECATED int Verse() const { return getVerse(); } // deprecated virtual int getVerseMax() const; /** Gets verse suffix @@ -292,45 +298,45 @@ public: */ virtual char getSuffix() const; - /** Sets/gets testament + /** Sets testament * * @param itestament value which to set testament - * [MAXPOS(char)] - only get - * @return if unchanged -> value of testament, - * if changed -> previous value of testament */ - virtual char Testament(char itestament) { char retVal = getTestament(); setTestament(itestament); return retVal; } // deprecated virtual void setTestament(char itestament); + /** + * @deprecated Use setTestament() instead. + */ + SWDEPRECATED char Testament(char itestament) { char retVal = getTestament(); setTestament(itestament); return retVal; } // deprecated - /** Sets/gets book + /** Sets book * * @param ibook value which to set book - * [MAXPOS(char)] - only get - * @return if unchanged -> value of book, - * if changed -> previous value of book */ - virtual char Book(char ibook) { char retVal = getBook(); setBook(ibook); return retVal; } // deprecated virtual void setBook(char ibook); + /** + * @deprecated Use setBook() instead. + */ + SWDEPRECATED char Book(char ibook) { char retVal = getBook(); setBook(ibook); return retVal; } // deprecated - /** Sets/gets chapter + /** Sets chapter * * @param ichapter value which to set chapter - * [MAXPOS(int)] - only get - * @return if unchanged -> value of chapter, - * if changed -> previous value of chapter */ - virtual int Chapter(int ichapter) { char retVal = getChapter(); setChapter(ichapter); return retVal; } // deprecated virtual void setChapter(int ichapter); + /** + * @deprecated Use setChapter() instead. + */ + SWDEPRECATED int Chapter(int ichapter) { char retVal = getChapter(); setChapter(ichapter); return retVal; } // deprecated - /** Sets/gets verse + /** Sets verse * * @param iverse value which to set verse - * [MAXPOS(int)] - only get - * @return if unchanged -> value of verse, - * if changed -> previous value of verse */ - virtual int Verse(int iverse) { char retVal = getVerse(); setVerse(iverse); return retVal; } // deprecated; virtual void setVerse(int iverse); + /** + * @deprecated Use setVerse() instead. + */ + SWDEPRECATED int Verse(int iverse) { char retVal = getVerse(); setVerse(iverse); return retVal; } // deprecated; /** Sets/gets verse suffix * @@ -344,9 +350,10 @@ public: * * @return *this */ - virtual void Normalize(char autocheck = 0); + virtual void normalize(bool autocheck = false); + SWDEPRECATED void Normalize(char autocheck = 0) { normalize(autocheck!=0); } - /** Sets/gets flag that tells VerseKey to + /** Sets flag that tells VerseKey to * automatically normalize itself when modified * * @param iautonorm value which to set autonorm @@ -354,40 +361,62 @@ public: * @return if unchanged -> value of autonorm, * if changed -> previous value of autonorm */ - virtual char AutoNormalize(char iautonorm) { char retVal = isAutoNormalize()?1:0; setAutoNormalize(iautonorm); return retVal; } // deprecated - virtual char AutoNormalize() const { return isAutoNormalize()?1:0; } // deprecated - - virtual bool isAutoNormalize() const; virtual void setAutoNormalize(bool iautonorm); + virtual bool isAutoNormalize() const; + + /** + * @deprecated Use setAutoNormalize() instead. + */ + SWDEPRECATED char AutoNormalize(char iautonorm) { char retVal = isAutoNormalize()?1:0; setAutoNormalize(iautonorm!=0); return retVal; } // deprecated + /** + * @deprecated Use isAutoNormalize() instead. + */ + SWDEPRECATED char AutoNormalize() const { return isAutoNormalize()?1:0; } // deprecated + /** Sets/gets flag that tells VerseKey to include - * chapter/book/testament/module headings + * chapter/book/testament/module intros * - * @param iheadings value which to set headings + * @deprecated Use setIntros() and isIntros() instead. + * @param iheadings value which to set intros * [MAXPOS(char)] - only get - * @return if unchanged -> value of headings, - * if changed -> previous value of headings + * @return if unchanged -> value of intros, + * if changed -> previous value of intros + */ + SWDEPRECATED char Headings(char iheadings = MAXPOS(char)) { char retVal = isIntros(); if (iheadings != MAXPOS(char)) setIntros(iheadings!=0); return retVal; } + + /** The Intros property determine whether or not to include + * chapter/book/testament/module intros */ - virtual char Headings(char iheadings = MAXPOS(char)); + virtual void setIntros(bool val); + virtual bool isIntros() const; + /** Gets index based upon current verse * * @return offset */ - virtual long Index() const; + virtual long getIndex() const; + /** Sets index based upon current verse * * @param iindex value to set index to * @return offset */ - virtual long Index(long iindex); + virtual void setIndex(long iindex); + /** Gets index into current testament based upon current verse * * @return offset */ - virtual long TestamentIndex() const; + virtual long getTestamentIndex() const; + + /** + * @deprecated Use getTestamentIndex() + */ + SWDEPRECATED long TestamentIndex() const { return getTestamentIndex(); } // deprecated, use getTestamentIndex() virtual const char *getOSISRef() const; virtual const char *getOSISBookName() const; @@ -398,7 +427,23 @@ public: */ static const char *convertToOSIS(const char *inRef, const SWKey *defaultKey); - virtual ListKey ParseVerseList(const char *buf, const char *defaultKey = 0, bool expandRange = false, bool useChapterAsVerse = false); + /****************************************************************************** + * VerseKey::parseVerseList - Attempts to parse a buffer into separate + * verse entries returned in a ListKey + * + * ENT: buf - buffer to parse; + * defaultKey - if verse, chap, book, or testament is left off, + * pull info from this key (ie. Gen 2:3; 4:5; + * Gen would be used when parsing the 4:5 section) + * expandRange - whether or not to expand eg. John 1:10-12 or just + * save John 1:10 + * + * RET: ListKey reference filled with verse entries contained in buf + * + * COMMENT: This code works but wreaks. Rewrite to make more maintainable. + */ + virtual ListKey parseVerseList(const char *buf, const char *defaultKey = 0, bool expandRange = false, bool useChapterAsVerse = false); + SWDEPRECATED ListKey ParseVerseList(const char *buf, const char *defaultKey = 0, bool expandRange = false, bool useChapterAsVerse = false) { return parseVerseList(buf, defaultKey, expandRange, useChapterAsVerse); } virtual const char *getRangeText() const; virtual const char *getOSISRefRangeText() const; /** Compares another SWKey object diff --git a/include/versemgr.h b/include/versemgr.h deleted file mode 100644 index 6f59d94..0000000 --- a/include/versemgr.h +++ /dev/null @@ -1,163 +0,0 @@ -/****************************************************************************** - * versemgr.h - definition of class VerseMgr used for managing - * versification systems - * - * $Id: versemgr.cpp 2108 2007-10-13 20:35:02Z scribe $ - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include -#include -#include -#include - - -#ifndef VERSEMGR_H -#define VERSEMGR_H - - -SWORD_NAMESPACE_START - -typedef std::list StringList; - -struct sbook; -class TreeKey; - - -struct abbrev -{ - const char *ab; - const char *osis; -}; - -struct sbook { - /**Name of book - */ - const char *name; - - /**OSIS name - */ - const char *osis; - - /**Preferred Abbreviation - */ - const char *prefAbbrev; - - /**Maximum chapters in book - */ - unsigned char chapmax; - /** Array[chapmax] of maximum verses in chapters - */ - int *versemax; -}; - - -class SWDLLEXPORT VerseMgr : public SWCacher { - - -public: - class System; - -private: - friend class __staticsystemVerseMgr; - - class Private; - Private *p; - - void init(); - -protected: - static VerseMgr *systemVerseMgr; - -public: - class SWDLLEXPORT Book { - friend class System; - friend struct BookOffsetLess; - class Private; - Private *p; - - /** book name */ - SWBuf longName; - - /** OSIS Abbreviation */ - SWBuf osisName; - - /** Preferred Abbreviation */ - SWBuf prefAbbrev; - - /** Maximum chapters in book */ - unsigned int chapMax; - - void init(); - - public: - Book() { init(); } - Book(const Book &other); - Book &operator =(const Book &other); - Book(const char *longName, const char *osisName, const char *prefAbbrev, int chapMax) { - this->longName = longName; - this->osisName = osisName; - this->prefAbbrev = prefAbbrev; - this->chapMax = chapMax; - init(); - } - ~Book(); - const char *getLongName() const { return longName.c_str(); } - const char *getOSISName() const { return osisName.c_str(); } - const char *getPreferredAbbreviation() const { return prefAbbrev.c_str(); } - int getChapterMax() const { return chapMax; } - int getVerseMax(int chapter) const; - }; - - class SWDLLEXPORT System { - class Private; - Private *p; - SWBuf name; - int BMAX[2]; - long ntStartOffset; - void init(); - public: - System() { this->name = ""; init(); } - System(const System &other); - System &operator =(const System &other); - System(const char *name) { this->name = name; init(); } - ~System(); - const char *getName() const { return name.c_str(); } - const Book *getBookByName(const char *bookName) const; - int getBookNumberByOSISName(const char *bookName) const; - const Book *getBook(int number) const; - int getBookCount() const; - void loadFromSBook(const sbook *ot, const sbook *nt, int *chMax); - long getOffsetFromVerse(int book, int chapter, int verse) const; - char getVerseFromOffset(long offset, int *book, int *chapter, int *verse) const; - const int *getBMAX() const { return BMAX; }; - long getNTStartOffset() const { return ntStartOffset; } - }; - VerseMgr() { init(); } - ~VerseMgr(); - static VerseMgr *getSystemVerseMgr(); - static void setSystemVerseMgr(VerseMgr *newVerseMgr); - const StringList getVersificationSystems() const; - const System *getVersificationSystem(const char *name) const; - void registerVersificationSystem(const char *name, const sbook *ot, const sbook *nt, int *chMax); - void registerVersificationSystem(const char *name, const TreeKey *); -}; - -SWDLLEXPORT extern const struct abbrev builtin_abbrevs[]; - -SWORD_NAMESPACE_END -#endif diff --git a/include/versetreekey.h b/include/versetreekey.h index ab1d108..60e2d69 100644 --- a/include/versetreekey.h +++ b/include/versetreekey.h @@ -1,12 +1,14 @@ /****************************************************************************** - * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: versekey.h 1864 2005-11-20 06:06:40Z scribe $ + * versetreekey.h - code for class 'VerseTreeKey'- a standard Biblical + * verse key * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: versetreekey.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 - * Tempe, AZ 85280-2528 + * Tempe, AZ 85280-2528 * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -47,7 +49,7 @@ class SWDLLEXPORT VerseTreeKey : public VerseKey, public TreeKey::PositionChange long lastGoodOffset; protected: - virtual int getBookAbbrev(const char *abbr); + virtual int getBookFromAbbrev(const char *abbr) const; public: diff --git a/include/versificationmgr.h b/include/versificationmgr.h new file mode 100644 index 0000000..4ed8a62 --- /dev/null +++ b/include/versificationmgr.h @@ -0,0 +1,164 @@ +/****************************************************************************** + * + * versification.h - definition of class VersificationMgr used for managing + * versification systems + * + * $Id: versificationmgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include +#include +#include + + +#ifndef VERSIFICATIONMGR_H +#define VERSIFICATIONMGR_H + + +SWORD_NAMESPACE_START + +typedef std::list StringList; + +struct sbook; +class TreeKey; + + +struct abbrev +{ + const char *ab; + const char *osis; +}; + +struct sbook { + /**Name of book + */ + const char *name; + + /**OSIS name + */ + const char *osis; + + /**Preferred Abbreviation + */ + const char *prefAbbrev; + + /**Maximum chapters in book + */ + unsigned char chapmax; + /** Array[chapmax] of maximum verses in chapters + */ + int *versemax; +}; + + +class SWDLLEXPORT VersificationMgr : public SWCacher { + + +public: + class System; + +private: + friend class __staticsystemVersificationMgr; + + class Private; + Private *p; + + void init(); + +protected: + static VersificationMgr *systemVersificationMgr; + +public: + class SWDLLEXPORT Book { + friend class System; + friend struct BookOffsetLess; + class Private; + Private *p; + + /** book name */ + SWBuf longName; + + /** OSIS Abbreviation */ + SWBuf osisName; + + /** Preferred Abbreviation */ + SWBuf prefAbbrev; + + /** Maximum chapters in book */ + unsigned int chapMax; + + void init(); + + public: + Book() { init(); } + Book(const Book &other); + Book &operator =(const Book &other); + Book(const char *longName, const char *osisName, const char *prefAbbrev, int chapMax) { + this->longName = longName; + this->osisName = osisName; + this->prefAbbrev = prefAbbrev; + this->chapMax = chapMax; + init(); + } + ~Book(); + const char *getLongName() const { return longName.c_str(); } + const char *getOSISName() const { return osisName.c_str(); } + const char *getPreferredAbbreviation() const { return prefAbbrev.c_str(); } + int getChapterMax() const { return chapMax; } + int getVerseMax(int chapter) const; + }; + + class SWDLLEXPORT System { + class Private; + Private *p; + SWBuf name; + int BMAX[2]; + long ntStartOffset; + void init(); + public: + System() { this->name = ""; init(); } + System(const System &other); + System &operator =(const System &other); + System(const char *name) { this->name = name; init(); } + ~System(); + const char *getName() const { return name.c_str(); } + const Book *getBookByName(const char *bookName) const; + int getBookNumberByOSISName(const char *bookName) const; + const Book *getBook(int number) const; + int getBookCount() const; + void loadFromSBook(const sbook *ot, const sbook *nt, int *chMax); + long getOffsetFromVerse(int book, int chapter, int verse) const; + char getVerseFromOffset(long offset, int *book, int *chapter, int *verse) const; + const int *getBMAX() const { return BMAX; }; + long getNTStartOffset() const { return ntStartOffset; } + }; + VersificationMgr() { init(); } + ~VersificationMgr(); + static VersificationMgr *getSystemVersificationMgr(); + static void setSystemVersificationMgr(VersificationMgr *newVersificationMgr); + const StringList getVersificationSystems() const; + const System *getVersificationSystem(const char *name) const; + void registerVersificationSystem(const char *name, const sbook *ot, const sbook *nt, int *chMax); + void registerVersificationSystem(const char *name, const TreeKey *); +}; + +SWDLLEXPORT extern const struct abbrev builtin_abbrevs[]; + +SWORD_NAMESPACE_END +#endif diff --git a/include/xzcomprs.h b/include/xzcomprs.h new file mode 100644 index 0000000..c468288 --- /dev/null +++ b/include/xzcomprs.h @@ -0,0 +1,45 @@ +/****************************************************************************** + * + * xzcomprs.h - XzCompress, a driver class that provides xz (LZMA2) + * compression + * + * $Id: xzcomprs.h 2850 2013-07-02 09:57:20Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#ifndef XZCOMPRS_H +#define XZCOMPRS_H + +#include + +#include + +SWORD_NAMESPACE_START + +class SWDLLEXPORT XzCompress : public SWCompress { + +protected: +public: + XzCompress(); + virtual ~XzCompress(); + + virtual void Encode(void); + virtual void Decode(void); +}; + +SWORD_NAMESPACE_END +#endif diff --git a/include/zcom.h b/include/zcom.h index 90132d5..560b650 100644 --- a/include/zcom.h +++ b/include/zcom.h @@ -1,10 +1,11 @@ /****************************************************************************** - * zcom.h - code for class 'zCom'- a module that reads compressed text - * files: ot and nt using indexs ??.vss * - * $Id: zcom.h 2303 2009-04-06 13:38:34Z scribe $ + * zcom.h - code for class 'zCom'- a module that reads compressed text + * files: ot and nt using indexs ??.vss * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: zcom.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -45,12 +46,12 @@ public: SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0, const char *versification = "KJV"); virtual ~zCom(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; virtual void increment(int steps = 1); virtual void decrement(int steps = 1) { increment(-steps); } // write interface ---------------------------- - virtual bool isWritable(); + virtual bool isWritable() const; static char createModule(const char *path, int blockBound, const char *v11n = "KJV") { return zVerse::createModule(path, blockBound, v11n); } @@ -59,7 +60,7 @@ public: virtual void deleteEntry(); // Delete current module entry // end write interface ------------------------ - virtual void rawZFilter(SWBuf &buf, char direction = 0) { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering + virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering // swcacher interface ---------------------- virtual void flush() { flushCache(); } diff --git a/include/zipcomprs.h b/include/zipcomprs.h index 63500d4..ce35e80 100644 --- a/include/zipcomprs.h +++ b/include/zipcomprs.h @@ -1,9 +1,11 @@ /****************************************************************************** - * swcomprs.h - definition of Class SWCompress used for data compression * - * $Id: zipcomprs.h 1864 2005-11-20 06:06:40Z scribe $ + * zipcomprs.h - definition of Class ZipCompress used for data + * compression * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: zipcomprs.h 2850 2013-07-02 09:57:20Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/include/zld.h b/include/zld.h index de4788c..5b7891f 100644 --- a/include/zld.h +++ b/include/zld.h @@ -1,10 +1,11 @@ /****************************************************************************** - * zld.cpp - code for class 'zLD'- a module that reads compressed lexicon and - * dictionary files. * - * $Id: zld.h 2303 2009-04-06 13:38:34Z scribe $ + * zld.cpp - code for class 'zLD'- a module that reads compressed lexicon + * and dictionary files * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: zld.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -31,21 +32,20 @@ SWORD_NAMESPACE_START class SWDLLEXPORT zLD : public zStr, public SWLD { - char getEntry(long away = 0); + char getEntry(long away = 0) const; public: - zLD(const char *ipath, const char *iname = 0, const char *idesc = 0, long blockCount = 200, SWCompress *icomp = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, - const char* ilang = 0); + zLD(const char *ipath, const char *iname = 0, const char *idesc = 0, long blockCount = 200, SWCompress *icomp = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, bool caseSensitive = false, bool strongsPadding = true); virtual ~zLD(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; virtual void increment(int steps = 1); virtual void decrement(int steps = 1) { increment(-steps); } // write interface ---------------------------- - virtual bool isWritable(); + virtual bool isWritable() const; static char createModule(const char *path) { return zStr::createModule(path); } @@ -55,7 +55,7 @@ public: virtual void deleteEntry(); // Delete current module entry // end write interface ------------------------ - virtual void rawZFilter(SWBuf &buf, char direction = 0) { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering + virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering // swcacher interface ---------------------- virtual void flush() { flushCache(); } diff --git a/include/zstr.h b/include/zstr.h index f9842f4..81ed63d 100644 --- a/include/zstr.h +++ b/include/zstr.h @@ -1,12 +1,13 @@ /***************************************************************************** - * zstr.h - code for class 'zStr'- a module that reads compressed text - * files. - * and provides lookup and parsing functions based on - * class StrKey * - * $Id: zstr.h 2303 2009-04-06 13:38:34Z scribe $ + * zstr.h - code for class 'zStr'- a module that reads compressed text + * files. + * and provides lookup and parsing functions based on + * class StrKey * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: zstr.h 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -38,10 +39,11 @@ class SWDLLEXPORT zStr { private: static int instance; // number of instantiated zStr objects or derivitives - EntriesBlock *cacheBlock; - long cacheBlockIndex; - bool cacheDirty; + mutable EntriesBlock *cacheBlock; + mutable long cacheBlockIndex; + mutable bool cacheDirty; char *path; + bool caseSensitive; mutable long lastoff; // for caching and optimization long blockCount; SWCompress *compressor; @@ -54,20 +56,19 @@ protected: static const int IDXENTRYSIZE; static const int ZDXENTRYSIZE; - void getCompressedText(long block, long entry, char **buf); - void flushCache(); + void getCompressedText(long block, long entry, char **buf) const; + void flushCache() const; void getKeyFromDatOffset(long ioffset, char **buf) const; void getKeyFromIdxOffset(long ioffset, char **buf) const; public: - char nl; - zStr(const char *ipath, int fileMode = -1, long blockCount = 100, SWCompress *icomp = 0); + zStr(const char *ipath, int fileMode = -1, long blockCount = 100, SWCompress *icomp = 0, bool caseSensitive = false); virtual ~zStr(); signed char findKeyIndex(const char *ikey, long *idxoff, long away = 0) const; - void getText(long index, char **idxbuf, char **buf); + void getText(long index, char **idxbuf, char **buf) const; void setText(const char *ikey, const char *buf, long len = -1); void linkEntry(const char *destkey, const char *srckey); - virtual void rawZFilter(SWBuf &buf, char direction = 0) {} + virtual void rawZFilter(SWBuf &buf, char direction = 0) const { (void) buf; (void) direction; } static signed char createModule (const char *path); }; diff --git a/include/ztext.h b/include/ztext.h index 2f0b111..c8855c9 100644 --- a/include/ztext.h +++ b/include/ztext.h @@ -1,10 +1,11 @@ /****************************************************************************** - * ztext.h - code for class 'zText'- a module that reads compressed text - * files: ot and nt using indexs ??.vss * - * $Id: ztext.h 2303 2009-04-06 13:38:34Z scribe $ + * ztext.h - code for class 'zText'- a module that reads compressed text + * files: ot and nt using indexs ??.vss * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: ztext.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -59,13 +60,13 @@ public: const char *versification = "KJV"); virtual ~zText(); - virtual SWBuf &getRawEntryBuf(); + virtual SWBuf &getRawEntryBuf() const; virtual void increment(int steps = 1); virtual void decrement(int steps = 1) { increment(-steps); } // write interface ---------------------------- - virtual bool isWritable(); + virtual bool isWritable() const; static char createModule(const char *path, int blockBound, const char *v11n = "KJV") { return zVerse::createModule(path, blockBound, v11n); } @@ -75,7 +76,7 @@ public: virtual void deleteEntry(); // Delete current module entry // end write interface ------------------------ - virtual void rawZFilter(SWBuf &buf, char direction = 0) { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering + virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering // swcacher interface ---------------------- virtual void flush() { flushCache(); } diff --git a/include/zverse.h b/include/zverse.h index 1e5d1f3..c5fe8ee 100644 --- a/include/zverse.h +++ b/include/zverse.h @@ -1,10 +1,29 @@ /****************************************************************************** - * rawverse.h - code for class 'zVerse'- a module that reads raw text + * + * rawverse.h - code for class 'zVerse'- a module that reads raw text * files: ot and nt using indexs ??.bks ??.cps ??.vss * and provides lookup and parsing functions based on * class VerseKey + * + * $Id: zverse.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * */ + #ifndef ZVERSE_H #define ZVERSE_H @@ -28,12 +47,12 @@ protected: char *path; void doSetText(char testmt, long idxoff, const char *buf, long len = 0); void doLinkEntry(char testmt, long destidxoff, long srcidxoff); - void flushCache(); - char *cacheBuf; - unsigned int cacheBufSize; - char cacheTestament; - long cacheBufIdx; - bool dirtyCache; + void flushCache() const; + mutable char *cacheBuf; + mutable unsigned int cacheBufSize; + mutable char cacheTestament; + mutable long cacheBufIdx; + mutable bool dirtyCache; public: @@ -50,8 +69,8 @@ public: virtual ~zVerse(); void findOffset(char testmt, long idxoff, long *start, unsigned short *size, unsigned long *buffnum) const; - void zReadText(char testmt, long start, unsigned short size, unsigned long buffnum, SWBuf &buf); - virtual void rawZFilter(SWBuf &buf, char direction = 0) {} + void zReadText(char testmt, long start, unsigned short size, unsigned long buffnum, SWBuf &buf) const; + virtual void rawZFilter(SWBuf &buf, char direction = 0) const { (void) buf; (void) direction; } static char createModule(const char *path, int blockBound, const char *v11n = "KJV"); }; diff --git a/install-sh b/install-sh index 6781b98..377bb86 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ fi for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ do echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ do case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ do for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff --git a/lib/Makefile.in b/lib/Makefile.in index 521411d..70a06a6 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,41 +83,41 @@ target_triplet = @target@ #TODO: Where else do we need this? @USE_INTERNAL_REGEX_TRUE@am__append_1 = -I$(top_srcdir)/include/internal/regex -DIST_COMMON = README $(am__pkginclude_HEADERS_DIST) \ - $(srcdir)/../include/Makefile.am \ - $(srcdir)/../src/frontend/Makefile.am \ - $(srcdir)/../src/keys/Makefile.am \ +DIST_COMMON = $(srcdir)/../src/keys/Makefile.am \ + $(srcdir)/../src/utilfuns/Makefile.am \ $(srcdir)/../src/mgr/Makefile.am \ + $(srcdir)/../src/frontend/Makefile.am \ $(srcdir)/../src/modules/Makefile.am \ + $(srcdir)/../src/modules/common/Makefile.am \ + $(srcdir)/../src/modules/filters/Makefile.am \ + $(srcdir)/../src/modules/genbook/Makefile.am \ + $(srcdir)/../src/modules/genbook/rawgenbook/Makefile.am \ + $(srcdir)/../src/modules/texts/Makefile.am \ + $(srcdir)/../src/modules/texts/rawtext/Makefile.am \ + $(srcdir)/../src/modules/texts/rawtext4/Makefile.am \ + $(srcdir)/../src/modules/texts/ztext/Makefile.am \ $(srcdir)/../src/modules/comments/Makefile.am \ - $(srcdir)/../src/modules/comments/hrefcom/Makefile.am \ $(srcdir)/../src/modules/comments/rawcom/Makefile.am \ $(srcdir)/../src/modules/comments/rawcom4/Makefile.am \ $(srcdir)/../src/modules/comments/rawfiles/Makefile.am \ $(srcdir)/../src/modules/comments/zcom/Makefile.am \ - $(srcdir)/../src/modules/common/Makefile.am \ - $(srcdir)/../src/modules/filters/Makefile.am \ - $(srcdir)/../src/modules/genbook/Makefile.am \ - $(srcdir)/../src/modules/genbook/rawgenbook/Makefile.am \ + $(srcdir)/../src/modules/comments/hrefcom/Makefile.am \ $(srcdir)/../src/modules/lexdict/Makefile.am \ $(srcdir)/../src/modules/lexdict/rawld/Makefile.am \ $(srcdir)/../src/modules/lexdict/rawld4/Makefile.am \ $(srcdir)/../src/modules/lexdict/zld/Makefile.am \ - $(srcdir)/../src/modules/texts/Makefile.am \ - $(srcdir)/../src/modules/texts/rawtext/Makefile.am \ - $(srcdir)/../src/modules/texts/rawtext4/Makefile.am \ - $(srcdir)/../src/modules/texts/ztext/Makefile.am \ - $(srcdir)/../src/utilfuns/Makefile.am $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/../include/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp \ + $(am__pkginclude_HEADERS_DIST) README @HAVE_VSNPRINTF_FALSE@am__append_2 = -DNO_VSNPRINTF @USE_INTERNAL_REGEX_TRUE@am__append_3 = $(swincludedir)/internal/regex/regex.h subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ - $(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -101,6 +145,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libsword_la_LIBADD = @@ -109,32 +159,33 @@ am__libsword_la_SOURCES_DIST = $(keysdir)/swkey.cpp \ $(keysdir)/treekey.cpp $(keysdir)/treekeyidx.cpp \ $(keysdir)/versekey.cpp $(keysdir)/versetreekey.cpp \ $(utilfunsdir)/swobject.cpp $(utilfunsdir)/utilstr.cpp \ - $(utilfunsdir)/utilxml.cpp $(utilfunsdir)/swunicod.cpp \ - $(utilfunsdir)/swversion.cpp $(utilfunsdir)/swbuf.cpp \ - $(utilfunsdir)/ftpparse.c $(utilfunsdir)/url.cpp \ - $(utilfunsdir)/zlib/untgz.c $(utilfunsdir)/ftplib.c \ - $(utilfunsdir)/regex.c $(utilfunsdir)/roman.cpp \ - $(mgrdir)/ftplibftpt.cpp $(mgrdir)/curlftpt.cpp \ - $(mgrdir)/curlhttpt.cpp $(mgrdir)/swconfig.cpp \ - $(mgrdir)/swmgr.cpp $(mgrdir)/swfiltermgr.cpp \ - $(mgrdir)/encfiltmgr.cpp $(mgrdir)/markupfiltmgr.cpp \ - $(mgrdir)/filemgr.cpp $(mgrdir)/versemgr.cpp \ - $(mgrdir)/ftptrans.cpp $(mgrdir)/swlocale.cpp \ - $(mgrdir)/localemgr.cpp $(mgrdir)/swcacher.cpp \ - $(mgrdir)/swsearchable.cpp $(mgrdir)/installmgr.cpp \ - $(mgrdir)/stringmgr.cpp $(frontenddir)/swdisp.cpp \ - $(frontenddir)/swlog.cpp $(modulesdir)/swmodule.cpp \ - $(commondir)/rawstr.cpp $(commondir)/rawstr4.cpp \ - $(commondir)/swcomprs.cpp $(commondir)/lzsscomprs.cpp \ - $(commondir)/zipcomprs.cpp $(commondir)/rawverse.cpp \ - $(commondir)/rawverse4.cpp $(commondir)/swcipher.cpp \ - $(commondir)/zverse.cpp $(commondir)/zstr.cpp \ - $(commondir)/entriesblk.cpp $(commondir)/sapphire.cpp \ - $(filtersdir)/swbasicfilter.cpp $(filtersdir)/swoptfilter.cpp \ - $(filtersdir)/latin1utf8.cpp $(filtersdir)/latin1utf16.cpp \ - $(filtersdir)/utf8utf16.cpp $(filtersdir)/utf16utf8.cpp \ - $(filtersdir)/utf8html.cpp $(filtersdir)/utf8latin1.cpp \ - $(filtersdir)/utf8cantillation.cpp \ + $(utilfunsdir)/utilxml.cpp $(utilfunsdir)/swversion.cpp \ + $(utilfunsdir)/swbuf.cpp $(utilfunsdir)/ftpparse.c \ + $(utilfunsdir)/url.cpp $(utilfunsdir)/zlib/untgz.c \ + $(utilfunsdir)/ftplib.c $(utilfunsdir)/regex.c \ + $(utilfunsdir)/roman.cpp $(mgrdir)/ftplibftpt.cpp \ + $(mgrdir)/curlftpt.cpp $(mgrdir)/curlhttpt.cpp \ + $(mgrdir)/swconfig.cpp $(mgrdir)/swmgr.cpp \ + $(mgrdir)/swfiltermgr.cpp $(mgrdir)/encfiltmgr.cpp \ + $(mgrdir)/markupfiltmgr.cpp $(mgrdir)/filemgr.cpp \ + $(mgrdir)/versificationmgr.cpp $(mgrdir)/remotetrans.cpp \ + $(mgrdir)/swlocale.cpp $(mgrdir)/localemgr.cpp \ + $(mgrdir)/swcacher.cpp $(mgrdir)/swsearchable.cpp \ + $(mgrdir)/installmgr.cpp $(mgrdir)/stringmgr.cpp \ + $(frontenddir)/swdisp.cpp $(frontenddir)/swlog.cpp \ + $(modulesdir)/swmodule.cpp $(commondir)/rawstr.cpp \ + $(commondir)/rawstr4.cpp $(commondir)/swcomprs.cpp \ + $(commondir)/lzsscomprs.cpp $(commondir)/zipcomprs.cpp \ + $(commondir)/bz2comprs.cpp $(commondir)/xzcomprs.cpp \ + $(commondir)/rawverse.cpp $(commondir)/rawverse4.cpp \ + $(commondir)/swcipher.cpp $(commondir)/zverse.cpp \ + $(commondir)/zstr.cpp $(commondir)/entriesblk.cpp \ + $(commondir)/sapphire.cpp $(filtersdir)/swbasicfilter.cpp \ + $(filtersdir)/swoptfilter.cpp $(filtersdir)/latin1utf8.cpp \ + $(filtersdir)/latin1utf16.cpp $(filtersdir)/utf8utf16.cpp \ + $(filtersdir)/utf16utf8.cpp $(filtersdir)/utf8html.cpp \ + $(filtersdir)/utf8latin1.cpp $(filtersdir)/unicodertf.cpp \ + $(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8cantillation.cpp \ $(filtersdir)/utf8hebrewpoints.cpp \ $(filtersdir)/utf8arabicpoints.cpp \ $(filtersdir)/utf8greekaccents.cpp $(filtersdir)/cipherfil.cpp \ @@ -142,19 +193,21 @@ am__libsword_la_SOURCES_DIST = $(keysdir)/swkey.cpp \ $(filtersdir)/utf8nfkd.cpp $(filtersdir)/utf8arshaping.cpp \ $(filtersdir)/utf8bidireorder.cpp \ $(filtersdir)/osisheadings.cpp $(filtersdir)/osisfootnotes.cpp \ - $(filtersdir)/osishtmlhref.cpp $(filtersdir)/osiswebif.cpp \ - $(filtersdir)/osismorph.cpp $(filtersdir)/osisstrongs.cpp \ - $(filtersdir)/osisplain.cpp $(filtersdir)/osisrtf.cpp \ - $(filtersdir)/osislemma.cpp \ + $(filtersdir)/osishtmlhref.cpp $(filtersdir)/osisxhtml.cpp \ + $(filtersdir)/osiswebif.cpp $(filtersdir)/osismorph.cpp \ + $(filtersdir)/osisstrongs.cpp $(filtersdir)/osisplain.cpp \ + $(filtersdir)/osisrtf.cpp $(filtersdir)/osislemma.cpp \ $(filtersdir)/osisredletterwords.cpp \ $(filtersdir)/osisscripref.cpp $(filtersdir)/osisvariants.cpp \ $(filtersdir)/osiswordjs.cpp \ $(filtersdir)/osismorphsegmentation.cpp \ - $(filtersdir)/osisruby.cpp $(filtersdir)/gbfhtml.cpp \ - $(filtersdir)/gbfhtmlhref.cpp $(filtersdir)/gbfwebif.cpp \ - $(filtersdir)/gbfplain.cpp $(filtersdir)/gbfrtf.cpp \ - $(filtersdir)/gbfstrongs.cpp $(filtersdir)/gbffootnotes.cpp \ - $(filtersdir)/gbfheadings.cpp \ + $(filtersdir)/osisglosses.cpp $(filtersdir)/osisenum.cpp \ + $(filtersdir)/osisxlit.cpp \ + $(filtersdir)/osisreferencelinks.cpp $(filtersdir)/gbfhtml.cpp \ + $(filtersdir)/gbfhtmlhref.cpp $(filtersdir)/gbfxhtml.cpp \ + $(filtersdir)/gbfwebif.cpp $(filtersdir)/gbfplain.cpp \ + $(filtersdir)/gbfrtf.cpp $(filtersdir)/gbfstrongs.cpp \ + $(filtersdir)/gbffootnotes.cpp $(filtersdir)/gbfheadings.cpp \ $(filtersdir)/gbfredletterwords.cpp $(filtersdir)/gbfmorph.cpp \ $(filtersdir)/gbfwordjs.cpp $(filtersdir)/thmlstrongs.cpp \ $(filtersdir)/thmlfootnotes.cpp $(filtersdir)/thmlheadings.cpp \ @@ -162,64 +215,63 @@ am__libsword_la_SOURCES_DIST = $(keysdir)/swkey.cpp \ $(filtersdir)/thmlscripref.cpp $(filtersdir)/thmlvariants.cpp \ $(filtersdir)/thmlgbf.cpp $(filtersdir)/thmlrtf.cpp \ $(filtersdir)/thmlhtml.cpp $(filtersdir)/thmlhtmlhref.cpp \ - $(filtersdir)/thmlwebif.cpp $(filtersdir)/thmlwordjs.cpp \ - $(filtersdir)/gbfthml.cpp $(filtersdir)/gbfosis.cpp \ - $(filtersdir)/thmlosis.cpp $(filtersdir)/thmlplain.cpp \ - $(filtersdir)/osisosis.cpp $(filtersdir)/rtfhtml.cpp \ - $(filtersdir)/plainfootnotes.cpp $(filtersdir)/plainhtml.cpp \ - $(filtersdir)/greeklexattribs.cpp $(filtersdir)/unicodertf.cpp \ + $(filtersdir)/thmlxhtml.cpp $(filtersdir)/thmlwebif.cpp \ + $(filtersdir)/thmlwordjs.cpp $(filtersdir)/gbfthml.cpp \ + $(filtersdir)/gbfosis.cpp $(filtersdir)/thmlosis.cpp \ + $(filtersdir)/thmlplain.cpp $(filtersdir)/osisosis.cpp \ + $(filtersdir)/rtfhtml.cpp $(filtersdir)/greeklexattribs.cpp \ $(filtersdir)/papyriplain.cpp $(filtersdir)/teiplain.cpp \ $(filtersdir)/teirtf.cpp $(filtersdir)/teihtmlhref.cpp \ - $(genbookdir)/swgenbook.cpp $(rawgenbookdir)/rawgenbook.cpp \ - $(textsdir)/swtext.cpp $(rawtextdir)/rawtext.cpp \ - $(rawtext4dir)/rawtext4.cpp $(ztextdir)/ztext.cpp \ - $(commentsdir)/swcom.cpp $(rawcomdir)/rawcom.cpp \ - $(rawcom4dir)/rawcom4.cpp $(rawfilesdir)/rawfiles.cpp \ - $(zcomdir)/zcom.cpp $(hrefcomdir)/hrefcom.cpp \ - $(lexdictdir)/swld.cpp $(rawlddir)/rawld.cpp \ - $(rawld4dir)/rawld4.cpp $(zlddir)/zld.cpp \ - $(bindingsdir)/flatapi.cpp + $(filtersdir)/teixhtml.cpp $(genbookdir)/swgenbook.cpp \ + $(rawgenbookdir)/rawgenbook.cpp $(textsdir)/swtext.cpp \ + $(rawtextdir)/rawtext.cpp $(rawtext4dir)/rawtext4.cpp \ + $(ztextdir)/ztext.cpp $(commentsdir)/swcom.cpp \ + $(rawcomdir)/rawcom.cpp $(rawcom4dir)/rawcom4.cpp \ + $(rawfilesdir)/rawfiles.cpp $(zcomdir)/zcom.cpp \ + $(hrefcomdir)/hrefcom.cpp $(lexdictdir)/swld.cpp \ + $(rawlddir)/rawld.cpp $(rawld4dir)/rawld4.cpp \ + $(zlddir)/zld.cpp $(bindingsdir)/flatapi.cpp @HAVE_LIBZ_TRUE@am__objects_1 = untgz.lo @INTERNALFTPLIB_TRUE@am__objects_2 = ftplib.lo @USE_INTERNAL_REGEX_TRUE@am__objects_3 = regex.lo @WITHCURL_FALSE@am__objects_4 = ftplibftpt.lo @WITHCURL_TRUE@am__objects_4 = curlftpt.lo curlhttpt.lo -@HAVE_LIBZ_TRUE@am__objects_5 = zipcomprs.lo +@HAVE_LIBZ_TRUE@am__objects_5 = zipcomprs.lo bz2comprs.lo xzcomprs.lo am__objects_6 = utf8transliterator.lo utf8nfc.lo utf8nfkd.lo \ utf8arshaping.lo utf8bidireorder.lo @HAVE_ICUSWORD_TRUE@@HAVE_ICU_FALSE@am__objects_7 = $(am__objects_6) @HAVE_ICU_TRUE@am__objects_7 = $(am__objects_6) am__objects_8 = osisheadings.lo osisfootnotes.lo osishtmlhref.lo \ - osiswebif.lo osismorph.lo osisstrongs.lo osisplain.lo \ - osisrtf.lo osislemma.lo osisredletterwords.lo osisscripref.lo \ - osisvariants.lo osiswordjs.lo osismorphsegmentation.lo \ - osisruby.lo -am__objects_9 = gbfhtml.lo gbfhtmlhref.lo gbfwebif.lo gbfplain.lo \ - gbfrtf.lo gbfstrongs.lo gbffootnotes.lo gbfheadings.lo \ - gbfredletterwords.lo gbfmorph.lo gbfwordjs.lo + osisxhtml.lo osiswebif.lo osismorph.lo osisstrongs.lo \ + osisplain.lo osisrtf.lo osislemma.lo osisredletterwords.lo \ + osisscripref.lo osisvariants.lo osiswordjs.lo \ + osismorphsegmentation.lo osisglosses.lo osisenum.lo \ + osisxlit.lo osisreferencelinks.lo +am__objects_9 = gbfhtml.lo gbfhtmlhref.lo gbfxhtml.lo gbfwebif.lo \ + gbfplain.lo gbfrtf.lo gbfstrongs.lo gbffootnotes.lo \ + gbfheadings.lo gbfredletterwords.lo gbfmorph.lo gbfwordjs.lo am__objects_10 = thmlstrongs.lo thmlfootnotes.lo thmlheadings.lo \ thmlmorph.lo thmllemma.lo thmlscripref.lo thmlvariants.lo \ - thmlgbf.lo thmlrtf.lo thmlhtml.lo thmlhtmlhref.lo thmlwebif.lo \ - thmlwordjs.lo + thmlgbf.lo thmlrtf.lo thmlhtml.lo thmlhtmlhref.lo thmlxhtml.lo \ + thmlwebif.lo thmlwordjs.lo am__objects_11 = gbfthml.lo gbfosis.lo thmlosis.lo thmlplain.lo \ osisosis.lo -am__objects_12 = rtfhtml.lo plainfootnotes.lo plainhtml.lo \ - greeklexattribs.lo unicodertf.lo papyriplain.lo -am__objects_13 = teiplain.lo teirtf.lo teihtmlhref.lo +am__objects_12 = rtfhtml.lo greeklexattribs.lo papyriplain.lo +am__objects_13 = teiplain.lo teirtf.lo teihtmlhref.lo teixhtml.lo am_libsword_la_OBJECTS = swkey.lo listkey.lo strkey.lo treekey.lo \ treekeyidx.lo versekey.lo versetreekey.lo swobject.lo \ - utilstr.lo utilxml.lo swunicod.lo swversion.lo swbuf.lo \ - ftpparse.lo url.lo $(am__objects_1) $(am__objects_2) \ - $(am__objects_3) roman.lo $(am__objects_4) swconfig.lo \ - swmgr.lo swfiltermgr.lo encfiltmgr.lo markupfiltmgr.lo \ - filemgr.lo versemgr.lo ftptrans.lo swlocale.lo localemgr.lo \ - swcacher.lo swsearchable.lo installmgr.lo stringmgr.lo \ - swdisp.lo swlog.lo swmodule.lo rawstr.lo rawstr4.lo \ - swcomprs.lo lzsscomprs.lo $(am__objects_5) rawverse.lo \ - rawverse4.lo swcipher.lo zverse.lo zstr.lo entriesblk.lo \ - sapphire.lo swbasicfilter.lo swoptfilter.lo latin1utf8.lo \ - latin1utf16.lo utf8utf16.lo utf16utf8.lo utf8html.lo \ - utf8latin1.lo utf8cantillation.lo utf8hebrewpoints.lo \ + utilstr.lo utilxml.lo swversion.lo swbuf.lo ftpparse.lo url.lo \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) roman.lo \ + $(am__objects_4) swconfig.lo swmgr.lo swfiltermgr.lo \ + encfiltmgr.lo markupfiltmgr.lo filemgr.lo versificationmgr.lo \ + remotetrans.lo swlocale.lo localemgr.lo swcacher.lo \ + swsearchable.lo installmgr.lo stringmgr.lo swdisp.lo swlog.lo \ + swmodule.lo rawstr.lo rawstr4.lo swcomprs.lo lzsscomprs.lo \ + $(am__objects_5) rawverse.lo rawverse4.lo swcipher.lo \ + zverse.lo zstr.lo entriesblk.lo sapphire.lo swbasicfilter.lo \ + swoptfilter.lo latin1utf8.lo latin1utf16.lo utf8utf16.lo \ + utf16utf8.lo utf8html.lo utf8latin1.lo unicodertf.lo \ + scsuutf8.lo utf8cantillation.lo utf8hebrewpoints.lo \ utf8arabicpoints.lo utf8greekaccents.lo cipherfil.lo \ $(am__objects_7) $(am__objects_8) $(am__objects_9) \ $(am__objects_10) $(am__objects_11) $(am__objects_12) \ @@ -228,57 +280,97 @@ am_libsword_la_OBJECTS = swkey.lo listkey.lo strkey.lo treekey.lo \ rawfiles.lo zcom.lo hrefcom.lo swld.lo rawld.lo rawld4.lo \ zld.lo flatapi.lo libsword_la_OBJECTS = $(am_libsword_la_OBJECTS) -libsword_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libsword_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(libsword_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libsword_la_SOURCES) DIST_SOURCES = $(am__libsword_la_SOURCES_DIST) -am__pkginclude_HEADERS_DIST = $(swincludedir)/Greek2Greek.h \ - $(swincludedir)/GreekChars.h $(swincludedir)/canon.h \ +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__pkginclude_HEADERS_DIST = $(swincludedir)/canon.h \ $(swincludedir)/canon_abbrevs.h $(swincludedir)/cipherfil.h \ $(swincludedir)/curlftpt.h $(swincludedir)/curlhttpt.h \ $(swincludedir)/defs.h $(swincludedir)/echomod.h \ $(swincludedir)/encfiltmgr.h $(swincludedir)/entriesblk.h \ $(swincludedir)/femain.h $(swincludedir)/filemgr.h \ - $(swincludedir)/versemgr.h $(swincludedir)/flatapi.h \ - $(swincludedir)/ftpparse.h $(swincludedir)/ftptrans.h \ + $(swincludedir)/versificationmgr.h $(swincludedir)/flatapi.h \ + $(swincludedir)/ftpparse.h $(swincludedir)/remotetrans.h \ $(swincludedir)/ftplibftpt.h $(swincludedir)/ftplib.h \ $(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h \ - $(swincludedir)/gbfhtml.h $(swincludedir)/gbfhtmlhref.h \ - $(swincludedir)/gbfwebif.h $(swincludedir)/gbfmorph.h \ - $(swincludedir)/gbfosis.h $(swincludedir)/gbfplain.h \ - $(swincludedir)/gbfredletterwords.h $(swincludedir)/gbfrtf.h \ - $(swincludedir)/gbfstrongs.h $(swincludedir)/gbfwordjs.h \ - $(swincludedir)/gbfthml.h $(swincludedir)/greeklexattribs.h \ - $(swincludedir)/hebrewmcim.h $(swincludedir)/hrefcom.h \ - $(swincludedir)/installmgr.h $(swincludedir)/latin1utf16.h \ - $(swincludedir)/latin1utf8.h $(swincludedir)/listkey.h \ - $(swincludedir)/localemgr.h $(swincludedir)/lzsscomprs.h \ - $(swincludedir)/markupfiltmgr.h $(swincludedir)/multimapwdef.h \ - $(swincludedir)/nullim.h $(swincludedir)/osisheadings.h \ - $(swincludedir)/osishtmlhref.h $(swincludedir)/osiswebif.h \ + $(swincludedir)/gbfhtml.h $(swincludedir)/gbfxhtml.h \ + $(swincludedir)/gbfhtmlhref.h $(swincludedir)/gbfwebif.h \ + $(swincludedir)/gbfmorph.h $(swincludedir)/gbfosis.h \ + $(swincludedir)/gbfplain.h $(swincludedir)/gbfredletterwords.h \ + $(swincludedir)/gbfrtf.h $(swincludedir)/gbfstrongs.h \ + $(swincludedir)/gbfwordjs.h $(swincludedir)/gbfthml.h \ + $(swincludedir)/greeklexattribs.h $(swincludedir)/hebrewmcim.h \ + $(swincludedir)/hrefcom.h $(swincludedir)/installmgr.h \ + $(swincludedir)/latin1utf16.h $(swincludedir)/latin1utf8.h \ + $(swincludedir)/listkey.h $(swincludedir)/localemgr.h \ + $(swincludedir)/lzsscomprs.h $(swincludedir)/markupfiltmgr.h \ + $(swincludedir)/multimapwdef.h $(swincludedir)/nullim.h \ + $(swincludedir)/osisglosses.h $(swincludedir)/osisenum.h \ + $(swincludedir)/osisheadings.h $(swincludedir)/osishtmlhref.h \ + $(swincludedir)/osisxhtml.h $(swincludedir)/osiswebif.h \ $(swincludedir)/osismorph.h \ $(swincludedir)/osismorphsegmentation.h \ $(swincludedir)/osisplain.h $(swincludedir)/osisrtf.h \ @@ -286,38 +378,40 @@ am__pkginclude_HEADERS_DIST = $(swincludedir)/Greek2Greek.h \ $(swincludedir)/osisfootnotes.h $(swincludedir)/osislemma.h \ $(swincludedir)/osisredletterwords.h \ $(swincludedir)/osisscripref.h $(swincludedir)/osiswordjs.h \ - $(swincludedir)/osisvariants.h $(swincludedir)/papyriplain.h \ - $(swincludedir)/plainfootnotes.h $(swincludedir)/plainhtml.h \ - $(swincludedir)/rawcom.h $(swincludedir)/rawfiles.h \ + $(swincludedir)/osisvariants.h $(swincludedir)/osisxlit.h \ + $(swincludedir)/papyriplain.h $(swincludedir)/rawcom.h \ + $(swincludedir)/rawcom4.h $(swincludedir)/rawfiles.h \ $(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h \ $(swincludedir)/rawld4.h $(swincludedir)/rawstr.h \ $(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \ - $(swincludedir)/rawverse.h \ + $(swincludedir)/rawtext4.h $(swincludedir)/rawverse.h \ + $(swincludedir)/rawverse4.h \ $(swincludedir)/internal/regex/regex.h $(swincludedir)/roman.h \ $(swincludedir)/rtfhtml.h $(swincludedir)/sapphire.h \ - $(swincludedir)/strkey.h $(swincludedir)/swbasicfilter.h \ - $(swincludedir)/swbuf.h $(swincludedir)/swcacher.h \ - $(swincludedir)/swcipher.h $(swincludedir)/swcom.h \ - $(swincludedir)/swcomprs.h $(swincludedir)/swconfig.h \ - $(swincludedir)/swdisp.h $(swincludedir)/swfilter.h \ - $(swincludedir)/swfiltermgr.h $(swincludedir)/swgenbook.h \ - $(swincludedir)/swinputmeth.h $(swincludedir)/swkey.h \ - $(swincludedir)/swld.h $(swincludedir)/swlocale.h \ - $(swincludedir)/swlog.h $(swincludedir)/swmacs.h \ - $(swincludedir)/swmgr.h $(swincludedir)/stringmgr.h \ - $(swincludedir)/swmodule.h $(swincludedir)/swoptfilter.h \ - $(swincludedir)/swobject.h $(swincludedir)/swsearchable.h \ - $(swincludedir)/swtext.h $(swincludedir)/swunicod.h \ + $(swincludedir)/scsuutf8.h $(swincludedir)/strkey.h \ + $(swincludedir)/swbasicfilter.h $(swincludedir)/swbuf.h \ + $(swincludedir)/swcacher.h $(swincludedir)/swcipher.h \ + $(swincludedir)/swcom.h $(swincludedir)/swcomprs.h \ + $(swincludedir)/swconfig.h $(swincludedir)/swdisp.h \ + $(swincludedir)/swfilter.h $(swincludedir)/swfiltermgr.h \ + $(swincludedir)/swgenbook.h $(swincludedir)/swinputmeth.h \ + $(swincludedir)/swkey.h $(swincludedir)/swld.h \ + $(swincludedir)/swlocale.h $(swincludedir)/swlog.h \ + $(swincludedir)/swmacs.h $(swincludedir)/swmgr.h \ + $(swincludedir)/stringmgr.h $(swincludedir)/swmodule.h \ + $(swincludedir)/swoptfilter.h $(swincludedir)/swobject.h \ + $(swincludedir)/swsearchable.h $(swincludedir)/swtext.h \ $(swincludedir)/swversion.h $(swincludedir)/sysdata.h \ $(swincludedir)/thmlfootnotes.h $(swincludedir)/thmlgbf.h \ $(swincludedir)/thmlheadings.h $(swincludedir)/thmlhtml.h \ - $(swincludedir)/thmlhtmlhref.h $(swincludedir)/thmlwebif.h \ - $(swincludedir)/thmllemma.h $(swincludedir)/thmlmorph.h \ - $(swincludedir)/thmlosis.h $(swincludedir)/thmlplain.h \ - $(swincludedir)/thmlrtf.h $(swincludedir)/thmlscripref.h \ - $(swincludedir)/thmlstrongs.h $(swincludedir)/thmlvariants.h \ - $(swincludedir)/thmlwordjs.h $(swincludedir)/teiplain.h \ - $(swincludedir)/teirtf.h $(swincludedir)/teihtmlhref.h \ + $(swincludedir)/thmlxhtml.h $(swincludedir)/thmlhtmlhref.h \ + $(swincludedir)/thmlwebif.h $(swincludedir)/thmllemma.h \ + $(swincludedir)/thmlmorph.h $(swincludedir)/thmlosis.h \ + $(swincludedir)/thmlplain.h $(swincludedir)/thmlrtf.h \ + $(swincludedir)/thmlscripref.h $(swincludedir)/thmlstrongs.h \ + $(swincludedir)/thmlvariants.h $(swincludedir)/thmlwordjs.h \ + $(swincludedir)/teiplain.h $(swincludedir)/teirtf.h \ + $(swincludedir)/teixhtml.h $(swincludedir)/teihtmlhref.h \ $(swincludedir)/treekey.h $(swincludedir)/treekeyidx.h \ $(swincludedir)/unicodertf.h $(swincludedir)/url.h \ $(swincludedir)/untgz.h $(swincludedir)/utf16utf8.h \ @@ -333,24 +427,44 @@ am__pkginclude_HEADERS_DIST = $(swincludedir)/Greek2Greek.h \ $(swincludedir)/utf8utf16.h $(swincludedir)/utilstr.h \ $(swincludedir)/utilxml.h $(swincludedir)/versekey.h \ $(swincludedir)/versetreekey.h $(swincludedir)/zcom.h \ - $(swincludedir)/zconf.h $(swincludedir)/zipcomprs.h \ - $(swincludedir)/zld.h $(swincludedir)/zstr.h \ - $(swincludedir)/ztext.h $(swincludedir)/zverse.h \ - $(swincludedir)/canon_kjva.h $(swincludedir)/canon_leningrad.h \ - $(swincludedir)/canon_mt.h $(swincludedir)/canon_nrsv.h \ - $(swincludedir)/canon_nrsva.h $(swincludedir)/canon_synodal.h \ + $(swincludedir)/zipcomprs.h $(swincludedir)/zld.h \ + $(swincludedir)/zstr.h $(swincludedir)/ztext.h \ + $(swincludedir)/zverse.h $(swincludedir)/canon_kjva.h \ + $(swincludedir)/canon_leningrad.h $(swincludedir)/canon_mt.h \ + $(swincludedir)/canon_nrsv.h $(swincludedir)/canon_nrsva.h \ + $(swincludedir)/canon_synodal.h \ + $(swincludedir)/canon_synodalprot.h \ $(swincludedir)/canon_vulg.h $(swincludedir)/canon_german.h \ $(swincludedir)/canon_luther.h \ $(swincludedir)/canon_catholic.h \ - $(swincludedir)/canon_catholic2.h \ - $(swincludedir)/canon_synodalp.h $(swincludedir)/canon_null.h + $(swincludedir)/canon_catholic2.h $(swincludedir)/canon_lxx.h \ + $(swincludedir)/canon_orthodox.h $(swincludedir)/canon_null.h HEADERS = $(pkginclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ $(am__append_2) +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -360,6 +474,8 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@ +CLUCENE2_LIBS = @CLUCENE2_LIBS@ CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@ CLUCENE_LIBS = @CLUCENE_LIBS@ CPP = @CPP@ @@ -385,9 +501,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GENCCODE = @GENCCODE@ -GENCMN = @GENCMN@ -GENRB = @GENRB@ GREP = @GREP@ ICU_CONFIG = @ICU_CONFIG@ ICU_IOLIBS = @ICU_IOLIBS@ @@ -408,6 +521,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -420,20 +534,29 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGDATA = @PKGDATA@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@ +SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@ +SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@ +SWORD_VERSION_NANO = @SWORD_VERSION_NANO@ +SWORD_VERSION_NUM = @SWORD_VERSION_NUM@ +SWORD_VERSION_STR = @SWORD_VERSION_STR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -470,7 +593,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -509,29 +631,29 @@ libsword_la_SOURCES = $(keysdir)/swkey.cpp $(keysdir)/listkey.cpp \ $(keysdir)/treekeyidx.cpp $(keysdir)/versekey.cpp \ $(keysdir)/versetreekey.cpp $(utilfunsdir)/swobject.cpp \ $(utilfunsdir)/utilstr.cpp $(utilfunsdir)/utilxml.cpp \ - $(utilfunsdir)/swunicod.cpp $(utilfunsdir)/swversion.cpp \ - $(utilfunsdir)/swbuf.cpp $(utilfunsdir)/ftpparse.c \ - $(utilfunsdir)/url.cpp $(UNTGZ) $(ftpsrc) $(SWREGEX) \ - $(utilfunsdir)/roman.cpp $(FTP_SOURCES) $(mgrdir)/swconfig.cpp \ - $(mgrdir)/swmgr.cpp $(mgrdir)/swfiltermgr.cpp \ - $(mgrdir)/encfiltmgr.cpp $(mgrdir)/markupfiltmgr.cpp \ - $(mgrdir)/filemgr.cpp $(mgrdir)/versemgr.cpp \ - $(mgrdir)/ftptrans.cpp $(mgrdir)/swlocale.cpp \ - $(mgrdir)/localemgr.cpp $(mgrdir)/swcacher.cpp \ - $(mgrdir)/swsearchable.cpp $(mgrdir)/installmgr.cpp \ - $(mgrdir)/stringmgr.cpp $(frontenddir)/swdisp.cpp \ - $(frontenddir)/swlog.cpp $(modulesdir)/swmodule.cpp \ - $(commondir)/rawstr.cpp $(commondir)/rawstr4.cpp \ - $(commondir)/swcomprs.cpp $(commondir)/lzsscomprs.cpp \ - $(SWZLIB) $(commondir)/rawverse.cpp $(commondir)/rawverse4.cpp \ + $(utilfunsdir)/swversion.cpp $(utilfunsdir)/swbuf.cpp \ + $(utilfunsdir)/ftpparse.c $(utilfunsdir)/url.cpp $(UNTGZ) \ + $(ftpsrc) $(SWREGEX) $(utilfunsdir)/roman.cpp $(FTP_SOURCES) \ + $(mgrdir)/swconfig.cpp $(mgrdir)/swmgr.cpp \ + $(mgrdir)/swfiltermgr.cpp $(mgrdir)/encfiltmgr.cpp \ + $(mgrdir)/markupfiltmgr.cpp $(mgrdir)/filemgr.cpp \ + $(mgrdir)/versificationmgr.cpp $(mgrdir)/remotetrans.cpp \ + $(mgrdir)/swlocale.cpp $(mgrdir)/localemgr.cpp \ + $(mgrdir)/swcacher.cpp $(mgrdir)/swsearchable.cpp \ + $(mgrdir)/installmgr.cpp $(mgrdir)/stringmgr.cpp \ + $(frontenddir)/swdisp.cpp $(frontenddir)/swlog.cpp \ + $(modulesdir)/swmodule.cpp $(commondir)/rawstr.cpp \ + $(commondir)/rawstr4.cpp $(commondir)/swcomprs.cpp \ + $(commondir)/lzsscomprs.cpp $(SWZLIB) \ + $(commondir)/rawverse.cpp $(commondir)/rawverse4.cpp \ $(commondir)/swcipher.cpp $(commondir)/zverse.cpp \ $(commondir)/zstr.cpp $(commondir)/entriesblk.cpp \ $(commondir)/sapphire.cpp $(filtersdir)/swbasicfilter.cpp \ $(filtersdir)/swoptfilter.cpp $(filtersdir)/latin1utf8.cpp \ $(filtersdir)/latin1utf16.cpp $(filtersdir)/utf8utf16.cpp \ $(filtersdir)/utf16utf8.cpp $(filtersdir)/utf8html.cpp \ - $(filtersdir)/utf8latin1.cpp \ - $(filtersdir)/utf8cantillation.cpp \ + $(filtersdir)/utf8latin1.cpp $(filtersdir)/unicodertf.cpp \ + $(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8cantillation.cpp \ $(filtersdir)/utf8hebrewpoints.cpp \ $(filtersdir)/utf8arabicpoints.cpp \ $(filtersdir)/utf8greekaccents.cpp $(filtersdir)/cipherfil.cpp \ @@ -566,12 +688,15 @@ frontenddir = $(top_srcdir)/src/frontend modulesdir = $(top_srcdir)/src/modules commondir = $(top_srcdir)/src/modules/common @HAVE_LIBZ_FALSE@SWZLIB = -@HAVE_LIBZ_TRUE@SWZLIB = $(commondir)/zipcomprs.cpp +@HAVE_LIBZ_TRUE@SWZLIB = $(commondir)/zipcomprs.cpp \ +@HAVE_LIBZ_TRUE@ $(commondir)/bz2comprs.cpp \ +@HAVE_LIBZ_TRUE@ $(commondir)/xzcomprs.cpp filtersdir = $(top_srcdir)/src/modules/filters GBFFIL = $(filtersdir)/gbfhtml.cpp $(filtersdir)/gbfhtmlhref.cpp \ - $(filtersdir)/gbfwebif.cpp $(filtersdir)/gbfplain.cpp \ - $(filtersdir)/gbfrtf.cpp $(filtersdir)/gbfstrongs.cpp \ - $(filtersdir)/gbffootnotes.cpp $(filtersdir)/gbfheadings.cpp \ + $(filtersdir)/gbfxhtml.cpp $(filtersdir)/gbfwebif.cpp \ + $(filtersdir)/gbfplain.cpp $(filtersdir)/gbfrtf.cpp \ + $(filtersdir)/gbfstrongs.cpp $(filtersdir)/gbffootnotes.cpp \ + $(filtersdir)/gbfheadings.cpp \ $(filtersdir)/gbfredletterwords.cpp $(filtersdir)/gbfmorph.cpp \ $(filtersdir)/gbfwordjs.cpp THMLFIL = $(filtersdir)/thmlstrongs.cpp \ @@ -580,25 +705,28 @@ THMLFIL = $(filtersdir)/thmlstrongs.cpp \ $(filtersdir)/thmlscripref.cpp $(filtersdir)/thmlvariants.cpp \ $(filtersdir)/thmlgbf.cpp $(filtersdir)/thmlrtf.cpp \ $(filtersdir)/thmlhtml.cpp $(filtersdir)/thmlhtmlhref.cpp \ - $(filtersdir)/thmlwebif.cpp $(filtersdir)/thmlwordjs.cpp + $(filtersdir)/thmlxhtml.cpp $(filtersdir)/thmlwebif.cpp \ + $(filtersdir)/thmlwordjs.cpp TEIFIL = $(filtersdir)/teiplain.cpp $(filtersdir)/teirtf.cpp \ - $(filtersdir)/teihtmlhref.cpp + $(filtersdir)/teihtmlhref.cpp $(filtersdir)/teixhtml.cpp CONVFIL = $(filtersdir)/gbfthml.cpp $(filtersdir)/gbfosis.cpp \ $(filtersdir)/thmlosis.cpp $(filtersdir)/thmlplain.cpp \ $(filtersdir)/osisosis.cpp OSISFIL = $(filtersdir)/osisheadings.cpp \ $(filtersdir)/osisfootnotes.cpp $(filtersdir)/osishtmlhref.cpp \ - $(filtersdir)/osiswebif.cpp $(filtersdir)/osismorph.cpp \ - $(filtersdir)/osisstrongs.cpp $(filtersdir)/osisplain.cpp \ - $(filtersdir)/osisrtf.cpp $(filtersdir)/osislemma.cpp \ + $(filtersdir)/osisxhtml.cpp $(filtersdir)/osiswebif.cpp \ + $(filtersdir)/osismorph.cpp $(filtersdir)/osisstrongs.cpp \ + $(filtersdir)/osisplain.cpp $(filtersdir)/osisrtf.cpp \ + $(filtersdir)/osislemma.cpp \ $(filtersdir)/osisredletterwords.cpp \ $(filtersdir)/osisscripref.cpp $(filtersdir)/osisvariants.cpp \ $(filtersdir)/osiswordjs.cpp \ $(filtersdir)/osismorphsegmentation.cpp \ - $(filtersdir)/osisruby.cpp -PLFIL = $(filtersdir)/rtfhtml.cpp $(filtersdir)/plainfootnotes.cpp \ - $(filtersdir)/plainhtml.cpp $(filtersdir)/greeklexattribs.cpp \ - $(filtersdir)/unicodertf.cpp $(filtersdir)/papyriplain.cpp + $(filtersdir)/osisglosses.cpp $(filtersdir)/osisenum.cpp \ + $(filtersdir)/osisxlit.cpp \ + $(filtersdir)/osisreferencelinks.cpp +PLFIL = $(filtersdir)/rtfhtml.cpp $(filtersdir)/greeklexattribs.cpp \ + $(filtersdir)/papyriplain.cpp SWICUSRC = $(filtersdir)/utf8transliterator.cpp \ $(filtersdir)/utf8nfc.cpp $(filtersdir)/utf8nfkd.cpp \ $(filtersdir)/utf8arshaping.cpp \ @@ -630,30 +758,31 @@ zlddir = $(top_srcdir)/src/modules/lexdict/zld #include ../bindings/Makefile.am bindingsdir = $(top_srcdir)/bindings swincludedir = $(top_srcdir)/include -pkginclude_HEADERS = $(swincludedir)/Greek2Greek.h \ - $(swincludedir)/GreekChars.h $(swincludedir)/canon.h \ +pkginclude_HEADERS = $(swincludedir)/canon.h \ $(swincludedir)/canon_abbrevs.h $(swincludedir)/cipherfil.h \ $(swincludedir)/curlftpt.h $(swincludedir)/curlhttpt.h \ $(swincludedir)/defs.h $(swincludedir)/echomod.h \ $(swincludedir)/encfiltmgr.h $(swincludedir)/entriesblk.h \ $(swincludedir)/femain.h $(swincludedir)/filemgr.h \ - $(swincludedir)/versemgr.h $(swincludedir)/flatapi.h \ - $(swincludedir)/ftpparse.h $(swincludedir)/ftptrans.h \ + $(swincludedir)/versificationmgr.h $(swincludedir)/flatapi.h \ + $(swincludedir)/ftpparse.h $(swincludedir)/remotetrans.h \ $(swincludedir)/ftplibftpt.h $(swincludedir)/ftplib.h \ $(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h \ - $(swincludedir)/gbfhtml.h $(swincludedir)/gbfhtmlhref.h \ - $(swincludedir)/gbfwebif.h $(swincludedir)/gbfmorph.h \ - $(swincludedir)/gbfosis.h $(swincludedir)/gbfplain.h \ - $(swincludedir)/gbfredletterwords.h $(swincludedir)/gbfrtf.h \ - $(swincludedir)/gbfstrongs.h $(swincludedir)/gbfwordjs.h \ - $(swincludedir)/gbfthml.h $(swincludedir)/greeklexattribs.h \ - $(swincludedir)/hebrewmcim.h $(swincludedir)/hrefcom.h \ - $(swincludedir)/installmgr.h $(swincludedir)/latin1utf16.h \ - $(swincludedir)/latin1utf8.h $(swincludedir)/listkey.h \ - $(swincludedir)/localemgr.h $(swincludedir)/lzsscomprs.h \ - $(swincludedir)/markupfiltmgr.h $(swincludedir)/multimapwdef.h \ - $(swincludedir)/nullim.h $(swincludedir)/osisheadings.h \ - $(swincludedir)/osishtmlhref.h $(swincludedir)/osiswebif.h \ + $(swincludedir)/gbfhtml.h $(swincludedir)/gbfxhtml.h \ + $(swincludedir)/gbfhtmlhref.h $(swincludedir)/gbfwebif.h \ + $(swincludedir)/gbfmorph.h $(swincludedir)/gbfosis.h \ + $(swincludedir)/gbfplain.h $(swincludedir)/gbfredletterwords.h \ + $(swincludedir)/gbfrtf.h $(swincludedir)/gbfstrongs.h \ + $(swincludedir)/gbfwordjs.h $(swincludedir)/gbfthml.h \ + $(swincludedir)/greeklexattribs.h $(swincludedir)/hebrewmcim.h \ + $(swincludedir)/hrefcom.h $(swincludedir)/installmgr.h \ + $(swincludedir)/latin1utf16.h $(swincludedir)/latin1utf8.h \ + $(swincludedir)/listkey.h $(swincludedir)/localemgr.h \ + $(swincludedir)/lzsscomprs.h $(swincludedir)/markupfiltmgr.h \ + $(swincludedir)/multimapwdef.h $(swincludedir)/nullim.h \ + $(swincludedir)/osisglosses.h $(swincludedir)/osisenum.h \ + $(swincludedir)/osisheadings.h $(swincludedir)/osishtmlhref.h \ + $(swincludedir)/osisxhtml.h $(swincludedir)/osiswebif.h \ $(swincludedir)/osismorph.h \ $(swincludedir)/osismorphsegmentation.h \ $(swincludedir)/osisplain.h $(swincludedir)/osisrtf.h \ @@ -661,37 +790,39 @@ pkginclude_HEADERS = $(swincludedir)/Greek2Greek.h \ $(swincludedir)/osisfootnotes.h $(swincludedir)/osislemma.h \ $(swincludedir)/osisredletterwords.h \ $(swincludedir)/osisscripref.h $(swincludedir)/osiswordjs.h \ - $(swincludedir)/osisvariants.h $(swincludedir)/papyriplain.h \ - $(swincludedir)/plainfootnotes.h $(swincludedir)/plainhtml.h \ - $(swincludedir)/rawcom.h $(swincludedir)/rawfiles.h \ + $(swincludedir)/osisvariants.h $(swincludedir)/osisxlit.h \ + $(swincludedir)/papyriplain.h $(swincludedir)/rawcom.h \ + $(swincludedir)/rawcom4.h $(swincludedir)/rawfiles.h \ $(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h \ $(swincludedir)/rawld4.h $(swincludedir)/rawstr.h \ $(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \ - $(swincludedir)/rawverse.h $(am__append_3) \ + $(swincludedir)/rawtext4.h $(swincludedir)/rawverse.h \ + $(swincludedir)/rawverse4.h $(am__append_3) \ $(swincludedir)/roman.h $(swincludedir)/rtfhtml.h \ - $(swincludedir)/sapphire.h $(swincludedir)/strkey.h \ - $(swincludedir)/swbasicfilter.h $(swincludedir)/swbuf.h \ - $(swincludedir)/swcacher.h $(swincludedir)/swcipher.h \ - $(swincludedir)/swcom.h $(swincludedir)/swcomprs.h \ - $(swincludedir)/swconfig.h $(swincludedir)/swdisp.h \ - $(swincludedir)/swfilter.h $(swincludedir)/swfiltermgr.h \ - $(swincludedir)/swgenbook.h $(swincludedir)/swinputmeth.h \ - $(swincludedir)/swkey.h $(swincludedir)/swld.h \ - $(swincludedir)/swlocale.h $(swincludedir)/swlog.h \ - $(swincludedir)/swmacs.h $(swincludedir)/swmgr.h \ - $(swincludedir)/stringmgr.h $(swincludedir)/swmodule.h \ - $(swincludedir)/swoptfilter.h $(swincludedir)/swobject.h \ - $(swincludedir)/swsearchable.h $(swincludedir)/swtext.h \ - $(swincludedir)/swunicod.h $(swincludedir)/swversion.h \ + $(swincludedir)/sapphire.h $(swincludedir)/scsuutf8.h \ + $(swincludedir)/strkey.h $(swincludedir)/swbasicfilter.h \ + $(swincludedir)/swbuf.h $(swincludedir)/swcacher.h \ + $(swincludedir)/swcipher.h $(swincludedir)/swcom.h \ + $(swincludedir)/swcomprs.h $(swincludedir)/swconfig.h \ + $(swincludedir)/swdisp.h $(swincludedir)/swfilter.h \ + $(swincludedir)/swfiltermgr.h $(swincludedir)/swgenbook.h \ + $(swincludedir)/swinputmeth.h $(swincludedir)/swkey.h \ + $(swincludedir)/swld.h $(swincludedir)/swlocale.h \ + $(swincludedir)/swlog.h $(swincludedir)/swmacs.h \ + $(swincludedir)/swmgr.h $(swincludedir)/stringmgr.h \ + $(swincludedir)/swmodule.h $(swincludedir)/swoptfilter.h \ + $(swincludedir)/swobject.h $(swincludedir)/swsearchable.h \ + $(swincludedir)/swtext.h $(swincludedir)/swversion.h \ $(swincludedir)/sysdata.h $(swincludedir)/thmlfootnotes.h \ $(swincludedir)/thmlgbf.h $(swincludedir)/thmlheadings.h \ - $(swincludedir)/thmlhtml.h $(swincludedir)/thmlhtmlhref.h \ - $(swincludedir)/thmlwebif.h $(swincludedir)/thmllemma.h \ - $(swincludedir)/thmlmorph.h $(swincludedir)/thmlosis.h \ - $(swincludedir)/thmlplain.h $(swincludedir)/thmlrtf.h \ - $(swincludedir)/thmlscripref.h $(swincludedir)/thmlstrongs.h \ - $(swincludedir)/thmlvariants.h $(swincludedir)/thmlwordjs.h \ - $(swincludedir)/teiplain.h $(swincludedir)/teirtf.h \ + $(swincludedir)/thmlhtml.h $(swincludedir)/thmlxhtml.h \ + $(swincludedir)/thmlhtmlhref.h $(swincludedir)/thmlwebif.h \ + $(swincludedir)/thmllemma.h $(swincludedir)/thmlmorph.h \ + $(swincludedir)/thmlosis.h $(swincludedir)/thmlplain.h \ + $(swincludedir)/thmlrtf.h $(swincludedir)/thmlscripref.h \ + $(swincludedir)/thmlstrongs.h $(swincludedir)/thmlvariants.h \ + $(swincludedir)/thmlwordjs.h $(swincludedir)/teiplain.h \ + $(swincludedir)/teirtf.h $(swincludedir)/teixhtml.h \ $(swincludedir)/teihtmlhref.h $(swincludedir)/treekey.h \ $(swincludedir)/treekeyidx.h $(swincludedir)/unicodertf.h \ $(swincludedir)/url.h $(swincludedir)/untgz.h \ @@ -707,17 +838,18 @@ pkginclude_HEADERS = $(swincludedir)/Greek2Greek.h \ $(swincludedir)/utf8utf16.h $(swincludedir)/utilstr.h \ $(swincludedir)/utilxml.h $(swincludedir)/versekey.h \ $(swincludedir)/versetreekey.h $(swincludedir)/zcom.h \ - $(swincludedir)/zconf.h $(swincludedir)/zipcomprs.h \ - $(swincludedir)/zld.h $(swincludedir)/zstr.h \ - $(swincludedir)/ztext.h $(swincludedir)/zverse.h \ - $(swincludedir)/canon_kjva.h $(swincludedir)/canon_leningrad.h \ - $(swincludedir)/canon_mt.h $(swincludedir)/canon_nrsv.h \ - $(swincludedir)/canon_nrsva.h $(swincludedir)/canon_synodal.h \ + $(swincludedir)/zipcomprs.h $(swincludedir)/zld.h \ + $(swincludedir)/zstr.h $(swincludedir)/ztext.h \ + $(swincludedir)/zverse.h $(swincludedir)/canon_kjva.h \ + $(swincludedir)/canon_leningrad.h $(swincludedir)/canon_mt.h \ + $(swincludedir)/canon_nrsv.h $(swincludedir)/canon_nrsva.h \ + $(swincludedir)/canon_synodal.h \ + $(swincludedir)/canon_synodalprot.h \ $(swincludedir)/canon_vulg.h $(swincludedir)/canon_german.h \ $(swincludedir)/canon_luther.h \ $(swincludedir)/canon_catholic.h \ - $(swincludedir)/canon_catholic2.h \ - $(swincludedir)/canon_synodalp.h $(swincludedir)/canon_null.h + $(swincludedir)/canon_catholic2.h $(swincludedir)/canon_lxx.h \ + $(swincludedir)/canon_orthodox.h $(swincludedir)/canon_null.h all: all-am .SUFFIXES: @@ -743,6 +875,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/../src/keys/Makefile.am $(srcdir)/../src/utilfuns/Makefile.am $(srcdir)/../src/mgr/Makefile.am $(srcdir)/../src/frontend/Makefile.am $(srcdir)/../src/modules/Makefile.am $(srcdir)/../src/modules/common/Makefile.am $(srcdir)/../src/modules/filters/Makefile.am $(srcdir)/../src/modules/genbook/Makefile.am $(srcdir)/../src/modules/genbook/rawgenbook/Makefile.am $(srcdir)/../src/modules/texts/Makefile.am $(srcdir)/../src/modules/texts/rawtext/Makefile.am $(srcdir)/../src/modules/texts/rawtext4/Makefile.am $(srcdir)/../src/modules/texts/ztext/Makefile.am $(srcdir)/../src/modules/comments/Makefile.am $(srcdir)/../src/modules/comments/rawcom/Makefile.am $(srcdir)/../src/modules/comments/rawcom4/Makefile.am $(srcdir)/../src/modules/comments/rawfiles/Makefile.am $(srcdir)/../src/modules/comments/zcom/Makefile.am $(srcdir)/../src/modules/comments/hrefcom/Makefile.am $(srcdir)/../src/modules/lexdict/Makefile.am $(srcdir)/../src/modules/lexdict/rawld/Makefile.am $(srcdir)/../src/modules/lexdict/rawld4/Makefile.am $(srcdir)/../src/modules/lexdict/zld/Makefile.am $(srcdir)/../include/Makefile.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -752,9 +885,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -762,6 +895,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -777,14 +912,17 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libsword.la: $(libsword_la_OBJECTS) $(libsword_la_DEPENDENCIES) - $(libsword_la_LINK) -rpath $(libdir) $(libsword_la_OBJECTS) $(libsword_la_LIBADD) $(LIBS) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libsword.la: $(libsword_la_OBJECTS) $(libsword_la_DEPENDENCIES) $(EXTRA_libsword_la_DEPENDENCIES) + $(AM_V_CXXLD)$(libsword_la_LINK) -rpath $(libdir) $(libsword_la_OBJECTS) $(libsword_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -792,6 +930,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bz2comprs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipherfil.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curlftpt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curlhttpt.Plo@am__quote@ @@ -802,7 +941,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftplib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftplibftpt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftpparse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftptrans.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbffootnotes.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfheadings.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfhtml.Plo@am__quote@ @@ -816,6 +954,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfthml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfwebif.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfwordjs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfxhtml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/greeklexattribs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hrefcom.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/installmgr.Plo@am__quote@ @@ -825,7 +964,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localemgr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzsscomprs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markupfiltmgr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisenum.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisfootnotes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisglosses.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisheadings.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osishtmlhref.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osislemma.Plo@am__quote@ @@ -834,16 +975,16 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisosis.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisplain.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisredletterwords.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisreferencelinks.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisrtf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisruby.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisscripref.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisstrongs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisvariants.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osiswebif.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osiswordjs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisxhtml.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisxlit.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/papyriplain.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plainfootnotes.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plainhtml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawcom.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawcom4.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawfiles.Plo@am__quote@ @@ -857,9 +998,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawverse.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawverse4.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remotetrans.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/roman.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtfhtml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sapphire.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsuutf8.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringmgr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strkey.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swbasicfilter.Plo@am__quote@ @@ -882,11 +1025,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swoptfilter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swsearchable.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swtext.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swunicod.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swversion.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teihtmlhref.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teiplain.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teirtf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teixhtml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlfootnotes.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlgbf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlheadings.Plo@am__quote@ @@ -902,6 +1045,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlvariants.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlwebif.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlwordjs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlxhtml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treekey.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treekeyidx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicodertf.Plo@am__quote@ @@ -923,8 +1067,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilstr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilxml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versekey.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versemgr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versetreekey.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versificationmgr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xzcomprs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zcom.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zipcomprs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zld.Plo@am__quote@ @@ -933,1019 +1078,1068 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zverse.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< ftpparse.lo: $(utilfunsdir)/ftpparse.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ftpparse.lo -MD -MP -MF $(DEPDIR)/ftpparse.Tpo -c -o ftpparse.lo `test -f '$(utilfunsdir)/ftpparse.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftpparse.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ftpparse.Tpo $(DEPDIR)/ftpparse.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(utilfunsdir)/ftpparse.c' object='ftpparse.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ftpparse.lo -MD -MP -MF $(DEPDIR)/ftpparse.Tpo -c -o ftpparse.lo `test -f '$(utilfunsdir)/ftpparse.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftpparse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ftpparse.Tpo $(DEPDIR)/ftpparse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(utilfunsdir)/ftpparse.c' object='ftpparse.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ftpparse.lo `test -f '$(utilfunsdir)/ftpparse.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftpparse.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ftpparse.lo `test -f '$(utilfunsdir)/ftpparse.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftpparse.c untgz.lo: $(utilfunsdir)/zlib/untgz.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT untgz.lo -MD -MP -MF $(DEPDIR)/untgz.Tpo -c -o untgz.lo `test -f '$(utilfunsdir)/zlib/untgz.c' || echo '$(srcdir)/'`$(utilfunsdir)/zlib/untgz.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/untgz.Tpo $(DEPDIR)/untgz.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(utilfunsdir)/zlib/untgz.c' object='untgz.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT untgz.lo -MD -MP -MF $(DEPDIR)/untgz.Tpo -c -o untgz.lo `test -f '$(utilfunsdir)/zlib/untgz.c' || echo '$(srcdir)/'`$(utilfunsdir)/zlib/untgz.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/untgz.Tpo $(DEPDIR)/untgz.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(utilfunsdir)/zlib/untgz.c' object='untgz.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o untgz.lo `test -f '$(utilfunsdir)/zlib/untgz.c' || echo '$(srcdir)/'`$(utilfunsdir)/zlib/untgz.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o untgz.lo `test -f '$(utilfunsdir)/zlib/untgz.c' || echo '$(srcdir)/'`$(utilfunsdir)/zlib/untgz.c ftplib.lo: $(utilfunsdir)/ftplib.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ftplib.lo -MD -MP -MF $(DEPDIR)/ftplib.Tpo -c -o ftplib.lo `test -f '$(utilfunsdir)/ftplib.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftplib.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ftplib.Tpo $(DEPDIR)/ftplib.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(utilfunsdir)/ftplib.c' object='ftplib.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ftplib.lo -MD -MP -MF $(DEPDIR)/ftplib.Tpo -c -o ftplib.lo `test -f '$(utilfunsdir)/ftplib.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftplib.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ftplib.Tpo $(DEPDIR)/ftplib.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(utilfunsdir)/ftplib.c' object='ftplib.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ftplib.lo `test -f '$(utilfunsdir)/ftplib.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftplib.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ftplib.lo `test -f '$(utilfunsdir)/ftplib.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftplib.c regex.lo: $(utilfunsdir)/regex.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regex.lo -MD -MP -MF $(DEPDIR)/regex.Tpo -c -o regex.lo `test -f '$(utilfunsdir)/regex.c' || echo '$(srcdir)/'`$(utilfunsdir)/regex.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/regex.Tpo $(DEPDIR)/regex.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(utilfunsdir)/regex.c' object='regex.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regex.lo -MD -MP -MF $(DEPDIR)/regex.Tpo -c -o regex.lo `test -f '$(utilfunsdir)/regex.c' || echo '$(srcdir)/'`$(utilfunsdir)/regex.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regex.Tpo $(DEPDIR)/regex.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(utilfunsdir)/regex.c' object='regex.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regex.lo `test -f '$(utilfunsdir)/regex.c' || echo '$(srcdir)/'`$(utilfunsdir)/regex.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regex.lo `test -f '$(utilfunsdir)/regex.c' || echo '$(srcdir)/'`$(utilfunsdir)/regex.c .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< swkey.lo: $(keysdir)/swkey.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swkey.lo -MD -MP -MF $(DEPDIR)/swkey.Tpo -c -o swkey.lo `test -f '$(keysdir)/swkey.cpp' || echo '$(srcdir)/'`$(keysdir)/swkey.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swkey.Tpo $(DEPDIR)/swkey.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(keysdir)/swkey.cpp' object='swkey.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swkey.lo -MD -MP -MF $(DEPDIR)/swkey.Tpo -c -o swkey.lo `test -f '$(keysdir)/swkey.cpp' || echo '$(srcdir)/'`$(keysdir)/swkey.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swkey.Tpo $(DEPDIR)/swkey.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(keysdir)/swkey.cpp' object='swkey.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swkey.lo `test -f '$(keysdir)/swkey.cpp' || echo '$(srcdir)/'`$(keysdir)/swkey.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swkey.lo `test -f '$(keysdir)/swkey.cpp' || echo '$(srcdir)/'`$(keysdir)/swkey.cpp listkey.lo: $(keysdir)/listkey.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT listkey.lo -MD -MP -MF $(DEPDIR)/listkey.Tpo -c -o listkey.lo `test -f '$(keysdir)/listkey.cpp' || echo '$(srcdir)/'`$(keysdir)/listkey.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/listkey.Tpo $(DEPDIR)/listkey.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(keysdir)/listkey.cpp' object='listkey.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT listkey.lo -MD -MP -MF $(DEPDIR)/listkey.Tpo -c -o listkey.lo `test -f '$(keysdir)/listkey.cpp' || echo '$(srcdir)/'`$(keysdir)/listkey.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/listkey.Tpo $(DEPDIR)/listkey.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(keysdir)/listkey.cpp' object='listkey.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o listkey.lo `test -f '$(keysdir)/listkey.cpp' || echo '$(srcdir)/'`$(keysdir)/listkey.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o listkey.lo `test -f '$(keysdir)/listkey.cpp' || echo '$(srcdir)/'`$(keysdir)/listkey.cpp strkey.lo: $(keysdir)/strkey.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT strkey.lo -MD -MP -MF $(DEPDIR)/strkey.Tpo -c -o strkey.lo `test -f '$(keysdir)/strkey.cpp' || echo '$(srcdir)/'`$(keysdir)/strkey.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/strkey.Tpo $(DEPDIR)/strkey.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(keysdir)/strkey.cpp' object='strkey.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT strkey.lo -MD -MP -MF $(DEPDIR)/strkey.Tpo -c -o strkey.lo `test -f '$(keysdir)/strkey.cpp' || echo '$(srcdir)/'`$(keysdir)/strkey.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/strkey.Tpo $(DEPDIR)/strkey.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(keysdir)/strkey.cpp' object='strkey.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o strkey.lo `test -f '$(keysdir)/strkey.cpp' || echo '$(srcdir)/'`$(keysdir)/strkey.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o strkey.lo `test -f '$(keysdir)/strkey.cpp' || echo '$(srcdir)/'`$(keysdir)/strkey.cpp treekey.lo: $(keysdir)/treekey.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT treekey.lo -MD -MP -MF $(DEPDIR)/treekey.Tpo -c -o treekey.lo `test -f '$(keysdir)/treekey.cpp' || echo '$(srcdir)/'`$(keysdir)/treekey.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/treekey.Tpo $(DEPDIR)/treekey.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(keysdir)/treekey.cpp' object='treekey.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT treekey.lo -MD -MP -MF $(DEPDIR)/treekey.Tpo -c -o treekey.lo `test -f '$(keysdir)/treekey.cpp' || echo '$(srcdir)/'`$(keysdir)/treekey.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/treekey.Tpo $(DEPDIR)/treekey.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(keysdir)/treekey.cpp' object='treekey.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o treekey.lo `test -f '$(keysdir)/treekey.cpp' || echo '$(srcdir)/'`$(keysdir)/treekey.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o treekey.lo `test -f '$(keysdir)/treekey.cpp' || echo '$(srcdir)/'`$(keysdir)/treekey.cpp treekeyidx.lo: $(keysdir)/treekeyidx.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT treekeyidx.lo -MD -MP -MF $(DEPDIR)/treekeyidx.Tpo -c -o treekeyidx.lo `test -f '$(keysdir)/treekeyidx.cpp' || echo '$(srcdir)/'`$(keysdir)/treekeyidx.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/treekeyidx.Tpo $(DEPDIR)/treekeyidx.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(keysdir)/treekeyidx.cpp' object='treekeyidx.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT treekeyidx.lo -MD -MP -MF $(DEPDIR)/treekeyidx.Tpo -c -o treekeyidx.lo `test -f '$(keysdir)/treekeyidx.cpp' || echo '$(srcdir)/'`$(keysdir)/treekeyidx.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/treekeyidx.Tpo $(DEPDIR)/treekeyidx.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(keysdir)/treekeyidx.cpp' object='treekeyidx.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o treekeyidx.lo `test -f '$(keysdir)/treekeyidx.cpp' || echo '$(srcdir)/'`$(keysdir)/treekeyidx.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o treekeyidx.lo `test -f '$(keysdir)/treekeyidx.cpp' || echo '$(srcdir)/'`$(keysdir)/treekeyidx.cpp versekey.lo: $(keysdir)/versekey.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT versekey.lo -MD -MP -MF $(DEPDIR)/versekey.Tpo -c -o versekey.lo `test -f '$(keysdir)/versekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versekey.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/versekey.Tpo $(DEPDIR)/versekey.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(keysdir)/versekey.cpp' object='versekey.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT versekey.lo -MD -MP -MF $(DEPDIR)/versekey.Tpo -c -o versekey.lo `test -f '$(keysdir)/versekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versekey.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/versekey.Tpo $(DEPDIR)/versekey.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(keysdir)/versekey.cpp' object='versekey.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o versekey.lo `test -f '$(keysdir)/versekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versekey.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o versekey.lo `test -f '$(keysdir)/versekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versekey.cpp versetreekey.lo: $(keysdir)/versetreekey.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT versetreekey.lo -MD -MP -MF $(DEPDIR)/versetreekey.Tpo -c -o versetreekey.lo `test -f '$(keysdir)/versetreekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versetreekey.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/versetreekey.Tpo $(DEPDIR)/versetreekey.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(keysdir)/versetreekey.cpp' object='versetreekey.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT versetreekey.lo -MD -MP -MF $(DEPDIR)/versetreekey.Tpo -c -o versetreekey.lo `test -f '$(keysdir)/versetreekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versetreekey.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/versetreekey.Tpo $(DEPDIR)/versetreekey.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(keysdir)/versetreekey.cpp' object='versetreekey.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o versetreekey.lo `test -f '$(keysdir)/versetreekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versetreekey.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o versetreekey.lo `test -f '$(keysdir)/versetreekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versetreekey.cpp swobject.lo: $(utilfunsdir)/swobject.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swobject.lo -MD -MP -MF $(DEPDIR)/swobject.Tpo -c -o swobject.lo `test -f '$(utilfunsdir)/swobject.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swobject.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swobject.Tpo $(DEPDIR)/swobject.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(utilfunsdir)/swobject.cpp' object='swobject.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swobject.lo -MD -MP -MF $(DEPDIR)/swobject.Tpo -c -o swobject.lo `test -f '$(utilfunsdir)/swobject.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swobject.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swobject.Tpo $(DEPDIR)/swobject.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(utilfunsdir)/swobject.cpp' object='swobject.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swobject.lo `test -f '$(utilfunsdir)/swobject.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swobject.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swobject.lo `test -f '$(utilfunsdir)/swobject.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swobject.cpp utilstr.lo: $(utilfunsdir)/utilstr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utilstr.lo -MD -MP -MF $(DEPDIR)/utilstr.Tpo -c -o utilstr.lo `test -f '$(utilfunsdir)/utilstr.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilstr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utilstr.Tpo $(DEPDIR)/utilstr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(utilfunsdir)/utilstr.cpp' object='utilstr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utilstr.lo -MD -MP -MF $(DEPDIR)/utilstr.Tpo -c -o utilstr.lo `test -f '$(utilfunsdir)/utilstr.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilstr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utilstr.Tpo $(DEPDIR)/utilstr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(utilfunsdir)/utilstr.cpp' object='utilstr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utilstr.lo `test -f '$(utilfunsdir)/utilstr.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilstr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utilstr.lo `test -f '$(utilfunsdir)/utilstr.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilstr.cpp utilxml.lo: $(utilfunsdir)/utilxml.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utilxml.lo -MD -MP -MF $(DEPDIR)/utilxml.Tpo -c -o utilxml.lo `test -f '$(utilfunsdir)/utilxml.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilxml.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utilxml.Tpo $(DEPDIR)/utilxml.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(utilfunsdir)/utilxml.cpp' object='utilxml.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utilxml.lo `test -f '$(utilfunsdir)/utilxml.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilxml.cpp - -swunicod.lo: $(utilfunsdir)/swunicod.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swunicod.lo -MD -MP -MF $(DEPDIR)/swunicod.Tpo -c -o swunicod.lo `test -f '$(utilfunsdir)/swunicod.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swunicod.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swunicod.Tpo $(DEPDIR)/swunicod.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(utilfunsdir)/swunicod.cpp' object='swunicod.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utilxml.lo -MD -MP -MF $(DEPDIR)/utilxml.Tpo -c -o utilxml.lo `test -f '$(utilfunsdir)/utilxml.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilxml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utilxml.Tpo $(DEPDIR)/utilxml.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(utilfunsdir)/utilxml.cpp' object='utilxml.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swunicod.lo `test -f '$(utilfunsdir)/swunicod.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swunicod.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utilxml.lo `test -f '$(utilfunsdir)/utilxml.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilxml.cpp swversion.lo: $(utilfunsdir)/swversion.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swversion.lo -MD -MP -MF $(DEPDIR)/swversion.Tpo -c -o swversion.lo `test -f '$(utilfunsdir)/swversion.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swversion.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swversion.Tpo $(DEPDIR)/swversion.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(utilfunsdir)/swversion.cpp' object='swversion.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swversion.lo -MD -MP -MF $(DEPDIR)/swversion.Tpo -c -o swversion.lo `test -f '$(utilfunsdir)/swversion.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swversion.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swversion.Tpo $(DEPDIR)/swversion.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(utilfunsdir)/swversion.cpp' object='swversion.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swversion.lo `test -f '$(utilfunsdir)/swversion.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swversion.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swversion.lo `test -f '$(utilfunsdir)/swversion.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swversion.cpp swbuf.lo: $(utilfunsdir)/swbuf.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swbuf.lo -MD -MP -MF $(DEPDIR)/swbuf.Tpo -c -o swbuf.lo `test -f '$(utilfunsdir)/swbuf.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swbuf.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swbuf.Tpo $(DEPDIR)/swbuf.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(utilfunsdir)/swbuf.cpp' object='swbuf.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swbuf.lo -MD -MP -MF $(DEPDIR)/swbuf.Tpo -c -o swbuf.lo `test -f '$(utilfunsdir)/swbuf.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swbuf.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swbuf.Tpo $(DEPDIR)/swbuf.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(utilfunsdir)/swbuf.cpp' object='swbuf.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swbuf.lo `test -f '$(utilfunsdir)/swbuf.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swbuf.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swbuf.lo `test -f '$(utilfunsdir)/swbuf.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swbuf.cpp url.lo: $(utilfunsdir)/url.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT url.lo -MD -MP -MF $(DEPDIR)/url.Tpo -c -o url.lo `test -f '$(utilfunsdir)/url.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/url.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/url.Tpo $(DEPDIR)/url.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(utilfunsdir)/url.cpp' object='url.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT url.lo -MD -MP -MF $(DEPDIR)/url.Tpo -c -o url.lo `test -f '$(utilfunsdir)/url.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/url.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/url.Tpo $(DEPDIR)/url.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(utilfunsdir)/url.cpp' object='url.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o url.lo `test -f '$(utilfunsdir)/url.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/url.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o url.lo `test -f '$(utilfunsdir)/url.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/url.cpp roman.lo: $(utilfunsdir)/roman.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT roman.lo -MD -MP -MF $(DEPDIR)/roman.Tpo -c -o roman.lo `test -f '$(utilfunsdir)/roman.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/roman.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/roman.Tpo $(DEPDIR)/roman.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(utilfunsdir)/roman.cpp' object='roman.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT roman.lo -MD -MP -MF $(DEPDIR)/roman.Tpo -c -o roman.lo `test -f '$(utilfunsdir)/roman.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/roman.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/roman.Tpo $(DEPDIR)/roman.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(utilfunsdir)/roman.cpp' object='roman.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o roman.lo `test -f '$(utilfunsdir)/roman.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/roman.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o roman.lo `test -f '$(utilfunsdir)/roman.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/roman.cpp ftplibftpt.lo: $(mgrdir)/ftplibftpt.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftplibftpt.lo -MD -MP -MF $(DEPDIR)/ftplibftpt.Tpo -c -o ftplibftpt.lo `test -f '$(mgrdir)/ftplibftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/ftplibftpt.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/ftplibftpt.Tpo $(DEPDIR)/ftplibftpt.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/ftplibftpt.cpp' object='ftplibftpt.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftplibftpt.lo -MD -MP -MF $(DEPDIR)/ftplibftpt.Tpo -c -o ftplibftpt.lo `test -f '$(mgrdir)/ftplibftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/ftplibftpt.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ftplibftpt.Tpo $(DEPDIR)/ftplibftpt.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/ftplibftpt.cpp' object='ftplibftpt.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftplibftpt.lo `test -f '$(mgrdir)/ftplibftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/ftplibftpt.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftplibftpt.lo `test -f '$(mgrdir)/ftplibftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/ftplibftpt.cpp curlftpt.lo: $(mgrdir)/curlftpt.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT curlftpt.lo -MD -MP -MF $(DEPDIR)/curlftpt.Tpo -c -o curlftpt.lo `test -f '$(mgrdir)/curlftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlftpt.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/curlftpt.Tpo $(DEPDIR)/curlftpt.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/curlftpt.cpp' object='curlftpt.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT curlftpt.lo -MD -MP -MF $(DEPDIR)/curlftpt.Tpo -c -o curlftpt.lo `test -f '$(mgrdir)/curlftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlftpt.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/curlftpt.Tpo $(DEPDIR)/curlftpt.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/curlftpt.cpp' object='curlftpt.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curlftpt.lo `test -f '$(mgrdir)/curlftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlftpt.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curlftpt.lo `test -f '$(mgrdir)/curlftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlftpt.cpp curlhttpt.lo: $(mgrdir)/curlhttpt.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT curlhttpt.lo -MD -MP -MF $(DEPDIR)/curlhttpt.Tpo -c -o curlhttpt.lo `test -f '$(mgrdir)/curlhttpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlhttpt.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/curlhttpt.Tpo $(DEPDIR)/curlhttpt.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/curlhttpt.cpp' object='curlhttpt.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT curlhttpt.lo -MD -MP -MF $(DEPDIR)/curlhttpt.Tpo -c -o curlhttpt.lo `test -f '$(mgrdir)/curlhttpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlhttpt.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/curlhttpt.Tpo $(DEPDIR)/curlhttpt.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/curlhttpt.cpp' object='curlhttpt.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curlhttpt.lo `test -f '$(mgrdir)/curlhttpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlhttpt.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curlhttpt.lo `test -f '$(mgrdir)/curlhttpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlhttpt.cpp swconfig.lo: $(mgrdir)/swconfig.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swconfig.lo -MD -MP -MF $(DEPDIR)/swconfig.Tpo -c -o swconfig.lo `test -f '$(mgrdir)/swconfig.cpp' || echo '$(srcdir)/'`$(mgrdir)/swconfig.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swconfig.Tpo $(DEPDIR)/swconfig.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/swconfig.cpp' object='swconfig.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swconfig.lo -MD -MP -MF $(DEPDIR)/swconfig.Tpo -c -o swconfig.lo `test -f '$(mgrdir)/swconfig.cpp' || echo '$(srcdir)/'`$(mgrdir)/swconfig.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swconfig.Tpo $(DEPDIR)/swconfig.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/swconfig.cpp' object='swconfig.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swconfig.lo `test -f '$(mgrdir)/swconfig.cpp' || echo '$(srcdir)/'`$(mgrdir)/swconfig.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swconfig.lo `test -f '$(mgrdir)/swconfig.cpp' || echo '$(srcdir)/'`$(mgrdir)/swconfig.cpp swmgr.lo: $(mgrdir)/swmgr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swmgr.lo -MD -MP -MF $(DEPDIR)/swmgr.Tpo -c -o swmgr.lo `test -f '$(mgrdir)/swmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swmgr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swmgr.Tpo $(DEPDIR)/swmgr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/swmgr.cpp' object='swmgr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swmgr.lo -MD -MP -MF $(DEPDIR)/swmgr.Tpo -c -o swmgr.lo `test -f '$(mgrdir)/swmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swmgr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swmgr.Tpo $(DEPDIR)/swmgr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/swmgr.cpp' object='swmgr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swmgr.lo `test -f '$(mgrdir)/swmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swmgr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swmgr.lo `test -f '$(mgrdir)/swmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swmgr.cpp swfiltermgr.lo: $(mgrdir)/swfiltermgr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swfiltermgr.lo -MD -MP -MF $(DEPDIR)/swfiltermgr.Tpo -c -o swfiltermgr.lo `test -f '$(mgrdir)/swfiltermgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swfiltermgr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swfiltermgr.Tpo $(DEPDIR)/swfiltermgr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/swfiltermgr.cpp' object='swfiltermgr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swfiltermgr.lo -MD -MP -MF $(DEPDIR)/swfiltermgr.Tpo -c -o swfiltermgr.lo `test -f '$(mgrdir)/swfiltermgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swfiltermgr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swfiltermgr.Tpo $(DEPDIR)/swfiltermgr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/swfiltermgr.cpp' object='swfiltermgr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swfiltermgr.lo `test -f '$(mgrdir)/swfiltermgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swfiltermgr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swfiltermgr.lo `test -f '$(mgrdir)/swfiltermgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swfiltermgr.cpp encfiltmgr.lo: $(mgrdir)/encfiltmgr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT encfiltmgr.lo -MD -MP -MF $(DEPDIR)/encfiltmgr.Tpo -c -o encfiltmgr.lo `test -f '$(mgrdir)/encfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/encfiltmgr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/encfiltmgr.Tpo $(DEPDIR)/encfiltmgr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/encfiltmgr.cpp' object='encfiltmgr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT encfiltmgr.lo -MD -MP -MF $(DEPDIR)/encfiltmgr.Tpo -c -o encfiltmgr.lo `test -f '$(mgrdir)/encfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/encfiltmgr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/encfiltmgr.Tpo $(DEPDIR)/encfiltmgr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/encfiltmgr.cpp' object='encfiltmgr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o encfiltmgr.lo `test -f '$(mgrdir)/encfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/encfiltmgr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o encfiltmgr.lo `test -f '$(mgrdir)/encfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/encfiltmgr.cpp markupfiltmgr.lo: $(mgrdir)/markupfiltmgr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT markupfiltmgr.lo -MD -MP -MF $(DEPDIR)/markupfiltmgr.Tpo -c -o markupfiltmgr.lo `test -f '$(mgrdir)/markupfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/markupfiltmgr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/markupfiltmgr.Tpo $(DEPDIR)/markupfiltmgr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/markupfiltmgr.cpp' object='markupfiltmgr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT markupfiltmgr.lo -MD -MP -MF $(DEPDIR)/markupfiltmgr.Tpo -c -o markupfiltmgr.lo `test -f '$(mgrdir)/markupfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/markupfiltmgr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/markupfiltmgr.Tpo $(DEPDIR)/markupfiltmgr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/markupfiltmgr.cpp' object='markupfiltmgr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o markupfiltmgr.lo `test -f '$(mgrdir)/markupfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/markupfiltmgr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o markupfiltmgr.lo `test -f '$(mgrdir)/markupfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/markupfiltmgr.cpp filemgr.lo: $(mgrdir)/filemgr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filemgr.lo -MD -MP -MF $(DEPDIR)/filemgr.Tpo -c -o filemgr.lo `test -f '$(mgrdir)/filemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/filemgr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/filemgr.Tpo $(DEPDIR)/filemgr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/filemgr.cpp' object='filemgr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filemgr.lo -MD -MP -MF $(DEPDIR)/filemgr.Tpo -c -o filemgr.lo `test -f '$(mgrdir)/filemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/filemgr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filemgr.Tpo $(DEPDIR)/filemgr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/filemgr.cpp' object='filemgr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filemgr.lo `test -f '$(mgrdir)/filemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/filemgr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filemgr.lo `test -f '$(mgrdir)/filemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/filemgr.cpp -versemgr.lo: $(mgrdir)/versemgr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT versemgr.lo -MD -MP -MF $(DEPDIR)/versemgr.Tpo -c -o versemgr.lo `test -f '$(mgrdir)/versemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/versemgr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/versemgr.Tpo $(DEPDIR)/versemgr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/versemgr.cpp' object='versemgr.lo' libtool=yes @AMDEPBACKSLASH@ +versificationmgr.lo: $(mgrdir)/versificationmgr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT versificationmgr.lo -MD -MP -MF $(DEPDIR)/versificationmgr.Tpo -c -o versificationmgr.lo `test -f '$(mgrdir)/versificationmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/versificationmgr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/versificationmgr.Tpo $(DEPDIR)/versificationmgr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/versificationmgr.cpp' object='versificationmgr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o versemgr.lo `test -f '$(mgrdir)/versemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/versemgr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o versificationmgr.lo `test -f '$(mgrdir)/versificationmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/versificationmgr.cpp -ftptrans.lo: $(mgrdir)/ftptrans.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftptrans.lo -MD -MP -MF $(DEPDIR)/ftptrans.Tpo -c -o ftptrans.lo `test -f '$(mgrdir)/ftptrans.cpp' || echo '$(srcdir)/'`$(mgrdir)/ftptrans.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/ftptrans.Tpo $(DEPDIR)/ftptrans.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/ftptrans.cpp' object='ftptrans.lo' libtool=yes @AMDEPBACKSLASH@ +remotetrans.lo: $(mgrdir)/remotetrans.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT remotetrans.lo -MD -MP -MF $(DEPDIR)/remotetrans.Tpo -c -o remotetrans.lo `test -f '$(mgrdir)/remotetrans.cpp' || echo '$(srcdir)/'`$(mgrdir)/remotetrans.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remotetrans.Tpo $(DEPDIR)/remotetrans.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/remotetrans.cpp' object='remotetrans.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftptrans.lo `test -f '$(mgrdir)/ftptrans.cpp' || echo '$(srcdir)/'`$(mgrdir)/ftptrans.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o remotetrans.lo `test -f '$(mgrdir)/remotetrans.cpp' || echo '$(srcdir)/'`$(mgrdir)/remotetrans.cpp swlocale.lo: $(mgrdir)/swlocale.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swlocale.lo -MD -MP -MF $(DEPDIR)/swlocale.Tpo -c -o swlocale.lo `test -f '$(mgrdir)/swlocale.cpp' || echo '$(srcdir)/'`$(mgrdir)/swlocale.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swlocale.Tpo $(DEPDIR)/swlocale.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/swlocale.cpp' object='swlocale.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swlocale.lo -MD -MP -MF $(DEPDIR)/swlocale.Tpo -c -o swlocale.lo `test -f '$(mgrdir)/swlocale.cpp' || echo '$(srcdir)/'`$(mgrdir)/swlocale.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swlocale.Tpo $(DEPDIR)/swlocale.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/swlocale.cpp' object='swlocale.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swlocale.lo `test -f '$(mgrdir)/swlocale.cpp' || echo '$(srcdir)/'`$(mgrdir)/swlocale.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swlocale.lo `test -f '$(mgrdir)/swlocale.cpp' || echo '$(srcdir)/'`$(mgrdir)/swlocale.cpp localemgr.lo: $(mgrdir)/localemgr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT localemgr.lo -MD -MP -MF $(DEPDIR)/localemgr.Tpo -c -o localemgr.lo `test -f '$(mgrdir)/localemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/localemgr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/localemgr.Tpo $(DEPDIR)/localemgr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/localemgr.cpp' object='localemgr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT localemgr.lo -MD -MP -MF $(DEPDIR)/localemgr.Tpo -c -o localemgr.lo `test -f '$(mgrdir)/localemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/localemgr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/localemgr.Tpo $(DEPDIR)/localemgr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/localemgr.cpp' object='localemgr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o localemgr.lo `test -f '$(mgrdir)/localemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/localemgr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o localemgr.lo `test -f '$(mgrdir)/localemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/localemgr.cpp swcacher.lo: $(mgrdir)/swcacher.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcacher.lo -MD -MP -MF $(DEPDIR)/swcacher.Tpo -c -o swcacher.lo `test -f '$(mgrdir)/swcacher.cpp' || echo '$(srcdir)/'`$(mgrdir)/swcacher.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swcacher.Tpo $(DEPDIR)/swcacher.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/swcacher.cpp' object='swcacher.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcacher.lo -MD -MP -MF $(DEPDIR)/swcacher.Tpo -c -o swcacher.lo `test -f '$(mgrdir)/swcacher.cpp' || echo '$(srcdir)/'`$(mgrdir)/swcacher.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swcacher.Tpo $(DEPDIR)/swcacher.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/swcacher.cpp' object='swcacher.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcacher.lo `test -f '$(mgrdir)/swcacher.cpp' || echo '$(srcdir)/'`$(mgrdir)/swcacher.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcacher.lo `test -f '$(mgrdir)/swcacher.cpp' || echo '$(srcdir)/'`$(mgrdir)/swcacher.cpp swsearchable.lo: $(mgrdir)/swsearchable.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swsearchable.lo -MD -MP -MF $(DEPDIR)/swsearchable.Tpo -c -o swsearchable.lo `test -f '$(mgrdir)/swsearchable.cpp' || echo '$(srcdir)/'`$(mgrdir)/swsearchable.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swsearchable.Tpo $(DEPDIR)/swsearchable.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/swsearchable.cpp' object='swsearchable.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swsearchable.lo -MD -MP -MF $(DEPDIR)/swsearchable.Tpo -c -o swsearchable.lo `test -f '$(mgrdir)/swsearchable.cpp' || echo '$(srcdir)/'`$(mgrdir)/swsearchable.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swsearchable.Tpo $(DEPDIR)/swsearchable.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/swsearchable.cpp' object='swsearchable.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swsearchable.lo `test -f '$(mgrdir)/swsearchable.cpp' || echo '$(srcdir)/'`$(mgrdir)/swsearchable.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swsearchable.lo `test -f '$(mgrdir)/swsearchable.cpp' || echo '$(srcdir)/'`$(mgrdir)/swsearchable.cpp installmgr.lo: $(mgrdir)/installmgr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installmgr.lo -MD -MP -MF $(DEPDIR)/installmgr.Tpo -c -o installmgr.lo `test -f '$(mgrdir)/installmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/installmgr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/installmgr.Tpo $(DEPDIR)/installmgr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/installmgr.cpp' object='installmgr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installmgr.lo -MD -MP -MF $(DEPDIR)/installmgr.Tpo -c -o installmgr.lo `test -f '$(mgrdir)/installmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/installmgr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/installmgr.Tpo $(DEPDIR)/installmgr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/installmgr.cpp' object='installmgr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installmgr.lo `test -f '$(mgrdir)/installmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/installmgr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installmgr.lo `test -f '$(mgrdir)/installmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/installmgr.cpp stringmgr.lo: $(mgrdir)/stringmgr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stringmgr.lo -MD -MP -MF $(DEPDIR)/stringmgr.Tpo -c -o stringmgr.lo `test -f '$(mgrdir)/stringmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/stringmgr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/stringmgr.Tpo $(DEPDIR)/stringmgr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(mgrdir)/stringmgr.cpp' object='stringmgr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stringmgr.lo -MD -MP -MF $(DEPDIR)/stringmgr.Tpo -c -o stringmgr.lo `test -f '$(mgrdir)/stringmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/stringmgr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stringmgr.Tpo $(DEPDIR)/stringmgr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(mgrdir)/stringmgr.cpp' object='stringmgr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stringmgr.lo `test -f '$(mgrdir)/stringmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/stringmgr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stringmgr.lo `test -f '$(mgrdir)/stringmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/stringmgr.cpp swdisp.lo: $(frontenddir)/swdisp.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swdisp.lo -MD -MP -MF $(DEPDIR)/swdisp.Tpo -c -o swdisp.lo `test -f '$(frontenddir)/swdisp.cpp' || echo '$(srcdir)/'`$(frontenddir)/swdisp.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swdisp.Tpo $(DEPDIR)/swdisp.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(frontenddir)/swdisp.cpp' object='swdisp.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swdisp.lo -MD -MP -MF $(DEPDIR)/swdisp.Tpo -c -o swdisp.lo `test -f '$(frontenddir)/swdisp.cpp' || echo '$(srcdir)/'`$(frontenddir)/swdisp.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swdisp.Tpo $(DEPDIR)/swdisp.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(frontenddir)/swdisp.cpp' object='swdisp.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swdisp.lo `test -f '$(frontenddir)/swdisp.cpp' || echo '$(srcdir)/'`$(frontenddir)/swdisp.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swdisp.lo `test -f '$(frontenddir)/swdisp.cpp' || echo '$(srcdir)/'`$(frontenddir)/swdisp.cpp swlog.lo: $(frontenddir)/swlog.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swlog.lo -MD -MP -MF $(DEPDIR)/swlog.Tpo -c -o swlog.lo `test -f '$(frontenddir)/swlog.cpp' || echo '$(srcdir)/'`$(frontenddir)/swlog.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swlog.Tpo $(DEPDIR)/swlog.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(frontenddir)/swlog.cpp' object='swlog.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swlog.lo -MD -MP -MF $(DEPDIR)/swlog.Tpo -c -o swlog.lo `test -f '$(frontenddir)/swlog.cpp' || echo '$(srcdir)/'`$(frontenddir)/swlog.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swlog.Tpo $(DEPDIR)/swlog.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(frontenddir)/swlog.cpp' object='swlog.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swlog.lo `test -f '$(frontenddir)/swlog.cpp' || echo '$(srcdir)/'`$(frontenddir)/swlog.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swlog.lo `test -f '$(frontenddir)/swlog.cpp' || echo '$(srcdir)/'`$(frontenddir)/swlog.cpp swmodule.lo: $(modulesdir)/swmodule.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swmodule.lo -MD -MP -MF $(DEPDIR)/swmodule.Tpo -c -o swmodule.lo `test -f '$(modulesdir)/swmodule.cpp' || echo '$(srcdir)/'`$(modulesdir)/swmodule.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swmodule.Tpo $(DEPDIR)/swmodule.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(modulesdir)/swmodule.cpp' object='swmodule.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swmodule.lo -MD -MP -MF $(DEPDIR)/swmodule.Tpo -c -o swmodule.lo `test -f '$(modulesdir)/swmodule.cpp' || echo '$(srcdir)/'`$(modulesdir)/swmodule.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swmodule.Tpo $(DEPDIR)/swmodule.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(modulesdir)/swmodule.cpp' object='swmodule.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swmodule.lo `test -f '$(modulesdir)/swmodule.cpp' || echo '$(srcdir)/'`$(modulesdir)/swmodule.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swmodule.lo `test -f '$(modulesdir)/swmodule.cpp' || echo '$(srcdir)/'`$(modulesdir)/swmodule.cpp rawstr.lo: $(commondir)/rawstr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawstr.lo -MD -MP -MF $(DEPDIR)/rawstr.Tpo -c -o rawstr.lo `test -f '$(commondir)/rawstr.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawstr.Tpo $(DEPDIR)/rawstr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/rawstr.cpp' object='rawstr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawstr.lo -MD -MP -MF $(DEPDIR)/rawstr.Tpo -c -o rawstr.lo `test -f '$(commondir)/rawstr.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawstr.Tpo $(DEPDIR)/rawstr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/rawstr.cpp' object='rawstr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawstr.lo `test -f '$(commondir)/rawstr.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawstr.lo `test -f '$(commondir)/rawstr.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr.cpp rawstr4.lo: $(commondir)/rawstr4.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawstr4.lo -MD -MP -MF $(DEPDIR)/rawstr4.Tpo -c -o rawstr4.lo `test -f '$(commondir)/rawstr4.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr4.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawstr4.Tpo $(DEPDIR)/rawstr4.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/rawstr4.cpp' object='rawstr4.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawstr4.lo -MD -MP -MF $(DEPDIR)/rawstr4.Tpo -c -o rawstr4.lo `test -f '$(commondir)/rawstr4.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawstr4.Tpo $(DEPDIR)/rawstr4.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/rawstr4.cpp' object='rawstr4.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawstr4.lo `test -f '$(commondir)/rawstr4.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr4.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawstr4.lo `test -f '$(commondir)/rawstr4.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr4.cpp swcomprs.lo: $(commondir)/swcomprs.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcomprs.lo -MD -MP -MF $(DEPDIR)/swcomprs.Tpo -c -o swcomprs.lo `test -f '$(commondir)/swcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/swcomprs.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swcomprs.Tpo $(DEPDIR)/swcomprs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/swcomprs.cpp' object='swcomprs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcomprs.lo -MD -MP -MF $(DEPDIR)/swcomprs.Tpo -c -o swcomprs.lo `test -f '$(commondir)/swcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/swcomprs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swcomprs.Tpo $(DEPDIR)/swcomprs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/swcomprs.cpp' object='swcomprs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcomprs.lo `test -f '$(commondir)/swcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/swcomprs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcomprs.lo `test -f '$(commondir)/swcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/swcomprs.cpp lzsscomprs.lo: $(commondir)/lzsscomprs.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lzsscomprs.lo -MD -MP -MF $(DEPDIR)/lzsscomprs.Tpo -c -o lzsscomprs.lo `test -f '$(commondir)/lzsscomprs.cpp' || echo '$(srcdir)/'`$(commondir)/lzsscomprs.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/lzsscomprs.Tpo $(DEPDIR)/lzsscomprs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/lzsscomprs.cpp' object='lzsscomprs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lzsscomprs.lo -MD -MP -MF $(DEPDIR)/lzsscomprs.Tpo -c -o lzsscomprs.lo `test -f '$(commondir)/lzsscomprs.cpp' || echo '$(srcdir)/'`$(commondir)/lzsscomprs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzsscomprs.Tpo $(DEPDIR)/lzsscomprs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/lzsscomprs.cpp' object='lzsscomprs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lzsscomprs.lo `test -f '$(commondir)/lzsscomprs.cpp' || echo '$(srcdir)/'`$(commondir)/lzsscomprs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lzsscomprs.lo `test -f '$(commondir)/lzsscomprs.cpp' || echo '$(srcdir)/'`$(commondir)/lzsscomprs.cpp zipcomprs.lo: $(commondir)/zipcomprs.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zipcomprs.lo -MD -MP -MF $(DEPDIR)/zipcomprs.Tpo -c -o zipcomprs.lo `test -f '$(commondir)/zipcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/zipcomprs.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zipcomprs.Tpo $(DEPDIR)/zipcomprs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/zipcomprs.cpp' object='zipcomprs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zipcomprs.lo -MD -MP -MF $(DEPDIR)/zipcomprs.Tpo -c -o zipcomprs.lo `test -f '$(commondir)/zipcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/zipcomprs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zipcomprs.Tpo $(DEPDIR)/zipcomprs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/zipcomprs.cpp' object='zipcomprs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zipcomprs.lo `test -f '$(commondir)/zipcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/zipcomprs.cpp + +bz2comprs.lo: $(commondir)/bz2comprs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bz2comprs.lo -MD -MP -MF $(DEPDIR)/bz2comprs.Tpo -c -o bz2comprs.lo `test -f '$(commondir)/bz2comprs.cpp' || echo '$(srcdir)/'`$(commondir)/bz2comprs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/bz2comprs.Tpo $(DEPDIR)/bz2comprs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/bz2comprs.cpp' object='bz2comprs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zipcomprs.lo `test -f '$(commondir)/zipcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/zipcomprs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bz2comprs.lo `test -f '$(commondir)/bz2comprs.cpp' || echo '$(srcdir)/'`$(commondir)/bz2comprs.cpp + +xzcomprs.lo: $(commondir)/xzcomprs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xzcomprs.lo -MD -MP -MF $(DEPDIR)/xzcomprs.Tpo -c -o xzcomprs.lo `test -f '$(commondir)/xzcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/xzcomprs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xzcomprs.Tpo $(DEPDIR)/xzcomprs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/xzcomprs.cpp' object='xzcomprs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xzcomprs.lo `test -f '$(commondir)/xzcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/xzcomprs.cpp rawverse.lo: $(commondir)/rawverse.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawverse.lo -MD -MP -MF $(DEPDIR)/rawverse.Tpo -c -o rawverse.lo `test -f '$(commondir)/rawverse.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawverse.Tpo $(DEPDIR)/rawverse.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/rawverse.cpp' object='rawverse.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawverse.lo -MD -MP -MF $(DEPDIR)/rawverse.Tpo -c -o rawverse.lo `test -f '$(commondir)/rawverse.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawverse.Tpo $(DEPDIR)/rawverse.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/rawverse.cpp' object='rawverse.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawverse.lo `test -f '$(commondir)/rawverse.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawverse.lo `test -f '$(commondir)/rawverse.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse.cpp rawverse4.lo: $(commondir)/rawverse4.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawverse4.lo -MD -MP -MF $(DEPDIR)/rawverse4.Tpo -c -o rawverse4.lo `test -f '$(commondir)/rawverse4.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse4.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawverse4.Tpo $(DEPDIR)/rawverse4.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/rawverse4.cpp' object='rawverse4.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawverse4.lo -MD -MP -MF $(DEPDIR)/rawverse4.Tpo -c -o rawverse4.lo `test -f '$(commondir)/rawverse4.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawverse4.Tpo $(DEPDIR)/rawverse4.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/rawverse4.cpp' object='rawverse4.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawverse4.lo `test -f '$(commondir)/rawverse4.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse4.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawverse4.lo `test -f '$(commondir)/rawverse4.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse4.cpp swcipher.lo: $(commondir)/swcipher.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcipher.lo -MD -MP -MF $(DEPDIR)/swcipher.Tpo -c -o swcipher.lo `test -f '$(commondir)/swcipher.cpp' || echo '$(srcdir)/'`$(commondir)/swcipher.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swcipher.Tpo $(DEPDIR)/swcipher.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/swcipher.cpp' object='swcipher.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcipher.lo -MD -MP -MF $(DEPDIR)/swcipher.Tpo -c -o swcipher.lo `test -f '$(commondir)/swcipher.cpp' || echo '$(srcdir)/'`$(commondir)/swcipher.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swcipher.Tpo $(DEPDIR)/swcipher.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/swcipher.cpp' object='swcipher.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcipher.lo `test -f '$(commondir)/swcipher.cpp' || echo '$(srcdir)/'`$(commondir)/swcipher.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcipher.lo `test -f '$(commondir)/swcipher.cpp' || echo '$(srcdir)/'`$(commondir)/swcipher.cpp zverse.lo: $(commondir)/zverse.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zverse.lo -MD -MP -MF $(DEPDIR)/zverse.Tpo -c -o zverse.lo `test -f '$(commondir)/zverse.cpp' || echo '$(srcdir)/'`$(commondir)/zverse.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zverse.Tpo $(DEPDIR)/zverse.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/zverse.cpp' object='zverse.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zverse.lo -MD -MP -MF $(DEPDIR)/zverse.Tpo -c -o zverse.lo `test -f '$(commondir)/zverse.cpp' || echo '$(srcdir)/'`$(commondir)/zverse.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zverse.Tpo $(DEPDIR)/zverse.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/zverse.cpp' object='zverse.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zverse.lo `test -f '$(commondir)/zverse.cpp' || echo '$(srcdir)/'`$(commondir)/zverse.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zverse.lo `test -f '$(commondir)/zverse.cpp' || echo '$(srcdir)/'`$(commondir)/zverse.cpp zstr.lo: $(commondir)/zstr.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zstr.lo -MD -MP -MF $(DEPDIR)/zstr.Tpo -c -o zstr.lo `test -f '$(commondir)/zstr.cpp' || echo '$(srcdir)/'`$(commondir)/zstr.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zstr.Tpo $(DEPDIR)/zstr.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/zstr.cpp' object='zstr.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zstr.lo -MD -MP -MF $(DEPDIR)/zstr.Tpo -c -o zstr.lo `test -f '$(commondir)/zstr.cpp' || echo '$(srcdir)/'`$(commondir)/zstr.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zstr.Tpo $(DEPDIR)/zstr.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/zstr.cpp' object='zstr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zstr.lo `test -f '$(commondir)/zstr.cpp' || echo '$(srcdir)/'`$(commondir)/zstr.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zstr.lo `test -f '$(commondir)/zstr.cpp' || echo '$(srcdir)/'`$(commondir)/zstr.cpp entriesblk.lo: $(commondir)/entriesblk.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT entriesblk.lo -MD -MP -MF $(DEPDIR)/entriesblk.Tpo -c -o entriesblk.lo `test -f '$(commondir)/entriesblk.cpp' || echo '$(srcdir)/'`$(commondir)/entriesblk.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/entriesblk.Tpo $(DEPDIR)/entriesblk.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/entriesblk.cpp' object='entriesblk.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT entriesblk.lo -MD -MP -MF $(DEPDIR)/entriesblk.Tpo -c -o entriesblk.lo `test -f '$(commondir)/entriesblk.cpp' || echo '$(srcdir)/'`$(commondir)/entriesblk.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/entriesblk.Tpo $(DEPDIR)/entriesblk.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/entriesblk.cpp' object='entriesblk.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o entriesblk.lo `test -f '$(commondir)/entriesblk.cpp' || echo '$(srcdir)/'`$(commondir)/entriesblk.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o entriesblk.lo `test -f '$(commondir)/entriesblk.cpp' || echo '$(srcdir)/'`$(commondir)/entriesblk.cpp sapphire.lo: $(commondir)/sapphire.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sapphire.lo -MD -MP -MF $(DEPDIR)/sapphire.Tpo -c -o sapphire.lo `test -f '$(commondir)/sapphire.cpp' || echo '$(srcdir)/'`$(commondir)/sapphire.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/sapphire.Tpo $(DEPDIR)/sapphire.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commondir)/sapphire.cpp' object='sapphire.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sapphire.lo -MD -MP -MF $(DEPDIR)/sapphire.Tpo -c -o sapphire.lo `test -f '$(commondir)/sapphire.cpp' || echo '$(srcdir)/'`$(commondir)/sapphire.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sapphire.Tpo $(DEPDIR)/sapphire.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commondir)/sapphire.cpp' object='sapphire.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sapphire.lo `test -f '$(commondir)/sapphire.cpp' || echo '$(srcdir)/'`$(commondir)/sapphire.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sapphire.lo `test -f '$(commondir)/sapphire.cpp' || echo '$(srcdir)/'`$(commondir)/sapphire.cpp swbasicfilter.lo: $(filtersdir)/swbasicfilter.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swbasicfilter.lo -MD -MP -MF $(DEPDIR)/swbasicfilter.Tpo -c -o swbasicfilter.lo `test -f '$(filtersdir)/swbasicfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swbasicfilter.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swbasicfilter.Tpo $(DEPDIR)/swbasicfilter.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/swbasicfilter.cpp' object='swbasicfilter.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swbasicfilter.lo -MD -MP -MF $(DEPDIR)/swbasicfilter.Tpo -c -o swbasicfilter.lo `test -f '$(filtersdir)/swbasicfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swbasicfilter.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swbasicfilter.Tpo $(DEPDIR)/swbasicfilter.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/swbasicfilter.cpp' object='swbasicfilter.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swbasicfilter.lo `test -f '$(filtersdir)/swbasicfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swbasicfilter.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swbasicfilter.lo `test -f '$(filtersdir)/swbasicfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swbasicfilter.cpp swoptfilter.lo: $(filtersdir)/swoptfilter.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swoptfilter.lo -MD -MP -MF $(DEPDIR)/swoptfilter.Tpo -c -o swoptfilter.lo `test -f '$(filtersdir)/swoptfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swoptfilter.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swoptfilter.Tpo $(DEPDIR)/swoptfilter.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/swoptfilter.cpp' object='swoptfilter.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swoptfilter.lo -MD -MP -MF $(DEPDIR)/swoptfilter.Tpo -c -o swoptfilter.lo `test -f '$(filtersdir)/swoptfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swoptfilter.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swoptfilter.Tpo $(DEPDIR)/swoptfilter.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/swoptfilter.cpp' object='swoptfilter.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swoptfilter.lo `test -f '$(filtersdir)/swoptfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swoptfilter.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swoptfilter.lo `test -f '$(filtersdir)/swoptfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swoptfilter.cpp latin1utf8.lo: $(filtersdir)/latin1utf8.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT latin1utf8.lo -MD -MP -MF $(DEPDIR)/latin1utf8.Tpo -c -o latin1utf8.lo `test -f '$(filtersdir)/latin1utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf8.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/latin1utf8.Tpo $(DEPDIR)/latin1utf8.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/latin1utf8.cpp' object='latin1utf8.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT latin1utf8.lo -MD -MP -MF $(DEPDIR)/latin1utf8.Tpo -c -o latin1utf8.lo `test -f '$(filtersdir)/latin1utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf8.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/latin1utf8.Tpo $(DEPDIR)/latin1utf8.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/latin1utf8.cpp' object='latin1utf8.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o latin1utf8.lo `test -f '$(filtersdir)/latin1utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf8.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o latin1utf8.lo `test -f '$(filtersdir)/latin1utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf8.cpp latin1utf16.lo: $(filtersdir)/latin1utf16.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT latin1utf16.lo -MD -MP -MF $(DEPDIR)/latin1utf16.Tpo -c -o latin1utf16.lo `test -f '$(filtersdir)/latin1utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf16.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/latin1utf16.Tpo $(DEPDIR)/latin1utf16.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/latin1utf16.cpp' object='latin1utf16.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT latin1utf16.lo -MD -MP -MF $(DEPDIR)/latin1utf16.Tpo -c -o latin1utf16.lo `test -f '$(filtersdir)/latin1utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf16.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/latin1utf16.Tpo $(DEPDIR)/latin1utf16.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/latin1utf16.cpp' object='latin1utf16.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o latin1utf16.lo `test -f '$(filtersdir)/latin1utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf16.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o latin1utf16.lo `test -f '$(filtersdir)/latin1utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf16.cpp utf8utf16.lo: $(filtersdir)/utf8utf16.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8utf16.lo -MD -MP -MF $(DEPDIR)/utf8utf16.Tpo -c -o utf8utf16.lo `test -f '$(filtersdir)/utf8utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8utf16.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8utf16.Tpo $(DEPDIR)/utf8utf16.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8utf16.cpp' object='utf8utf16.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8utf16.lo -MD -MP -MF $(DEPDIR)/utf8utf16.Tpo -c -o utf8utf16.lo `test -f '$(filtersdir)/utf8utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8utf16.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8utf16.Tpo $(DEPDIR)/utf8utf16.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8utf16.cpp' object='utf8utf16.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8utf16.lo `test -f '$(filtersdir)/utf8utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8utf16.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8utf16.lo `test -f '$(filtersdir)/utf8utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8utf16.cpp utf16utf8.lo: $(filtersdir)/utf16utf8.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf16utf8.lo -MD -MP -MF $(DEPDIR)/utf16utf8.Tpo -c -o utf16utf8.lo `test -f '$(filtersdir)/utf16utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf16utf8.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf16utf8.Tpo $(DEPDIR)/utf16utf8.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf16utf8.cpp' object='utf16utf8.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf16utf8.lo -MD -MP -MF $(DEPDIR)/utf16utf8.Tpo -c -o utf16utf8.lo `test -f '$(filtersdir)/utf16utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf16utf8.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf16utf8.Tpo $(DEPDIR)/utf16utf8.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf16utf8.cpp' object='utf16utf8.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf16utf8.lo `test -f '$(filtersdir)/utf16utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf16utf8.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf16utf8.lo `test -f '$(filtersdir)/utf16utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf16utf8.cpp utf8html.lo: $(filtersdir)/utf8html.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8html.lo -MD -MP -MF $(DEPDIR)/utf8html.Tpo -c -o utf8html.lo `test -f '$(filtersdir)/utf8html.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8html.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8html.Tpo $(DEPDIR)/utf8html.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8html.cpp' object='utf8html.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8html.lo -MD -MP -MF $(DEPDIR)/utf8html.Tpo -c -o utf8html.lo `test -f '$(filtersdir)/utf8html.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8html.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8html.Tpo $(DEPDIR)/utf8html.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8html.cpp' object='utf8html.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8html.lo `test -f '$(filtersdir)/utf8html.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8html.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8html.lo `test -f '$(filtersdir)/utf8html.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8html.cpp utf8latin1.lo: $(filtersdir)/utf8latin1.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8latin1.lo -MD -MP -MF $(DEPDIR)/utf8latin1.Tpo -c -o utf8latin1.lo `test -f '$(filtersdir)/utf8latin1.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8latin1.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8latin1.Tpo $(DEPDIR)/utf8latin1.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8latin1.cpp' object='utf8latin1.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8latin1.lo -MD -MP -MF $(DEPDIR)/utf8latin1.Tpo -c -o utf8latin1.lo `test -f '$(filtersdir)/utf8latin1.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8latin1.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8latin1.Tpo $(DEPDIR)/utf8latin1.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8latin1.cpp' object='utf8latin1.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8latin1.lo `test -f '$(filtersdir)/utf8latin1.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8latin1.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8latin1.lo `test -f '$(filtersdir)/utf8latin1.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8latin1.cpp + +unicodertf.lo: $(filtersdir)/unicodertf.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unicodertf.lo -MD -MP -MF $(DEPDIR)/unicodertf.Tpo -c -o unicodertf.lo `test -f '$(filtersdir)/unicodertf.cpp' || echo '$(srcdir)/'`$(filtersdir)/unicodertf.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unicodertf.Tpo $(DEPDIR)/unicodertf.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/unicodertf.cpp' object='unicodertf.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unicodertf.lo `test -f '$(filtersdir)/unicodertf.cpp' || echo '$(srcdir)/'`$(filtersdir)/unicodertf.cpp + +scsuutf8.lo: $(filtersdir)/scsuutf8.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT scsuutf8.lo -MD -MP -MF $(DEPDIR)/scsuutf8.Tpo -c -o scsuutf8.lo `test -f '$(filtersdir)/scsuutf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/scsuutf8.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/scsuutf8.Tpo $(DEPDIR)/scsuutf8.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/scsuutf8.cpp' object='scsuutf8.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o scsuutf8.lo `test -f '$(filtersdir)/scsuutf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/scsuutf8.cpp utf8cantillation.lo: $(filtersdir)/utf8cantillation.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8cantillation.lo -MD -MP -MF $(DEPDIR)/utf8cantillation.Tpo -c -o utf8cantillation.lo `test -f '$(filtersdir)/utf8cantillation.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8cantillation.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8cantillation.Tpo $(DEPDIR)/utf8cantillation.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8cantillation.cpp' object='utf8cantillation.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8cantillation.lo -MD -MP -MF $(DEPDIR)/utf8cantillation.Tpo -c -o utf8cantillation.lo `test -f '$(filtersdir)/utf8cantillation.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8cantillation.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8cantillation.Tpo $(DEPDIR)/utf8cantillation.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8cantillation.cpp' object='utf8cantillation.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8cantillation.lo `test -f '$(filtersdir)/utf8cantillation.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8cantillation.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8cantillation.lo `test -f '$(filtersdir)/utf8cantillation.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8cantillation.cpp utf8hebrewpoints.lo: $(filtersdir)/utf8hebrewpoints.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8hebrewpoints.lo -MD -MP -MF $(DEPDIR)/utf8hebrewpoints.Tpo -c -o utf8hebrewpoints.lo `test -f '$(filtersdir)/utf8hebrewpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8hebrewpoints.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8hebrewpoints.Tpo $(DEPDIR)/utf8hebrewpoints.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8hebrewpoints.cpp' object='utf8hebrewpoints.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8hebrewpoints.lo -MD -MP -MF $(DEPDIR)/utf8hebrewpoints.Tpo -c -o utf8hebrewpoints.lo `test -f '$(filtersdir)/utf8hebrewpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8hebrewpoints.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8hebrewpoints.Tpo $(DEPDIR)/utf8hebrewpoints.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8hebrewpoints.cpp' object='utf8hebrewpoints.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8hebrewpoints.lo `test -f '$(filtersdir)/utf8hebrewpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8hebrewpoints.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8hebrewpoints.lo `test -f '$(filtersdir)/utf8hebrewpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8hebrewpoints.cpp utf8arabicpoints.lo: $(filtersdir)/utf8arabicpoints.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8arabicpoints.lo -MD -MP -MF $(DEPDIR)/utf8arabicpoints.Tpo -c -o utf8arabicpoints.lo `test -f '$(filtersdir)/utf8arabicpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arabicpoints.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8arabicpoints.Tpo $(DEPDIR)/utf8arabicpoints.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8arabicpoints.cpp' object='utf8arabicpoints.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8arabicpoints.lo -MD -MP -MF $(DEPDIR)/utf8arabicpoints.Tpo -c -o utf8arabicpoints.lo `test -f '$(filtersdir)/utf8arabicpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arabicpoints.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8arabicpoints.Tpo $(DEPDIR)/utf8arabicpoints.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8arabicpoints.cpp' object='utf8arabicpoints.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8arabicpoints.lo `test -f '$(filtersdir)/utf8arabicpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arabicpoints.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8arabicpoints.lo `test -f '$(filtersdir)/utf8arabicpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arabicpoints.cpp utf8greekaccents.lo: $(filtersdir)/utf8greekaccents.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8greekaccents.lo -MD -MP -MF $(DEPDIR)/utf8greekaccents.Tpo -c -o utf8greekaccents.lo `test -f '$(filtersdir)/utf8greekaccents.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8greekaccents.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8greekaccents.Tpo $(DEPDIR)/utf8greekaccents.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8greekaccents.cpp' object='utf8greekaccents.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8greekaccents.lo -MD -MP -MF $(DEPDIR)/utf8greekaccents.Tpo -c -o utf8greekaccents.lo `test -f '$(filtersdir)/utf8greekaccents.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8greekaccents.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8greekaccents.Tpo $(DEPDIR)/utf8greekaccents.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8greekaccents.cpp' object='utf8greekaccents.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8greekaccents.lo `test -f '$(filtersdir)/utf8greekaccents.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8greekaccents.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8greekaccents.lo `test -f '$(filtersdir)/utf8greekaccents.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8greekaccents.cpp cipherfil.lo: $(filtersdir)/cipherfil.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cipherfil.lo -MD -MP -MF $(DEPDIR)/cipherfil.Tpo -c -o cipherfil.lo `test -f '$(filtersdir)/cipherfil.cpp' || echo '$(srcdir)/'`$(filtersdir)/cipherfil.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cipherfil.Tpo $(DEPDIR)/cipherfil.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/cipherfil.cpp' object='cipherfil.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cipherfil.lo -MD -MP -MF $(DEPDIR)/cipherfil.Tpo -c -o cipherfil.lo `test -f '$(filtersdir)/cipherfil.cpp' || echo '$(srcdir)/'`$(filtersdir)/cipherfil.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cipherfil.Tpo $(DEPDIR)/cipherfil.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/cipherfil.cpp' object='cipherfil.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cipherfil.lo `test -f '$(filtersdir)/cipherfil.cpp' || echo '$(srcdir)/'`$(filtersdir)/cipherfil.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cipherfil.lo `test -f '$(filtersdir)/cipherfil.cpp' || echo '$(srcdir)/'`$(filtersdir)/cipherfil.cpp utf8transliterator.lo: $(filtersdir)/utf8transliterator.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8transliterator.lo -MD -MP -MF $(DEPDIR)/utf8transliterator.Tpo -c -o utf8transliterator.lo `test -f '$(filtersdir)/utf8transliterator.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8transliterator.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8transliterator.Tpo $(DEPDIR)/utf8transliterator.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8transliterator.cpp' object='utf8transliterator.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8transliterator.lo -MD -MP -MF $(DEPDIR)/utf8transliterator.Tpo -c -o utf8transliterator.lo `test -f '$(filtersdir)/utf8transliterator.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8transliterator.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8transliterator.Tpo $(DEPDIR)/utf8transliterator.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8transliterator.cpp' object='utf8transliterator.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8transliterator.lo `test -f '$(filtersdir)/utf8transliterator.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8transliterator.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8transliterator.lo `test -f '$(filtersdir)/utf8transliterator.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8transliterator.cpp utf8nfc.lo: $(filtersdir)/utf8nfc.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8nfc.lo -MD -MP -MF $(DEPDIR)/utf8nfc.Tpo -c -o utf8nfc.lo `test -f '$(filtersdir)/utf8nfc.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfc.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8nfc.Tpo $(DEPDIR)/utf8nfc.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8nfc.cpp' object='utf8nfc.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8nfc.lo -MD -MP -MF $(DEPDIR)/utf8nfc.Tpo -c -o utf8nfc.lo `test -f '$(filtersdir)/utf8nfc.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfc.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8nfc.Tpo $(DEPDIR)/utf8nfc.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8nfc.cpp' object='utf8nfc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8nfc.lo `test -f '$(filtersdir)/utf8nfc.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfc.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8nfc.lo `test -f '$(filtersdir)/utf8nfc.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfc.cpp utf8nfkd.lo: $(filtersdir)/utf8nfkd.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8nfkd.lo -MD -MP -MF $(DEPDIR)/utf8nfkd.Tpo -c -o utf8nfkd.lo `test -f '$(filtersdir)/utf8nfkd.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfkd.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8nfkd.Tpo $(DEPDIR)/utf8nfkd.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8nfkd.cpp' object='utf8nfkd.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8nfkd.lo -MD -MP -MF $(DEPDIR)/utf8nfkd.Tpo -c -o utf8nfkd.lo `test -f '$(filtersdir)/utf8nfkd.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfkd.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8nfkd.Tpo $(DEPDIR)/utf8nfkd.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8nfkd.cpp' object='utf8nfkd.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8nfkd.lo `test -f '$(filtersdir)/utf8nfkd.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfkd.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8nfkd.lo `test -f '$(filtersdir)/utf8nfkd.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfkd.cpp utf8arshaping.lo: $(filtersdir)/utf8arshaping.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8arshaping.lo -MD -MP -MF $(DEPDIR)/utf8arshaping.Tpo -c -o utf8arshaping.lo `test -f '$(filtersdir)/utf8arshaping.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arshaping.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8arshaping.Tpo $(DEPDIR)/utf8arshaping.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8arshaping.cpp' object='utf8arshaping.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8arshaping.lo -MD -MP -MF $(DEPDIR)/utf8arshaping.Tpo -c -o utf8arshaping.lo `test -f '$(filtersdir)/utf8arshaping.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arshaping.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8arshaping.Tpo $(DEPDIR)/utf8arshaping.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8arshaping.cpp' object='utf8arshaping.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8arshaping.lo `test -f '$(filtersdir)/utf8arshaping.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arshaping.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8arshaping.lo `test -f '$(filtersdir)/utf8arshaping.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arshaping.cpp utf8bidireorder.lo: $(filtersdir)/utf8bidireorder.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8bidireorder.lo -MD -MP -MF $(DEPDIR)/utf8bidireorder.Tpo -c -o utf8bidireorder.lo `test -f '$(filtersdir)/utf8bidireorder.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8bidireorder.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/utf8bidireorder.Tpo $(DEPDIR)/utf8bidireorder.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/utf8bidireorder.cpp' object='utf8bidireorder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8bidireorder.lo -MD -MP -MF $(DEPDIR)/utf8bidireorder.Tpo -c -o utf8bidireorder.lo `test -f '$(filtersdir)/utf8bidireorder.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8bidireorder.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/utf8bidireorder.Tpo $(DEPDIR)/utf8bidireorder.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/utf8bidireorder.cpp' object='utf8bidireorder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8bidireorder.lo `test -f '$(filtersdir)/utf8bidireorder.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8bidireorder.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8bidireorder.lo `test -f '$(filtersdir)/utf8bidireorder.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8bidireorder.cpp osisheadings.lo: $(filtersdir)/osisheadings.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisheadings.lo -MD -MP -MF $(DEPDIR)/osisheadings.Tpo -c -o osisheadings.lo `test -f '$(filtersdir)/osisheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisheadings.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osisheadings.Tpo $(DEPDIR)/osisheadings.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osisheadings.cpp' object='osisheadings.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisheadings.lo -MD -MP -MF $(DEPDIR)/osisheadings.Tpo -c -o osisheadings.lo `test -f '$(filtersdir)/osisheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisheadings.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisheadings.Tpo $(DEPDIR)/osisheadings.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisheadings.cpp' object='osisheadings.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisheadings.lo `test -f '$(filtersdir)/osisheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisheadings.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisheadings.lo `test -f '$(filtersdir)/osisheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisheadings.cpp osisfootnotes.lo: $(filtersdir)/osisfootnotes.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisfootnotes.lo -MD -MP -MF $(DEPDIR)/osisfootnotes.Tpo -c -o osisfootnotes.lo `test -f '$(filtersdir)/osisfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisfootnotes.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osisfootnotes.Tpo $(DEPDIR)/osisfootnotes.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osisfootnotes.cpp' object='osisfootnotes.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisfootnotes.lo -MD -MP -MF $(DEPDIR)/osisfootnotes.Tpo -c -o osisfootnotes.lo `test -f '$(filtersdir)/osisfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisfootnotes.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisfootnotes.Tpo $(DEPDIR)/osisfootnotes.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisfootnotes.cpp' object='osisfootnotes.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisfootnotes.lo `test -f '$(filtersdir)/osisfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisfootnotes.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisfootnotes.lo `test -f '$(filtersdir)/osisfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisfootnotes.cpp osishtmlhref.lo: $(filtersdir)/osishtmlhref.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osishtmlhref.lo -MD -MP -MF $(DEPDIR)/osishtmlhref.Tpo -c -o osishtmlhref.lo `test -f '$(filtersdir)/osishtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osishtmlhref.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osishtmlhref.Tpo $(DEPDIR)/osishtmlhref.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osishtmlhref.cpp' object='osishtmlhref.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osishtmlhref.lo -MD -MP -MF $(DEPDIR)/osishtmlhref.Tpo -c -o osishtmlhref.lo `test -f '$(filtersdir)/osishtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osishtmlhref.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osishtmlhref.Tpo $(DEPDIR)/osishtmlhref.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osishtmlhref.cpp' object='osishtmlhref.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osishtmlhref.lo `test -f '$(filtersdir)/osishtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osishtmlhref.cpp + +osisxhtml.lo: $(filtersdir)/osisxhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisxhtml.lo -MD -MP -MF $(DEPDIR)/osisxhtml.Tpo -c -o osisxhtml.lo `test -f '$(filtersdir)/osisxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisxhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisxhtml.Tpo $(DEPDIR)/osisxhtml.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisxhtml.cpp' object='osisxhtml.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osishtmlhref.lo `test -f '$(filtersdir)/osishtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osishtmlhref.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisxhtml.lo `test -f '$(filtersdir)/osisxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisxhtml.cpp osiswebif.lo: $(filtersdir)/osiswebif.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osiswebif.lo -MD -MP -MF $(DEPDIR)/osiswebif.Tpo -c -o osiswebif.lo `test -f '$(filtersdir)/osiswebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswebif.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osiswebif.Tpo $(DEPDIR)/osiswebif.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osiswebif.cpp' object='osiswebif.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osiswebif.lo -MD -MP -MF $(DEPDIR)/osiswebif.Tpo -c -o osiswebif.lo `test -f '$(filtersdir)/osiswebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswebif.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osiswebif.Tpo $(DEPDIR)/osiswebif.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osiswebif.cpp' object='osiswebif.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osiswebif.lo `test -f '$(filtersdir)/osiswebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswebif.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osiswebif.lo `test -f '$(filtersdir)/osiswebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswebif.cpp osismorph.lo: $(filtersdir)/osismorph.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osismorph.lo -MD -MP -MF $(DEPDIR)/osismorph.Tpo -c -o osismorph.lo `test -f '$(filtersdir)/osismorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorph.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osismorph.Tpo $(DEPDIR)/osismorph.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osismorph.cpp' object='osismorph.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osismorph.lo -MD -MP -MF $(DEPDIR)/osismorph.Tpo -c -o osismorph.lo `test -f '$(filtersdir)/osismorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorph.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osismorph.Tpo $(DEPDIR)/osismorph.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osismorph.cpp' object='osismorph.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osismorph.lo `test -f '$(filtersdir)/osismorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorph.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osismorph.lo `test -f '$(filtersdir)/osismorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorph.cpp osisstrongs.lo: $(filtersdir)/osisstrongs.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisstrongs.lo -MD -MP -MF $(DEPDIR)/osisstrongs.Tpo -c -o osisstrongs.lo `test -f '$(filtersdir)/osisstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisstrongs.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osisstrongs.Tpo $(DEPDIR)/osisstrongs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osisstrongs.cpp' object='osisstrongs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisstrongs.lo -MD -MP -MF $(DEPDIR)/osisstrongs.Tpo -c -o osisstrongs.lo `test -f '$(filtersdir)/osisstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisstrongs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisstrongs.Tpo $(DEPDIR)/osisstrongs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisstrongs.cpp' object='osisstrongs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisstrongs.lo `test -f '$(filtersdir)/osisstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisstrongs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisstrongs.lo `test -f '$(filtersdir)/osisstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisstrongs.cpp osisplain.lo: $(filtersdir)/osisplain.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisplain.lo -MD -MP -MF $(DEPDIR)/osisplain.Tpo -c -o osisplain.lo `test -f '$(filtersdir)/osisplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisplain.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osisplain.Tpo $(DEPDIR)/osisplain.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osisplain.cpp' object='osisplain.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisplain.lo -MD -MP -MF $(DEPDIR)/osisplain.Tpo -c -o osisplain.lo `test -f '$(filtersdir)/osisplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisplain.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisplain.Tpo $(DEPDIR)/osisplain.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisplain.cpp' object='osisplain.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisplain.lo `test -f '$(filtersdir)/osisplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisplain.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisplain.lo `test -f '$(filtersdir)/osisplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisplain.cpp osisrtf.lo: $(filtersdir)/osisrtf.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisrtf.lo -MD -MP -MF $(DEPDIR)/osisrtf.Tpo -c -o osisrtf.lo `test -f '$(filtersdir)/osisrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisrtf.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osisrtf.Tpo $(DEPDIR)/osisrtf.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osisrtf.cpp' object='osisrtf.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisrtf.lo -MD -MP -MF $(DEPDIR)/osisrtf.Tpo -c -o osisrtf.lo `test -f '$(filtersdir)/osisrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisrtf.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisrtf.Tpo $(DEPDIR)/osisrtf.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisrtf.cpp' object='osisrtf.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisrtf.lo `test -f '$(filtersdir)/osisrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisrtf.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisrtf.lo `test -f '$(filtersdir)/osisrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisrtf.cpp osislemma.lo: $(filtersdir)/osislemma.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osislemma.lo -MD -MP -MF $(DEPDIR)/osislemma.Tpo -c -o osislemma.lo `test -f '$(filtersdir)/osislemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/osislemma.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osislemma.Tpo $(DEPDIR)/osislemma.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osislemma.cpp' object='osislemma.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osislemma.lo -MD -MP -MF $(DEPDIR)/osislemma.Tpo -c -o osislemma.lo `test -f '$(filtersdir)/osislemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/osislemma.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osislemma.Tpo $(DEPDIR)/osislemma.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osislemma.cpp' object='osislemma.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osislemma.lo `test -f '$(filtersdir)/osislemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/osislemma.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osislemma.lo `test -f '$(filtersdir)/osislemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/osislemma.cpp osisredletterwords.lo: $(filtersdir)/osisredletterwords.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisredletterwords.lo -MD -MP -MF $(DEPDIR)/osisredletterwords.Tpo -c -o osisredletterwords.lo `test -f '$(filtersdir)/osisredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisredletterwords.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osisredletterwords.Tpo $(DEPDIR)/osisredletterwords.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osisredletterwords.cpp' object='osisredletterwords.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisredletterwords.lo -MD -MP -MF $(DEPDIR)/osisredletterwords.Tpo -c -o osisredletterwords.lo `test -f '$(filtersdir)/osisredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisredletterwords.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisredletterwords.Tpo $(DEPDIR)/osisredletterwords.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisredletterwords.cpp' object='osisredletterwords.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisredletterwords.lo `test -f '$(filtersdir)/osisredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisredletterwords.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisredletterwords.lo `test -f '$(filtersdir)/osisredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisredletterwords.cpp osisscripref.lo: $(filtersdir)/osisscripref.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisscripref.lo -MD -MP -MF $(DEPDIR)/osisscripref.Tpo -c -o osisscripref.lo `test -f '$(filtersdir)/osisscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisscripref.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osisscripref.Tpo $(DEPDIR)/osisscripref.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osisscripref.cpp' object='osisscripref.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisscripref.lo -MD -MP -MF $(DEPDIR)/osisscripref.Tpo -c -o osisscripref.lo `test -f '$(filtersdir)/osisscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisscripref.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisscripref.Tpo $(DEPDIR)/osisscripref.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisscripref.cpp' object='osisscripref.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisscripref.lo `test -f '$(filtersdir)/osisscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisscripref.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisscripref.lo `test -f '$(filtersdir)/osisscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisscripref.cpp osisvariants.lo: $(filtersdir)/osisvariants.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisvariants.lo -MD -MP -MF $(DEPDIR)/osisvariants.Tpo -c -o osisvariants.lo `test -f '$(filtersdir)/osisvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisvariants.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osisvariants.Tpo $(DEPDIR)/osisvariants.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osisvariants.cpp' object='osisvariants.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisvariants.lo -MD -MP -MF $(DEPDIR)/osisvariants.Tpo -c -o osisvariants.lo `test -f '$(filtersdir)/osisvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisvariants.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisvariants.Tpo $(DEPDIR)/osisvariants.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisvariants.cpp' object='osisvariants.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisvariants.lo `test -f '$(filtersdir)/osisvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisvariants.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisvariants.lo `test -f '$(filtersdir)/osisvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisvariants.cpp osiswordjs.lo: $(filtersdir)/osiswordjs.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osiswordjs.lo -MD -MP -MF $(DEPDIR)/osiswordjs.Tpo -c -o osiswordjs.lo `test -f '$(filtersdir)/osiswordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswordjs.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osiswordjs.Tpo $(DEPDIR)/osiswordjs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osiswordjs.cpp' object='osiswordjs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osiswordjs.lo -MD -MP -MF $(DEPDIR)/osiswordjs.Tpo -c -o osiswordjs.lo `test -f '$(filtersdir)/osiswordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswordjs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osiswordjs.Tpo $(DEPDIR)/osiswordjs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osiswordjs.cpp' object='osiswordjs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osiswordjs.lo `test -f '$(filtersdir)/osiswordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswordjs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osiswordjs.lo `test -f '$(filtersdir)/osiswordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswordjs.cpp osismorphsegmentation.lo: $(filtersdir)/osismorphsegmentation.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osismorphsegmentation.lo -MD -MP -MF $(DEPDIR)/osismorphsegmentation.Tpo -c -o osismorphsegmentation.lo `test -f '$(filtersdir)/osismorphsegmentation.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorphsegmentation.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osismorphsegmentation.Tpo $(DEPDIR)/osismorphsegmentation.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osismorphsegmentation.cpp' object='osismorphsegmentation.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osismorphsegmentation.lo -MD -MP -MF $(DEPDIR)/osismorphsegmentation.Tpo -c -o osismorphsegmentation.lo `test -f '$(filtersdir)/osismorphsegmentation.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorphsegmentation.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osismorphsegmentation.Tpo $(DEPDIR)/osismorphsegmentation.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osismorphsegmentation.cpp' object='osismorphsegmentation.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osismorphsegmentation.lo `test -f '$(filtersdir)/osismorphsegmentation.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorphsegmentation.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osismorphsegmentation.lo `test -f '$(filtersdir)/osismorphsegmentation.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorphsegmentation.cpp -osisruby.lo: $(filtersdir)/osisruby.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisruby.lo -MD -MP -MF $(DEPDIR)/osisruby.Tpo -c -o osisruby.lo `test -f '$(filtersdir)/osisruby.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisruby.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osisruby.Tpo $(DEPDIR)/osisruby.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osisruby.cpp' object='osisruby.lo' libtool=yes @AMDEPBACKSLASH@ +osisglosses.lo: $(filtersdir)/osisglosses.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisglosses.lo -MD -MP -MF $(DEPDIR)/osisglosses.Tpo -c -o osisglosses.lo `test -f '$(filtersdir)/osisglosses.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisglosses.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisglosses.Tpo $(DEPDIR)/osisglosses.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisglosses.cpp' object='osisglosses.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisruby.lo `test -f '$(filtersdir)/osisruby.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisruby.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisglosses.lo `test -f '$(filtersdir)/osisglosses.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisglosses.cpp + +osisenum.lo: $(filtersdir)/osisenum.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisenum.lo -MD -MP -MF $(DEPDIR)/osisenum.Tpo -c -o osisenum.lo `test -f '$(filtersdir)/osisenum.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisenum.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisenum.Tpo $(DEPDIR)/osisenum.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisenum.cpp' object='osisenum.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisenum.lo `test -f '$(filtersdir)/osisenum.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisenum.cpp + +osisxlit.lo: $(filtersdir)/osisxlit.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisxlit.lo -MD -MP -MF $(DEPDIR)/osisxlit.Tpo -c -o osisxlit.lo `test -f '$(filtersdir)/osisxlit.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisxlit.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisxlit.Tpo $(DEPDIR)/osisxlit.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisxlit.cpp' object='osisxlit.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisxlit.lo `test -f '$(filtersdir)/osisxlit.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisxlit.cpp + +osisreferencelinks.lo: $(filtersdir)/osisreferencelinks.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisreferencelinks.lo -MD -MP -MF $(DEPDIR)/osisreferencelinks.Tpo -c -o osisreferencelinks.lo `test -f '$(filtersdir)/osisreferencelinks.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisreferencelinks.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisreferencelinks.Tpo $(DEPDIR)/osisreferencelinks.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisreferencelinks.cpp' object='osisreferencelinks.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisreferencelinks.lo `test -f '$(filtersdir)/osisreferencelinks.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisreferencelinks.cpp gbfhtml.lo: $(filtersdir)/gbfhtml.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfhtml.lo -MD -MP -MF $(DEPDIR)/gbfhtml.Tpo -c -o gbfhtml.lo `test -f '$(filtersdir)/gbfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtml.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfhtml.Tpo $(DEPDIR)/gbfhtml.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfhtml.cpp' object='gbfhtml.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfhtml.lo -MD -MP -MF $(DEPDIR)/gbfhtml.Tpo -c -o gbfhtml.lo `test -f '$(filtersdir)/gbfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfhtml.Tpo $(DEPDIR)/gbfhtml.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfhtml.cpp' object='gbfhtml.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfhtml.lo `test -f '$(filtersdir)/gbfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtml.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfhtml.lo `test -f '$(filtersdir)/gbfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtml.cpp gbfhtmlhref.lo: $(filtersdir)/gbfhtmlhref.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfhtmlhref.lo -MD -MP -MF $(DEPDIR)/gbfhtmlhref.Tpo -c -o gbfhtmlhref.lo `test -f '$(filtersdir)/gbfhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtmlhref.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfhtmlhref.Tpo $(DEPDIR)/gbfhtmlhref.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfhtmlhref.cpp' object='gbfhtmlhref.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfhtmlhref.lo -MD -MP -MF $(DEPDIR)/gbfhtmlhref.Tpo -c -o gbfhtmlhref.lo `test -f '$(filtersdir)/gbfhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtmlhref.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfhtmlhref.Tpo $(DEPDIR)/gbfhtmlhref.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfhtmlhref.cpp' object='gbfhtmlhref.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfhtmlhref.lo `test -f '$(filtersdir)/gbfhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtmlhref.cpp + +gbfxhtml.lo: $(filtersdir)/gbfxhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfxhtml.lo -MD -MP -MF $(DEPDIR)/gbfxhtml.Tpo -c -o gbfxhtml.lo `test -f '$(filtersdir)/gbfxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfxhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfxhtml.Tpo $(DEPDIR)/gbfxhtml.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfxhtml.cpp' object='gbfxhtml.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfhtmlhref.lo `test -f '$(filtersdir)/gbfhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtmlhref.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfxhtml.lo `test -f '$(filtersdir)/gbfxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfxhtml.cpp gbfwebif.lo: $(filtersdir)/gbfwebif.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfwebif.lo -MD -MP -MF $(DEPDIR)/gbfwebif.Tpo -c -o gbfwebif.lo `test -f '$(filtersdir)/gbfwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwebif.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfwebif.Tpo $(DEPDIR)/gbfwebif.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfwebif.cpp' object='gbfwebif.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfwebif.lo -MD -MP -MF $(DEPDIR)/gbfwebif.Tpo -c -o gbfwebif.lo `test -f '$(filtersdir)/gbfwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwebif.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfwebif.Tpo $(DEPDIR)/gbfwebif.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfwebif.cpp' object='gbfwebif.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfwebif.lo `test -f '$(filtersdir)/gbfwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwebif.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfwebif.lo `test -f '$(filtersdir)/gbfwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwebif.cpp gbfplain.lo: $(filtersdir)/gbfplain.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfplain.lo -MD -MP -MF $(DEPDIR)/gbfplain.Tpo -c -o gbfplain.lo `test -f '$(filtersdir)/gbfplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfplain.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfplain.Tpo $(DEPDIR)/gbfplain.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfplain.cpp' object='gbfplain.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfplain.lo -MD -MP -MF $(DEPDIR)/gbfplain.Tpo -c -o gbfplain.lo `test -f '$(filtersdir)/gbfplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfplain.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfplain.Tpo $(DEPDIR)/gbfplain.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfplain.cpp' object='gbfplain.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfplain.lo `test -f '$(filtersdir)/gbfplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfplain.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfplain.lo `test -f '$(filtersdir)/gbfplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfplain.cpp gbfrtf.lo: $(filtersdir)/gbfrtf.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfrtf.lo -MD -MP -MF $(DEPDIR)/gbfrtf.Tpo -c -o gbfrtf.lo `test -f '$(filtersdir)/gbfrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfrtf.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfrtf.Tpo $(DEPDIR)/gbfrtf.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfrtf.cpp' object='gbfrtf.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfrtf.lo -MD -MP -MF $(DEPDIR)/gbfrtf.Tpo -c -o gbfrtf.lo `test -f '$(filtersdir)/gbfrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfrtf.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfrtf.Tpo $(DEPDIR)/gbfrtf.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfrtf.cpp' object='gbfrtf.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfrtf.lo `test -f '$(filtersdir)/gbfrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfrtf.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfrtf.lo `test -f '$(filtersdir)/gbfrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfrtf.cpp gbfstrongs.lo: $(filtersdir)/gbfstrongs.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfstrongs.lo -MD -MP -MF $(DEPDIR)/gbfstrongs.Tpo -c -o gbfstrongs.lo `test -f '$(filtersdir)/gbfstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfstrongs.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfstrongs.Tpo $(DEPDIR)/gbfstrongs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfstrongs.cpp' object='gbfstrongs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfstrongs.lo -MD -MP -MF $(DEPDIR)/gbfstrongs.Tpo -c -o gbfstrongs.lo `test -f '$(filtersdir)/gbfstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfstrongs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfstrongs.Tpo $(DEPDIR)/gbfstrongs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfstrongs.cpp' object='gbfstrongs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfstrongs.lo `test -f '$(filtersdir)/gbfstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfstrongs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfstrongs.lo `test -f '$(filtersdir)/gbfstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfstrongs.cpp gbffootnotes.lo: $(filtersdir)/gbffootnotes.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbffootnotes.lo -MD -MP -MF $(DEPDIR)/gbffootnotes.Tpo -c -o gbffootnotes.lo `test -f '$(filtersdir)/gbffootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbffootnotes.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbffootnotes.Tpo $(DEPDIR)/gbffootnotes.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbffootnotes.cpp' object='gbffootnotes.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbffootnotes.lo -MD -MP -MF $(DEPDIR)/gbffootnotes.Tpo -c -o gbffootnotes.lo `test -f '$(filtersdir)/gbffootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbffootnotes.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbffootnotes.Tpo $(DEPDIR)/gbffootnotes.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbffootnotes.cpp' object='gbffootnotes.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbffootnotes.lo `test -f '$(filtersdir)/gbffootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbffootnotes.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbffootnotes.lo `test -f '$(filtersdir)/gbffootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbffootnotes.cpp gbfheadings.lo: $(filtersdir)/gbfheadings.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfheadings.lo -MD -MP -MF $(DEPDIR)/gbfheadings.Tpo -c -o gbfheadings.lo `test -f '$(filtersdir)/gbfheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfheadings.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfheadings.Tpo $(DEPDIR)/gbfheadings.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfheadings.cpp' object='gbfheadings.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfheadings.lo -MD -MP -MF $(DEPDIR)/gbfheadings.Tpo -c -o gbfheadings.lo `test -f '$(filtersdir)/gbfheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfheadings.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfheadings.Tpo $(DEPDIR)/gbfheadings.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfheadings.cpp' object='gbfheadings.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfheadings.lo `test -f '$(filtersdir)/gbfheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfheadings.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfheadings.lo `test -f '$(filtersdir)/gbfheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfheadings.cpp gbfredletterwords.lo: $(filtersdir)/gbfredletterwords.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfredletterwords.lo -MD -MP -MF $(DEPDIR)/gbfredletterwords.Tpo -c -o gbfredletterwords.lo `test -f '$(filtersdir)/gbfredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfredletterwords.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfredletterwords.Tpo $(DEPDIR)/gbfredletterwords.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfredletterwords.cpp' object='gbfredletterwords.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfredletterwords.lo -MD -MP -MF $(DEPDIR)/gbfredletterwords.Tpo -c -o gbfredletterwords.lo `test -f '$(filtersdir)/gbfredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfredletterwords.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfredletterwords.Tpo $(DEPDIR)/gbfredletterwords.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfredletterwords.cpp' object='gbfredletterwords.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfredletterwords.lo `test -f '$(filtersdir)/gbfredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfredletterwords.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfredletterwords.lo `test -f '$(filtersdir)/gbfredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfredletterwords.cpp gbfmorph.lo: $(filtersdir)/gbfmorph.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfmorph.lo -MD -MP -MF $(DEPDIR)/gbfmorph.Tpo -c -o gbfmorph.lo `test -f '$(filtersdir)/gbfmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfmorph.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfmorph.Tpo $(DEPDIR)/gbfmorph.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfmorph.cpp' object='gbfmorph.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfmorph.lo -MD -MP -MF $(DEPDIR)/gbfmorph.Tpo -c -o gbfmorph.lo `test -f '$(filtersdir)/gbfmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfmorph.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfmorph.Tpo $(DEPDIR)/gbfmorph.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfmorph.cpp' object='gbfmorph.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfmorph.lo `test -f '$(filtersdir)/gbfmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfmorph.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfmorph.lo `test -f '$(filtersdir)/gbfmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfmorph.cpp gbfwordjs.lo: $(filtersdir)/gbfwordjs.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfwordjs.lo -MD -MP -MF $(DEPDIR)/gbfwordjs.Tpo -c -o gbfwordjs.lo `test -f '$(filtersdir)/gbfwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwordjs.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfwordjs.Tpo $(DEPDIR)/gbfwordjs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfwordjs.cpp' object='gbfwordjs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfwordjs.lo -MD -MP -MF $(DEPDIR)/gbfwordjs.Tpo -c -o gbfwordjs.lo `test -f '$(filtersdir)/gbfwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwordjs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfwordjs.Tpo $(DEPDIR)/gbfwordjs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfwordjs.cpp' object='gbfwordjs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfwordjs.lo `test -f '$(filtersdir)/gbfwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwordjs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfwordjs.lo `test -f '$(filtersdir)/gbfwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwordjs.cpp thmlstrongs.lo: $(filtersdir)/thmlstrongs.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlstrongs.lo -MD -MP -MF $(DEPDIR)/thmlstrongs.Tpo -c -o thmlstrongs.lo `test -f '$(filtersdir)/thmlstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlstrongs.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlstrongs.Tpo $(DEPDIR)/thmlstrongs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlstrongs.cpp' object='thmlstrongs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlstrongs.lo -MD -MP -MF $(DEPDIR)/thmlstrongs.Tpo -c -o thmlstrongs.lo `test -f '$(filtersdir)/thmlstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlstrongs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlstrongs.Tpo $(DEPDIR)/thmlstrongs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlstrongs.cpp' object='thmlstrongs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlstrongs.lo `test -f '$(filtersdir)/thmlstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlstrongs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlstrongs.lo `test -f '$(filtersdir)/thmlstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlstrongs.cpp thmlfootnotes.lo: $(filtersdir)/thmlfootnotes.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlfootnotes.lo -MD -MP -MF $(DEPDIR)/thmlfootnotes.Tpo -c -o thmlfootnotes.lo `test -f '$(filtersdir)/thmlfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlfootnotes.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlfootnotes.Tpo $(DEPDIR)/thmlfootnotes.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlfootnotes.cpp' object='thmlfootnotes.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlfootnotes.lo -MD -MP -MF $(DEPDIR)/thmlfootnotes.Tpo -c -o thmlfootnotes.lo `test -f '$(filtersdir)/thmlfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlfootnotes.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlfootnotes.Tpo $(DEPDIR)/thmlfootnotes.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlfootnotes.cpp' object='thmlfootnotes.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlfootnotes.lo `test -f '$(filtersdir)/thmlfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlfootnotes.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlfootnotes.lo `test -f '$(filtersdir)/thmlfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlfootnotes.cpp thmlheadings.lo: $(filtersdir)/thmlheadings.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlheadings.lo -MD -MP -MF $(DEPDIR)/thmlheadings.Tpo -c -o thmlheadings.lo `test -f '$(filtersdir)/thmlheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlheadings.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlheadings.Tpo $(DEPDIR)/thmlheadings.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlheadings.cpp' object='thmlheadings.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlheadings.lo -MD -MP -MF $(DEPDIR)/thmlheadings.Tpo -c -o thmlheadings.lo `test -f '$(filtersdir)/thmlheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlheadings.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlheadings.Tpo $(DEPDIR)/thmlheadings.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlheadings.cpp' object='thmlheadings.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlheadings.lo `test -f '$(filtersdir)/thmlheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlheadings.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlheadings.lo `test -f '$(filtersdir)/thmlheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlheadings.cpp thmlmorph.lo: $(filtersdir)/thmlmorph.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlmorph.lo -MD -MP -MF $(DEPDIR)/thmlmorph.Tpo -c -o thmlmorph.lo `test -f '$(filtersdir)/thmlmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlmorph.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlmorph.Tpo $(DEPDIR)/thmlmorph.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlmorph.cpp' object='thmlmorph.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlmorph.lo -MD -MP -MF $(DEPDIR)/thmlmorph.Tpo -c -o thmlmorph.lo `test -f '$(filtersdir)/thmlmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlmorph.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlmorph.Tpo $(DEPDIR)/thmlmorph.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlmorph.cpp' object='thmlmorph.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlmorph.lo `test -f '$(filtersdir)/thmlmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlmorph.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlmorph.lo `test -f '$(filtersdir)/thmlmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlmorph.cpp thmllemma.lo: $(filtersdir)/thmllemma.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmllemma.lo -MD -MP -MF $(DEPDIR)/thmllemma.Tpo -c -o thmllemma.lo `test -f '$(filtersdir)/thmllemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmllemma.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmllemma.Tpo $(DEPDIR)/thmllemma.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmllemma.cpp' object='thmllemma.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmllemma.lo -MD -MP -MF $(DEPDIR)/thmllemma.Tpo -c -o thmllemma.lo `test -f '$(filtersdir)/thmllemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmllemma.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmllemma.Tpo $(DEPDIR)/thmllemma.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmllemma.cpp' object='thmllemma.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmllemma.lo `test -f '$(filtersdir)/thmllemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmllemma.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmllemma.lo `test -f '$(filtersdir)/thmllemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmllemma.cpp thmlscripref.lo: $(filtersdir)/thmlscripref.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlscripref.lo -MD -MP -MF $(DEPDIR)/thmlscripref.Tpo -c -o thmlscripref.lo `test -f '$(filtersdir)/thmlscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlscripref.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlscripref.Tpo $(DEPDIR)/thmlscripref.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlscripref.cpp' object='thmlscripref.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlscripref.lo -MD -MP -MF $(DEPDIR)/thmlscripref.Tpo -c -o thmlscripref.lo `test -f '$(filtersdir)/thmlscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlscripref.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlscripref.Tpo $(DEPDIR)/thmlscripref.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlscripref.cpp' object='thmlscripref.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlscripref.lo `test -f '$(filtersdir)/thmlscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlscripref.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlscripref.lo `test -f '$(filtersdir)/thmlscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlscripref.cpp thmlvariants.lo: $(filtersdir)/thmlvariants.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlvariants.lo -MD -MP -MF $(DEPDIR)/thmlvariants.Tpo -c -o thmlvariants.lo `test -f '$(filtersdir)/thmlvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlvariants.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlvariants.Tpo $(DEPDIR)/thmlvariants.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlvariants.cpp' object='thmlvariants.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlvariants.lo -MD -MP -MF $(DEPDIR)/thmlvariants.Tpo -c -o thmlvariants.lo `test -f '$(filtersdir)/thmlvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlvariants.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlvariants.Tpo $(DEPDIR)/thmlvariants.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlvariants.cpp' object='thmlvariants.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlvariants.lo `test -f '$(filtersdir)/thmlvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlvariants.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlvariants.lo `test -f '$(filtersdir)/thmlvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlvariants.cpp thmlgbf.lo: $(filtersdir)/thmlgbf.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlgbf.lo -MD -MP -MF $(DEPDIR)/thmlgbf.Tpo -c -o thmlgbf.lo `test -f '$(filtersdir)/thmlgbf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlgbf.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlgbf.Tpo $(DEPDIR)/thmlgbf.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlgbf.cpp' object='thmlgbf.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlgbf.lo -MD -MP -MF $(DEPDIR)/thmlgbf.Tpo -c -o thmlgbf.lo `test -f '$(filtersdir)/thmlgbf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlgbf.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlgbf.Tpo $(DEPDIR)/thmlgbf.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlgbf.cpp' object='thmlgbf.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlgbf.lo `test -f '$(filtersdir)/thmlgbf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlgbf.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlgbf.lo `test -f '$(filtersdir)/thmlgbf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlgbf.cpp thmlrtf.lo: $(filtersdir)/thmlrtf.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlrtf.lo -MD -MP -MF $(DEPDIR)/thmlrtf.Tpo -c -o thmlrtf.lo `test -f '$(filtersdir)/thmlrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlrtf.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlrtf.Tpo $(DEPDIR)/thmlrtf.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlrtf.cpp' object='thmlrtf.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlrtf.lo -MD -MP -MF $(DEPDIR)/thmlrtf.Tpo -c -o thmlrtf.lo `test -f '$(filtersdir)/thmlrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlrtf.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlrtf.Tpo $(DEPDIR)/thmlrtf.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlrtf.cpp' object='thmlrtf.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlrtf.lo `test -f '$(filtersdir)/thmlrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlrtf.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlrtf.lo `test -f '$(filtersdir)/thmlrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlrtf.cpp thmlhtml.lo: $(filtersdir)/thmlhtml.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlhtml.lo -MD -MP -MF $(DEPDIR)/thmlhtml.Tpo -c -o thmlhtml.lo `test -f '$(filtersdir)/thmlhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtml.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlhtml.Tpo $(DEPDIR)/thmlhtml.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlhtml.cpp' object='thmlhtml.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlhtml.lo -MD -MP -MF $(DEPDIR)/thmlhtml.Tpo -c -o thmlhtml.lo `test -f '$(filtersdir)/thmlhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlhtml.Tpo $(DEPDIR)/thmlhtml.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlhtml.cpp' object='thmlhtml.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlhtml.lo `test -f '$(filtersdir)/thmlhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtml.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlhtml.lo `test -f '$(filtersdir)/thmlhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtml.cpp thmlhtmlhref.lo: $(filtersdir)/thmlhtmlhref.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlhtmlhref.lo -MD -MP -MF $(DEPDIR)/thmlhtmlhref.Tpo -c -o thmlhtmlhref.lo `test -f '$(filtersdir)/thmlhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtmlhref.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlhtmlhref.Tpo $(DEPDIR)/thmlhtmlhref.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlhtmlhref.cpp' object='thmlhtmlhref.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlhtmlhref.lo -MD -MP -MF $(DEPDIR)/thmlhtmlhref.Tpo -c -o thmlhtmlhref.lo `test -f '$(filtersdir)/thmlhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtmlhref.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlhtmlhref.Tpo $(DEPDIR)/thmlhtmlhref.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlhtmlhref.cpp' object='thmlhtmlhref.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlhtmlhref.lo `test -f '$(filtersdir)/thmlhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtmlhref.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlhtmlhref.lo `test -f '$(filtersdir)/thmlhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtmlhref.cpp + +thmlxhtml.lo: $(filtersdir)/thmlxhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlxhtml.lo -MD -MP -MF $(DEPDIR)/thmlxhtml.Tpo -c -o thmlxhtml.lo `test -f '$(filtersdir)/thmlxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlxhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlxhtml.Tpo $(DEPDIR)/thmlxhtml.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlxhtml.cpp' object='thmlxhtml.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlxhtml.lo `test -f '$(filtersdir)/thmlxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlxhtml.cpp thmlwebif.lo: $(filtersdir)/thmlwebif.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlwebif.lo -MD -MP -MF $(DEPDIR)/thmlwebif.Tpo -c -o thmlwebif.lo `test -f '$(filtersdir)/thmlwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwebif.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlwebif.Tpo $(DEPDIR)/thmlwebif.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlwebif.cpp' object='thmlwebif.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlwebif.lo -MD -MP -MF $(DEPDIR)/thmlwebif.Tpo -c -o thmlwebif.lo `test -f '$(filtersdir)/thmlwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwebif.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlwebif.Tpo $(DEPDIR)/thmlwebif.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlwebif.cpp' object='thmlwebif.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlwebif.lo `test -f '$(filtersdir)/thmlwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwebif.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlwebif.lo `test -f '$(filtersdir)/thmlwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwebif.cpp thmlwordjs.lo: $(filtersdir)/thmlwordjs.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlwordjs.lo -MD -MP -MF $(DEPDIR)/thmlwordjs.Tpo -c -o thmlwordjs.lo `test -f '$(filtersdir)/thmlwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwordjs.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlwordjs.Tpo $(DEPDIR)/thmlwordjs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlwordjs.cpp' object='thmlwordjs.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlwordjs.lo -MD -MP -MF $(DEPDIR)/thmlwordjs.Tpo -c -o thmlwordjs.lo `test -f '$(filtersdir)/thmlwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwordjs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlwordjs.Tpo $(DEPDIR)/thmlwordjs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlwordjs.cpp' object='thmlwordjs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlwordjs.lo `test -f '$(filtersdir)/thmlwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwordjs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlwordjs.lo `test -f '$(filtersdir)/thmlwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwordjs.cpp gbfthml.lo: $(filtersdir)/gbfthml.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfthml.lo -MD -MP -MF $(DEPDIR)/gbfthml.Tpo -c -o gbfthml.lo `test -f '$(filtersdir)/gbfthml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfthml.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfthml.Tpo $(DEPDIR)/gbfthml.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfthml.cpp' object='gbfthml.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfthml.lo -MD -MP -MF $(DEPDIR)/gbfthml.Tpo -c -o gbfthml.lo `test -f '$(filtersdir)/gbfthml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfthml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfthml.Tpo $(DEPDIR)/gbfthml.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfthml.cpp' object='gbfthml.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfthml.lo `test -f '$(filtersdir)/gbfthml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfthml.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfthml.lo `test -f '$(filtersdir)/gbfthml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfthml.cpp gbfosis.lo: $(filtersdir)/gbfosis.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfosis.lo -MD -MP -MF $(DEPDIR)/gbfosis.Tpo -c -o gbfosis.lo `test -f '$(filtersdir)/gbfosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfosis.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gbfosis.Tpo $(DEPDIR)/gbfosis.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/gbfosis.cpp' object='gbfosis.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfosis.lo -MD -MP -MF $(DEPDIR)/gbfosis.Tpo -c -o gbfosis.lo `test -f '$(filtersdir)/gbfosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfosis.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbfosis.Tpo $(DEPDIR)/gbfosis.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/gbfosis.cpp' object='gbfosis.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfosis.lo `test -f '$(filtersdir)/gbfosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfosis.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfosis.lo `test -f '$(filtersdir)/gbfosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfosis.cpp thmlosis.lo: $(filtersdir)/thmlosis.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlosis.lo -MD -MP -MF $(DEPDIR)/thmlosis.Tpo -c -o thmlosis.lo `test -f '$(filtersdir)/thmlosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlosis.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlosis.Tpo $(DEPDIR)/thmlosis.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlosis.cpp' object='thmlosis.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlosis.lo -MD -MP -MF $(DEPDIR)/thmlosis.Tpo -c -o thmlosis.lo `test -f '$(filtersdir)/thmlosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlosis.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlosis.Tpo $(DEPDIR)/thmlosis.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlosis.cpp' object='thmlosis.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlosis.lo `test -f '$(filtersdir)/thmlosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlosis.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlosis.lo `test -f '$(filtersdir)/thmlosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlosis.cpp thmlplain.lo: $(filtersdir)/thmlplain.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlplain.lo -MD -MP -MF $(DEPDIR)/thmlplain.Tpo -c -o thmlplain.lo `test -f '$(filtersdir)/thmlplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlplain.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thmlplain.Tpo $(DEPDIR)/thmlplain.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/thmlplain.cpp' object='thmlplain.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlplain.lo -MD -MP -MF $(DEPDIR)/thmlplain.Tpo -c -o thmlplain.lo `test -f '$(filtersdir)/thmlplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlplain.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/thmlplain.Tpo $(DEPDIR)/thmlplain.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/thmlplain.cpp' object='thmlplain.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlplain.lo `test -f '$(filtersdir)/thmlplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlplain.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlplain.lo `test -f '$(filtersdir)/thmlplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlplain.cpp osisosis.lo: $(filtersdir)/osisosis.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisosis.lo -MD -MP -MF $(DEPDIR)/osisosis.Tpo -c -o osisosis.lo `test -f '$(filtersdir)/osisosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisosis.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/osisosis.Tpo $(DEPDIR)/osisosis.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/osisosis.cpp' object='osisosis.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisosis.lo -MD -MP -MF $(DEPDIR)/osisosis.Tpo -c -o osisosis.lo `test -f '$(filtersdir)/osisosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisosis.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/osisosis.Tpo $(DEPDIR)/osisosis.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/osisosis.cpp' object='osisosis.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisosis.lo `test -f '$(filtersdir)/osisosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisosis.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisosis.lo `test -f '$(filtersdir)/osisosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisosis.cpp rtfhtml.lo: $(filtersdir)/rtfhtml.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rtfhtml.lo -MD -MP -MF $(DEPDIR)/rtfhtml.Tpo -c -o rtfhtml.lo `test -f '$(filtersdir)/rtfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/rtfhtml.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rtfhtml.Tpo $(DEPDIR)/rtfhtml.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/rtfhtml.cpp' object='rtfhtml.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rtfhtml.lo -MD -MP -MF $(DEPDIR)/rtfhtml.Tpo -c -o rtfhtml.lo `test -f '$(filtersdir)/rtfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/rtfhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rtfhtml.Tpo $(DEPDIR)/rtfhtml.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/rtfhtml.cpp' object='rtfhtml.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rtfhtml.lo `test -f '$(filtersdir)/rtfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/rtfhtml.cpp - -plainfootnotes.lo: $(filtersdir)/plainfootnotes.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plainfootnotes.lo -MD -MP -MF $(DEPDIR)/plainfootnotes.Tpo -c -o plainfootnotes.lo `test -f '$(filtersdir)/plainfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/plainfootnotes.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/plainfootnotes.Tpo $(DEPDIR)/plainfootnotes.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/plainfootnotes.cpp' object='plainfootnotes.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plainfootnotes.lo `test -f '$(filtersdir)/plainfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/plainfootnotes.cpp - -plainhtml.lo: $(filtersdir)/plainhtml.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plainhtml.lo -MD -MP -MF $(DEPDIR)/plainhtml.Tpo -c -o plainhtml.lo `test -f '$(filtersdir)/plainhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/plainhtml.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/plainhtml.Tpo $(DEPDIR)/plainhtml.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/plainhtml.cpp' object='plainhtml.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plainhtml.lo `test -f '$(filtersdir)/plainhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/plainhtml.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rtfhtml.lo `test -f '$(filtersdir)/rtfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/rtfhtml.cpp greeklexattribs.lo: $(filtersdir)/greeklexattribs.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT greeklexattribs.lo -MD -MP -MF $(DEPDIR)/greeklexattribs.Tpo -c -o greeklexattribs.lo `test -f '$(filtersdir)/greeklexattribs.cpp' || echo '$(srcdir)/'`$(filtersdir)/greeklexattribs.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/greeklexattribs.Tpo $(DEPDIR)/greeklexattribs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/greeklexattribs.cpp' object='greeklexattribs.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o greeklexattribs.lo `test -f '$(filtersdir)/greeklexattribs.cpp' || echo '$(srcdir)/'`$(filtersdir)/greeklexattribs.cpp - -unicodertf.lo: $(filtersdir)/unicodertf.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unicodertf.lo -MD -MP -MF $(DEPDIR)/unicodertf.Tpo -c -o unicodertf.lo `test -f '$(filtersdir)/unicodertf.cpp' || echo '$(srcdir)/'`$(filtersdir)/unicodertf.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/unicodertf.Tpo $(DEPDIR)/unicodertf.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/unicodertf.cpp' object='unicodertf.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT greeklexattribs.lo -MD -MP -MF $(DEPDIR)/greeklexattribs.Tpo -c -o greeklexattribs.lo `test -f '$(filtersdir)/greeklexattribs.cpp' || echo '$(srcdir)/'`$(filtersdir)/greeklexattribs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/greeklexattribs.Tpo $(DEPDIR)/greeklexattribs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/greeklexattribs.cpp' object='greeklexattribs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unicodertf.lo `test -f '$(filtersdir)/unicodertf.cpp' || echo '$(srcdir)/'`$(filtersdir)/unicodertf.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o greeklexattribs.lo `test -f '$(filtersdir)/greeklexattribs.cpp' || echo '$(srcdir)/'`$(filtersdir)/greeklexattribs.cpp papyriplain.lo: $(filtersdir)/papyriplain.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT papyriplain.lo -MD -MP -MF $(DEPDIR)/papyriplain.Tpo -c -o papyriplain.lo `test -f '$(filtersdir)/papyriplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/papyriplain.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/papyriplain.Tpo $(DEPDIR)/papyriplain.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/papyriplain.cpp' object='papyriplain.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT papyriplain.lo -MD -MP -MF $(DEPDIR)/papyriplain.Tpo -c -o papyriplain.lo `test -f '$(filtersdir)/papyriplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/papyriplain.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/papyriplain.Tpo $(DEPDIR)/papyriplain.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/papyriplain.cpp' object='papyriplain.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o papyriplain.lo `test -f '$(filtersdir)/papyriplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/papyriplain.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o papyriplain.lo `test -f '$(filtersdir)/papyriplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/papyriplain.cpp teiplain.lo: $(filtersdir)/teiplain.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teiplain.lo -MD -MP -MF $(DEPDIR)/teiplain.Tpo -c -o teiplain.lo `test -f '$(filtersdir)/teiplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/teiplain.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/teiplain.Tpo $(DEPDIR)/teiplain.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/teiplain.cpp' object='teiplain.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teiplain.lo -MD -MP -MF $(DEPDIR)/teiplain.Tpo -c -o teiplain.lo `test -f '$(filtersdir)/teiplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/teiplain.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/teiplain.Tpo $(DEPDIR)/teiplain.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/teiplain.cpp' object='teiplain.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teiplain.lo `test -f '$(filtersdir)/teiplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/teiplain.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teiplain.lo `test -f '$(filtersdir)/teiplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/teiplain.cpp teirtf.lo: $(filtersdir)/teirtf.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teirtf.lo -MD -MP -MF $(DEPDIR)/teirtf.Tpo -c -o teirtf.lo `test -f '$(filtersdir)/teirtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/teirtf.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/teirtf.Tpo $(DEPDIR)/teirtf.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/teirtf.cpp' object='teirtf.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teirtf.lo -MD -MP -MF $(DEPDIR)/teirtf.Tpo -c -o teirtf.lo `test -f '$(filtersdir)/teirtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/teirtf.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/teirtf.Tpo $(DEPDIR)/teirtf.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/teirtf.cpp' object='teirtf.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teirtf.lo `test -f '$(filtersdir)/teirtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/teirtf.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teirtf.lo `test -f '$(filtersdir)/teirtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/teirtf.cpp teihtmlhref.lo: $(filtersdir)/teihtmlhref.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teihtmlhref.lo -MD -MP -MF $(DEPDIR)/teihtmlhref.Tpo -c -o teihtmlhref.lo `test -f '$(filtersdir)/teihtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/teihtmlhref.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/teihtmlhref.Tpo $(DEPDIR)/teihtmlhref.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(filtersdir)/teihtmlhref.cpp' object='teihtmlhref.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teihtmlhref.lo -MD -MP -MF $(DEPDIR)/teihtmlhref.Tpo -c -o teihtmlhref.lo `test -f '$(filtersdir)/teihtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/teihtmlhref.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/teihtmlhref.Tpo $(DEPDIR)/teihtmlhref.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/teihtmlhref.cpp' object='teihtmlhref.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teihtmlhref.lo `test -f '$(filtersdir)/teihtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/teihtmlhref.cpp + +teixhtml.lo: $(filtersdir)/teixhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teixhtml.lo -MD -MP -MF $(DEPDIR)/teixhtml.Tpo -c -o teixhtml.lo `test -f '$(filtersdir)/teixhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/teixhtml.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/teixhtml.Tpo $(DEPDIR)/teixhtml.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(filtersdir)/teixhtml.cpp' object='teixhtml.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teihtmlhref.lo `test -f '$(filtersdir)/teihtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/teihtmlhref.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teixhtml.lo `test -f '$(filtersdir)/teixhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/teixhtml.cpp swgenbook.lo: $(genbookdir)/swgenbook.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swgenbook.lo -MD -MP -MF $(DEPDIR)/swgenbook.Tpo -c -o swgenbook.lo `test -f '$(genbookdir)/swgenbook.cpp' || echo '$(srcdir)/'`$(genbookdir)/swgenbook.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swgenbook.Tpo $(DEPDIR)/swgenbook.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(genbookdir)/swgenbook.cpp' object='swgenbook.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swgenbook.lo -MD -MP -MF $(DEPDIR)/swgenbook.Tpo -c -o swgenbook.lo `test -f '$(genbookdir)/swgenbook.cpp' || echo '$(srcdir)/'`$(genbookdir)/swgenbook.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swgenbook.Tpo $(DEPDIR)/swgenbook.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(genbookdir)/swgenbook.cpp' object='swgenbook.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swgenbook.lo `test -f '$(genbookdir)/swgenbook.cpp' || echo '$(srcdir)/'`$(genbookdir)/swgenbook.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swgenbook.lo `test -f '$(genbookdir)/swgenbook.cpp' || echo '$(srcdir)/'`$(genbookdir)/swgenbook.cpp rawgenbook.lo: $(rawgenbookdir)/rawgenbook.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawgenbook.lo -MD -MP -MF $(DEPDIR)/rawgenbook.Tpo -c -o rawgenbook.lo `test -f '$(rawgenbookdir)/rawgenbook.cpp' || echo '$(srcdir)/'`$(rawgenbookdir)/rawgenbook.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawgenbook.Tpo $(DEPDIR)/rawgenbook.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(rawgenbookdir)/rawgenbook.cpp' object='rawgenbook.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawgenbook.lo -MD -MP -MF $(DEPDIR)/rawgenbook.Tpo -c -o rawgenbook.lo `test -f '$(rawgenbookdir)/rawgenbook.cpp' || echo '$(srcdir)/'`$(rawgenbookdir)/rawgenbook.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawgenbook.Tpo $(DEPDIR)/rawgenbook.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(rawgenbookdir)/rawgenbook.cpp' object='rawgenbook.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawgenbook.lo `test -f '$(rawgenbookdir)/rawgenbook.cpp' || echo '$(srcdir)/'`$(rawgenbookdir)/rawgenbook.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawgenbook.lo `test -f '$(rawgenbookdir)/rawgenbook.cpp' || echo '$(srcdir)/'`$(rawgenbookdir)/rawgenbook.cpp swtext.lo: $(textsdir)/swtext.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swtext.lo -MD -MP -MF $(DEPDIR)/swtext.Tpo -c -o swtext.lo `test -f '$(textsdir)/swtext.cpp' || echo '$(srcdir)/'`$(textsdir)/swtext.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swtext.Tpo $(DEPDIR)/swtext.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(textsdir)/swtext.cpp' object='swtext.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swtext.lo -MD -MP -MF $(DEPDIR)/swtext.Tpo -c -o swtext.lo `test -f '$(textsdir)/swtext.cpp' || echo '$(srcdir)/'`$(textsdir)/swtext.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swtext.Tpo $(DEPDIR)/swtext.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(textsdir)/swtext.cpp' object='swtext.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swtext.lo `test -f '$(textsdir)/swtext.cpp' || echo '$(srcdir)/'`$(textsdir)/swtext.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swtext.lo `test -f '$(textsdir)/swtext.cpp' || echo '$(srcdir)/'`$(textsdir)/swtext.cpp rawtext.lo: $(rawtextdir)/rawtext.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawtext.lo -MD -MP -MF $(DEPDIR)/rawtext.Tpo -c -o rawtext.lo `test -f '$(rawtextdir)/rawtext.cpp' || echo '$(srcdir)/'`$(rawtextdir)/rawtext.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawtext.Tpo $(DEPDIR)/rawtext.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(rawtextdir)/rawtext.cpp' object='rawtext.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawtext.lo -MD -MP -MF $(DEPDIR)/rawtext.Tpo -c -o rawtext.lo `test -f '$(rawtextdir)/rawtext.cpp' || echo '$(srcdir)/'`$(rawtextdir)/rawtext.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawtext.Tpo $(DEPDIR)/rawtext.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(rawtextdir)/rawtext.cpp' object='rawtext.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawtext.lo `test -f '$(rawtextdir)/rawtext.cpp' || echo '$(srcdir)/'`$(rawtextdir)/rawtext.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawtext.lo `test -f '$(rawtextdir)/rawtext.cpp' || echo '$(srcdir)/'`$(rawtextdir)/rawtext.cpp rawtext4.lo: $(rawtext4dir)/rawtext4.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawtext4.lo -MD -MP -MF $(DEPDIR)/rawtext4.Tpo -c -o rawtext4.lo `test -f '$(rawtext4dir)/rawtext4.cpp' || echo '$(srcdir)/'`$(rawtext4dir)/rawtext4.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawtext4.Tpo $(DEPDIR)/rawtext4.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(rawtext4dir)/rawtext4.cpp' object='rawtext4.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawtext4.lo -MD -MP -MF $(DEPDIR)/rawtext4.Tpo -c -o rawtext4.lo `test -f '$(rawtext4dir)/rawtext4.cpp' || echo '$(srcdir)/'`$(rawtext4dir)/rawtext4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawtext4.Tpo $(DEPDIR)/rawtext4.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(rawtext4dir)/rawtext4.cpp' object='rawtext4.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawtext4.lo `test -f '$(rawtext4dir)/rawtext4.cpp' || echo '$(srcdir)/'`$(rawtext4dir)/rawtext4.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawtext4.lo `test -f '$(rawtext4dir)/rawtext4.cpp' || echo '$(srcdir)/'`$(rawtext4dir)/rawtext4.cpp ztext.lo: $(ztextdir)/ztext.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ztext.lo -MD -MP -MF $(DEPDIR)/ztext.Tpo -c -o ztext.lo `test -f '$(ztextdir)/ztext.cpp' || echo '$(srcdir)/'`$(ztextdir)/ztext.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/ztext.Tpo $(DEPDIR)/ztext.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(ztextdir)/ztext.cpp' object='ztext.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ztext.lo -MD -MP -MF $(DEPDIR)/ztext.Tpo -c -o ztext.lo `test -f '$(ztextdir)/ztext.cpp' || echo '$(srcdir)/'`$(ztextdir)/ztext.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ztext.Tpo $(DEPDIR)/ztext.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(ztextdir)/ztext.cpp' object='ztext.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ztext.lo `test -f '$(ztextdir)/ztext.cpp' || echo '$(srcdir)/'`$(ztextdir)/ztext.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ztext.lo `test -f '$(ztextdir)/ztext.cpp' || echo '$(srcdir)/'`$(ztextdir)/ztext.cpp swcom.lo: $(commentsdir)/swcom.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcom.lo -MD -MP -MF $(DEPDIR)/swcom.Tpo -c -o swcom.lo `test -f '$(commentsdir)/swcom.cpp' || echo '$(srcdir)/'`$(commentsdir)/swcom.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swcom.Tpo $(DEPDIR)/swcom.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(commentsdir)/swcom.cpp' object='swcom.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcom.lo -MD -MP -MF $(DEPDIR)/swcom.Tpo -c -o swcom.lo `test -f '$(commentsdir)/swcom.cpp' || echo '$(srcdir)/'`$(commentsdir)/swcom.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swcom.Tpo $(DEPDIR)/swcom.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(commentsdir)/swcom.cpp' object='swcom.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcom.lo `test -f '$(commentsdir)/swcom.cpp' || echo '$(srcdir)/'`$(commentsdir)/swcom.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcom.lo `test -f '$(commentsdir)/swcom.cpp' || echo '$(srcdir)/'`$(commentsdir)/swcom.cpp rawcom.lo: $(rawcomdir)/rawcom.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawcom.lo -MD -MP -MF $(DEPDIR)/rawcom.Tpo -c -o rawcom.lo `test -f '$(rawcomdir)/rawcom.cpp' || echo '$(srcdir)/'`$(rawcomdir)/rawcom.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawcom.Tpo $(DEPDIR)/rawcom.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(rawcomdir)/rawcom.cpp' object='rawcom.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawcom.lo -MD -MP -MF $(DEPDIR)/rawcom.Tpo -c -o rawcom.lo `test -f '$(rawcomdir)/rawcom.cpp' || echo '$(srcdir)/'`$(rawcomdir)/rawcom.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawcom.Tpo $(DEPDIR)/rawcom.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(rawcomdir)/rawcom.cpp' object='rawcom.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawcom.lo `test -f '$(rawcomdir)/rawcom.cpp' || echo '$(srcdir)/'`$(rawcomdir)/rawcom.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawcom.lo `test -f '$(rawcomdir)/rawcom.cpp' || echo '$(srcdir)/'`$(rawcomdir)/rawcom.cpp rawcom4.lo: $(rawcom4dir)/rawcom4.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawcom4.lo -MD -MP -MF $(DEPDIR)/rawcom4.Tpo -c -o rawcom4.lo `test -f '$(rawcom4dir)/rawcom4.cpp' || echo '$(srcdir)/'`$(rawcom4dir)/rawcom4.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawcom4.Tpo $(DEPDIR)/rawcom4.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(rawcom4dir)/rawcom4.cpp' object='rawcom4.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawcom4.lo -MD -MP -MF $(DEPDIR)/rawcom4.Tpo -c -o rawcom4.lo `test -f '$(rawcom4dir)/rawcom4.cpp' || echo '$(srcdir)/'`$(rawcom4dir)/rawcom4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawcom4.Tpo $(DEPDIR)/rawcom4.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(rawcom4dir)/rawcom4.cpp' object='rawcom4.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawcom4.lo `test -f '$(rawcom4dir)/rawcom4.cpp' || echo '$(srcdir)/'`$(rawcom4dir)/rawcom4.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawcom4.lo `test -f '$(rawcom4dir)/rawcom4.cpp' || echo '$(srcdir)/'`$(rawcom4dir)/rawcom4.cpp rawfiles.lo: $(rawfilesdir)/rawfiles.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawfiles.lo -MD -MP -MF $(DEPDIR)/rawfiles.Tpo -c -o rawfiles.lo `test -f '$(rawfilesdir)/rawfiles.cpp' || echo '$(srcdir)/'`$(rawfilesdir)/rawfiles.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawfiles.Tpo $(DEPDIR)/rawfiles.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(rawfilesdir)/rawfiles.cpp' object='rawfiles.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawfiles.lo -MD -MP -MF $(DEPDIR)/rawfiles.Tpo -c -o rawfiles.lo `test -f '$(rawfilesdir)/rawfiles.cpp' || echo '$(srcdir)/'`$(rawfilesdir)/rawfiles.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawfiles.Tpo $(DEPDIR)/rawfiles.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(rawfilesdir)/rawfiles.cpp' object='rawfiles.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawfiles.lo `test -f '$(rawfilesdir)/rawfiles.cpp' || echo '$(srcdir)/'`$(rawfilesdir)/rawfiles.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawfiles.lo `test -f '$(rawfilesdir)/rawfiles.cpp' || echo '$(srcdir)/'`$(rawfilesdir)/rawfiles.cpp zcom.lo: $(zcomdir)/zcom.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zcom.lo -MD -MP -MF $(DEPDIR)/zcom.Tpo -c -o zcom.lo `test -f '$(zcomdir)/zcom.cpp' || echo '$(srcdir)/'`$(zcomdir)/zcom.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zcom.Tpo $(DEPDIR)/zcom.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(zcomdir)/zcom.cpp' object='zcom.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zcom.lo -MD -MP -MF $(DEPDIR)/zcom.Tpo -c -o zcom.lo `test -f '$(zcomdir)/zcom.cpp' || echo '$(srcdir)/'`$(zcomdir)/zcom.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zcom.Tpo $(DEPDIR)/zcom.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(zcomdir)/zcom.cpp' object='zcom.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zcom.lo `test -f '$(zcomdir)/zcom.cpp' || echo '$(srcdir)/'`$(zcomdir)/zcom.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zcom.lo `test -f '$(zcomdir)/zcom.cpp' || echo '$(srcdir)/'`$(zcomdir)/zcom.cpp hrefcom.lo: $(hrefcomdir)/hrefcom.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hrefcom.lo -MD -MP -MF $(DEPDIR)/hrefcom.Tpo -c -o hrefcom.lo `test -f '$(hrefcomdir)/hrefcom.cpp' || echo '$(srcdir)/'`$(hrefcomdir)/hrefcom.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hrefcom.Tpo $(DEPDIR)/hrefcom.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(hrefcomdir)/hrefcom.cpp' object='hrefcom.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hrefcom.lo -MD -MP -MF $(DEPDIR)/hrefcom.Tpo -c -o hrefcom.lo `test -f '$(hrefcomdir)/hrefcom.cpp' || echo '$(srcdir)/'`$(hrefcomdir)/hrefcom.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hrefcom.Tpo $(DEPDIR)/hrefcom.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(hrefcomdir)/hrefcom.cpp' object='hrefcom.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hrefcom.lo `test -f '$(hrefcomdir)/hrefcom.cpp' || echo '$(srcdir)/'`$(hrefcomdir)/hrefcom.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hrefcom.lo `test -f '$(hrefcomdir)/hrefcom.cpp' || echo '$(srcdir)/'`$(hrefcomdir)/hrefcom.cpp swld.lo: $(lexdictdir)/swld.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swld.lo -MD -MP -MF $(DEPDIR)/swld.Tpo -c -o swld.lo `test -f '$(lexdictdir)/swld.cpp' || echo '$(srcdir)/'`$(lexdictdir)/swld.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/swld.Tpo $(DEPDIR)/swld.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(lexdictdir)/swld.cpp' object='swld.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swld.lo -MD -MP -MF $(DEPDIR)/swld.Tpo -c -o swld.lo `test -f '$(lexdictdir)/swld.cpp' || echo '$(srcdir)/'`$(lexdictdir)/swld.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/swld.Tpo $(DEPDIR)/swld.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(lexdictdir)/swld.cpp' object='swld.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swld.lo `test -f '$(lexdictdir)/swld.cpp' || echo '$(srcdir)/'`$(lexdictdir)/swld.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swld.lo `test -f '$(lexdictdir)/swld.cpp' || echo '$(srcdir)/'`$(lexdictdir)/swld.cpp rawld.lo: $(rawlddir)/rawld.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawld.lo -MD -MP -MF $(DEPDIR)/rawld.Tpo -c -o rawld.lo `test -f '$(rawlddir)/rawld.cpp' || echo '$(srcdir)/'`$(rawlddir)/rawld.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawld.Tpo $(DEPDIR)/rawld.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(rawlddir)/rawld.cpp' object='rawld.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawld.lo -MD -MP -MF $(DEPDIR)/rawld.Tpo -c -o rawld.lo `test -f '$(rawlddir)/rawld.cpp' || echo '$(srcdir)/'`$(rawlddir)/rawld.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawld.Tpo $(DEPDIR)/rawld.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(rawlddir)/rawld.cpp' object='rawld.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawld.lo `test -f '$(rawlddir)/rawld.cpp' || echo '$(srcdir)/'`$(rawlddir)/rawld.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawld.lo `test -f '$(rawlddir)/rawld.cpp' || echo '$(srcdir)/'`$(rawlddir)/rawld.cpp rawld4.lo: $(rawld4dir)/rawld4.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawld4.lo -MD -MP -MF $(DEPDIR)/rawld4.Tpo -c -o rawld4.lo `test -f '$(rawld4dir)/rawld4.cpp' || echo '$(srcdir)/'`$(rawld4dir)/rawld4.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rawld4.Tpo $(DEPDIR)/rawld4.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(rawld4dir)/rawld4.cpp' object='rawld4.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawld4.lo -MD -MP -MF $(DEPDIR)/rawld4.Tpo -c -o rawld4.lo `test -f '$(rawld4dir)/rawld4.cpp' || echo '$(srcdir)/'`$(rawld4dir)/rawld4.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawld4.Tpo $(DEPDIR)/rawld4.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(rawld4dir)/rawld4.cpp' object='rawld4.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawld4.lo `test -f '$(rawld4dir)/rawld4.cpp' || echo '$(srcdir)/'`$(rawld4dir)/rawld4.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawld4.lo `test -f '$(rawld4dir)/rawld4.cpp' || echo '$(srcdir)/'`$(rawld4dir)/rawld4.cpp zld.lo: $(zlddir)/zld.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zld.lo -MD -MP -MF $(DEPDIR)/zld.Tpo -c -o zld.lo `test -f '$(zlddir)/zld.cpp' || echo '$(srcdir)/'`$(zlddir)/zld.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zld.Tpo $(DEPDIR)/zld.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(zlddir)/zld.cpp' object='zld.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zld.lo -MD -MP -MF $(DEPDIR)/zld.Tpo -c -o zld.lo `test -f '$(zlddir)/zld.cpp' || echo '$(srcdir)/'`$(zlddir)/zld.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zld.Tpo $(DEPDIR)/zld.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(zlddir)/zld.cpp' object='zld.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zld.lo `test -f '$(zlddir)/zld.cpp' || echo '$(srcdir)/'`$(zlddir)/zld.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zld.lo `test -f '$(zlddir)/zld.cpp' || echo '$(srcdir)/'`$(zlddir)/zld.cpp flatapi.lo: $(bindingsdir)/flatapi.cpp -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flatapi.lo -MD -MP -MF $(DEPDIR)/flatapi.Tpo -c -o flatapi.lo `test -f '$(bindingsdir)/flatapi.cpp' || echo '$(srcdir)/'`$(bindingsdir)/flatapi.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/flatapi.Tpo $(DEPDIR)/flatapi.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(bindingsdir)/flatapi.cpp' object='flatapi.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flatapi.lo -MD -MP -MF $(DEPDIR)/flatapi.Tpo -c -o flatapi.lo `test -f '$(bindingsdir)/flatapi.cpp' || echo '$(srcdir)/'`$(bindingsdir)/flatapi.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/flatapi.Tpo $(DEPDIR)/flatapi.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(bindingsdir)/flatapi.cpp' object='flatapi.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flatapi.lo `test -f '$(bindingsdir)/flatapi.cpp' || echo '$(srcdir)/'`$(bindingsdir)/flatapi.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flatapi.lo `test -f '$(bindingsdir)/flatapi.cpp' || echo '$(srcdir)/'`$(bindingsdir)/flatapi.cpp mostlyclean-libtool: -rm -f *.lo @@ -1954,8 +2148,11 @@ clean-libtool: -rm -rf .libs _libs install-pkgincludeHEADERS: $(pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1969,30 +2166,17 @@ uninstall-pkgincludeHEADERS: @$(NORMAL_UNINSTALL) @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) + dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -2004,15 +2188,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -2021,6 +2201,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -2072,10 +2267,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -2160,20 +2360,21 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-pkgincludeHEADERS install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-pkgincludeHEADERS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-libLTLIBRARIES \ + uninstall-pkgincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/bcppmake/libsword.bdsproj b/lib/bcppmake/libsword.bdsproj index d175ad2..4f1abda 100644 --- a/lib/bcppmake/libsword.bdsproj +++ b/lib/bcppmake/libsword.bdsproj @@ -429,7 +429,6 @@ - diff --git a/lib/bcppmake/libsword.bpf b/lib/bcppmake/libsword.bpf index bf9b9e3..bbb5e27 100644 --- a/lib/bcppmake/libsword.bpf +++ b/lib/bcppmake/libsword.bpf @@ -15,7 +15,6 @@ USEUNIT("..\..\src\keys\listkey.cpp"); USEUNIT("..\..\src\mgr\swsearchable.cpp"); USEUNIT("..\..\src\mgr\encfiltmgr.cpp"); USEUNIT("..\..\src\mgr\filemgr.cpp"); -USEUNIT("..\..\src\mgr\ftptrans.cpp"); USEUNIT("..\..\src\mgr\installmgr.cpp"); USEUNIT("..\..\src\mgr\localemgr.cpp"); USEUNIT("..\..\src\mgr\markupfiltmgr.cpp"); @@ -30,7 +29,6 @@ USEUNIT("..\..\src\utilfuns\utilxml.cpp"); USEUNIT("..\..\src\utilfuns\roman.cpp"); USEUNIT("..\..\src\utilfuns\swbuf.cpp"); USEUNIT("..\..\src\utilfuns\swobject.cpp"); -USEUNIT("..\..\src\utilfuns\swunicod.cpp"); USEUNIT("..\..\src\utilfuns\swversion.cpp"); USEUNIT("..\..\src\utilfuns\url.cpp"); USEUNIT("..\..\src\utilfuns\utilstr.cpp"); @@ -79,8 +77,6 @@ USEUNIT("..\..\src\modules\filters\osisscripref.cpp"); USEUNIT("..\..\src\modules\filters\osisstrongs.cpp"); USEUNIT("..\..\src\modules\filters\osiswebif.cpp"); USEUNIT("..\..\src\modules\filters\osiswordjs.cpp"); -USEUNIT("..\..\src\modules\filters\plainfootnotes.cpp"); -USEUNIT("..\..\src\modules\filters\plainhtml.cpp"); USEUNIT("..\..\src\modules\filters\rtfhtml.cpp"); USEUNIT("..\..\src\modules\filters\swbasicfilter.cpp"); USEUNIT("..\..\src\modules\filters\swoptfilter.cpp"); @@ -128,14 +124,9 @@ USEUNIT("..\..\src\utilfuns\zlib\zutil.c"); USEUNIT("..\..\src\utilfuns\zlib\compress.c"); USEUNIT("..\..\src\utilfuns\zlib\crc32.c"); USEUNIT("..\..\src\utilfuns\zlib\deflate.c"); -USEUNIT("..\..\src\utilfuns\zlib\gzio.c"); -USEUNIT("..\..\src\utilfuns\zlib\infblock.c"); -USEUNIT("..\..\src\utilfuns\zlib\infcodes.c"); USEUNIT("..\..\src\utilfuns\zlib\inffast.c"); USEUNIT("..\..\src\utilfuns\zlib\inflate.c"); USEUNIT("..\..\src\utilfuns\zlib\inftrees.c"); -USEUNIT("..\..\src\utilfuns\zlib\infutil.c"); -USEUNIT("..\..\src\utilfuns\zlib\maketree.c"); USEUNIT("..\..\src\utilfuns\zlib\trees.c"); USEUNIT("..\..\src\utilfuns\zlib\uncompr.c"); USEUNIT("..\..\src\utilfuns\zlib\untgz.c"); @@ -150,9 +141,26 @@ USEUNIT("..\..\src\modules\texts\rawtext4\rawtext4.cpp"); USEUNIT("..\..\src\modules\comments\rawcom4\rawcom4.cpp"); USEUNIT("..\..\src\modules\common\rawverse4.cpp"); USEUNIT("..\..\src\modules\filters\teihtmlhref.cpp"); -USEUNIT("..\..\src\mgr\versemgr.cpp"); -USEUNIT("..\..\src\modules\filters\osisruby.cpp"); USEUNIT("..\..\src\mgr\curlhttpt.cpp"); +USEUNIT("..\..\src\modules\filters\gbfxhtml.cpp"); +USEUNIT("..\..\src\modules\filters\osisxhtml.cpp"); +USEUNIT("..\..\src\modules\filters\thmlxhtml.cpp"); +USEUNIT("..\..\src\modules\filters\teixhtml.cpp"); +USEUNIT("..\..\src\mgr\remotetrans.cpp"); +USEUNIT("..\..\src\modules\filters\osisglosses.cpp"); +USEUNIT("..\..\src\modules\filters\osisenum.cpp"); +USEUNIT("..\..\src\utilfuns\zlib\gzclose.c"); +USEUNIT("..\..\src\utilfuns\zlib\gzlib.c"); +USEUNIT("..\..\src\utilfuns\zlib\gzread.c"); +USEUNIT("..\..\src\utilfuns\zlib\gzwrite.c"); +USEUNIT("..\..\src\utilfuns\zlib\infback.c"); +USEUNIT("..\..\src\mgr\versificationmgr.cpp"); +USEUNIT("..\..\src\modules\common\xzcomprs.cpp"); +USEUNIT("..\..\src\modules\common\bz2comprs.cpp"); +USEUNIT("..\..\src\modules\filters\osisvariants.cpp"); +USEUNIT("..\..\src\modules\filters\osisxlit.cpp"); +USEUNIT("..\..\src\modules\filters\osisreferencelinks.cpp"); +USEUNIT("..\..\src\modules\filters\scsuutf8.cpp"); //--------------------------------------------------------------------------- #define Library diff --git a/lib/bcppmake/libsword.bpr b/lib/bcppmake/libsword.bpr index df5df52..e2cccb6 100644 --- a/lib/bcppmake/libsword.bpr +++ b/lib/bcppmake/libsword.bpr @@ -9,16 +9,16 @@ ..\..\src\keys\swkey.obj ..\..\src\keys\treekey.obj ..\..\src\keys\treekeyidx.obj ..\..\src\keys\listkey.obj ..\..\src\mgr\swsearchable.obj ..\..\src\mgr\encfiltmgr.obj - ..\..\src\mgr\filemgr.obj ..\..\src\mgr\ftptrans.obj - ..\..\src\mgr\installmgr.obj ..\..\src\mgr\localemgr.obj - ..\..\src\mgr\markupfiltmgr.obj ..\..\src\mgr\stringmgr.obj - ..\..\src\mgr\swcacher.obj ..\..\src\mgr\swconfig.obj - ..\..\src\mgr\swfiltermgr.obj ..\..\src\mgr\swlocale.obj - ..\..\src\mgr\swmgr.obj ..\..\src\mgr\curlftpt.obj - ..\..\src\utilfuns\utilxml.obj ..\..\src\utilfuns\roman.obj - ..\..\src\utilfuns\swbuf.obj ..\..\src\utilfuns\swobject.obj - ..\..\src\utilfuns\swunicod.obj ..\..\src\utilfuns\swversion.obj - ..\..\src\utilfuns\url.obj ..\..\src\utilfuns\utilstr.obj + ..\..\src\mgr\filemgr.obj ..\..\src\mgr\installmgr.obj + ..\..\src\mgr\localemgr.obj ..\..\src\mgr\markupfiltmgr.obj + ..\..\src\mgr\stringmgr.obj ..\..\src\mgr\swcacher.obj + ..\..\src\mgr\swconfig.obj ..\..\src\mgr\swfiltermgr.obj + ..\..\src\mgr\swlocale.obj ..\..\src\mgr\swmgr.obj + ..\..\src\mgr\curlftpt.obj ..\..\src\utilfuns\utilxml.obj + ..\..\src\utilfuns\roman.obj ..\..\src\utilfuns\swbuf.obj + ..\..\src\utilfuns\swobject.obj + ..\..\src\utilfuns\swversion.obj ..\..\src\utilfuns\url.obj + ..\..\src\utilfuns\utilstr.obj ..\..\src\modules\comments\hrefcom\hrefcom.obj ..\..\src\modules\comments\rawcom\rawcom.obj ..\..\src\modules\comments\rawfiles\rawfiles.obj @@ -60,8 +60,6 @@ ..\..\src\modules\filters\osisstrongs.obj ..\..\src\modules\filters\osiswebif.obj ..\..\src\modules\filters\osiswordjs.obj - ..\..\src\modules\filters\plainfootnotes.obj - ..\..\src\modules\filters\plainhtml.obj ..\..\src\modules\filters\rtfhtml.obj ..\..\src\modules\filters\swbasicfilter.obj ..\..\src\modules\filters\swoptfilter.obj @@ -104,13 +102,10 @@ ..\..\src\modules\texts\ztext\ztext.obj ..\..\src\modules\texts\swtext.obj ..\..\src\modules\swmodule.obj ..\..\src\utilfuns\zlib\zutil.obj ..\..\src\utilfuns\zlib\compress.obj ..\..\src\utilfuns\zlib\crc32.obj - ..\..\src\utilfuns\zlib\deflate.obj ..\..\src\utilfuns\zlib\gzio.obj - ..\..\src\utilfuns\zlib\infblock.obj ..\..\src\utilfuns\zlib\infcodes.obj - ..\..\src\utilfuns\zlib\inffast.obj ..\..\src\utilfuns\zlib\inflate.obj - ..\..\src\utilfuns\zlib\inftrees.obj ..\..\src\utilfuns\zlib\infutil.obj - ..\..\src\utilfuns\zlib\maketree.obj ..\..\src\utilfuns\zlib\trees.obj - ..\..\src\utilfuns\zlib\uncompr.obj ..\..\src\utilfuns\zlib\untgz.obj - ..\..\src\utilfuns\zlib\adler32.obj + ..\..\src\utilfuns\zlib\deflate.obj ..\..\src\utilfuns\zlib\inffast.obj + ..\..\src\utilfuns\zlib\inflate.obj ..\..\src\utilfuns\zlib\inftrees.obj + ..\..\src\utilfuns\zlib\trees.obj ..\..\src\utilfuns\zlib\uncompr.obj + ..\..\src\utilfuns\zlib\untgz.obj ..\..\src\utilfuns\zlib\adler32.obj ..\..\src\modules\filters\papyriplain.obj ..\..\src\utilfuns\ftpparse.obj ..\..\src\modules\filters\osismorphsegmentation.obj ..\..\src\keys\versetreekey.obj ..\..\src\modules\filters\teiplain.obj @@ -118,8 +113,20 @@ ..\..\src\modules\texts\rawtext4\rawtext4.obj ..\..\src\modules\comments\rawcom4\rawcom4.obj ..\..\src\modules\common\rawverse4.obj - ..\..\src\modules\filters\teihtmlhref.obj ..\..\src\mgr\versemgr.obj - ..\..\src\modules\filters\osisruby.obj ..\..\src\mgr\curlhttpt.obj"/> + ..\..\src\modules\filters\teihtmlhref.obj ..\..\src\mgr\curlhttpt.obj + ..\..\src\modules\filters\gbfxhtml.obj + ..\..\src\modules\filters\osisxhtml.obj + ..\..\src\modules\filters\thmlxhtml.obj + ..\..\src\modules\filters\teixhtml.obj ..\..\src\mgr\remotetrans.obj + ..\..\src\modules\filters\osisglosses.obj + ..\..\src\modules\filters\osisenum.obj ..\..\src\utilfuns\zlib\gzclose.obj + ..\..\src\utilfuns\zlib\gzlib.obj ..\..\src\utilfuns\zlib\gzread.obj + ..\..\src\utilfuns\zlib\gzwrite.obj ..\..\src\utilfuns\zlib\infback.obj + ..\..\src\mgr\versificationmgr.obj ..\..\src\modules\common\xzcomprs.obj + ..\..\src\modules\common\bz2comprs.obj + ..\..\src\modules\filters\osisvariants.obj + ..\..\src\modules\filters\osisxlit.obj + ..\..\src\modules\filters\scsuutf8.obj"/> @@ -133,7 +140,7 @@ - + @@ -161,10 +168,10 @@ -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 -DUSELUCENE -D_WIN32 -D_CL_DISABLE_MULTITHREADING -DCURLAVAILABLE -DLUCENE_ENABLE_REFCOUNT -no_tie -boa"/> - - - - + + + + @@ -240,8 +247,8 @@ Item0=$(BCB)\source\vcl [HistoryLists\hlConditionals] Count=25 -Item0=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;_DEBUG -Item1=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT +Item0=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT +Item1=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;_DEBUG Item2=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE Item3=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING Item4=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG @@ -273,12 +280,14 @@ Item1=../\ Item2=../ [HistoryLists\hlTlibPageSize] -Count=5 -Item0=0x0200 -Item1=0x0080 -Item2=0x0040 -Item3=0x0020 -Item4=0x0010 +Count=7 +Item0=0x0400 +Item1=1024 +Item2=0x0200 +Item3=0x0080 +Item4=0x0040 +Item5=0x0020 +Item6=0x0010 [Debugging] DebugSourceDirs=$(BCB)\source\vcl @@ -300,4 +309,4 @@ ActiveLang= ProjectLang= RootDir= - \ No newline at end of file + diff --git a/lib/vcppmake/libsword.sln b/lib/vcppmake/libsword.sln new file mode 100644 index 0000000..3a09b7c --- /dev/null +++ b/lib/vcppmake/libsword.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "libsword.vcxproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.ActiveCfg = Debug|Win32 + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.Build.0 = Debug|Win32 + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32 + {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/lib/vcppmake/libsword.vcxproj b/lib/vcppmake/libsword.vcxproj new file mode 100644 index 0000000..4f38573 --- /dev/null +++ b/lib/vcppmake/libsword.vcxproj @@ -0,0 +1,479 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {97449E5E-F880-4D22-933A-0D2FC32034D4} + libsword + + + + DynamicLibrary + false + MultiByte + v110 + + + DynamicLibrary + false + MultiByte + v110 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\Debug\ + .\Debug\ + .\Release\ + .\Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + /D _CRT_SECURE_NO_DEPRECATE %(AdditionalOptions) + Disabled + ../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;%(AdditionalIncludeDirectories) + _DEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + .\Debug/libsword.pch + .\Debug/ + .\Debug/ + .\Debug/ + true + EditAndContinue + Default + 4996;%(DisableSpecificWarnings) + true + Level1 + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + libcurl_a_debug.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + ../../../curl/builds/libcurl-vc10-x86-debug-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;%(AdditionalLibraryDirectories) + false + + + + + false + + + + + Full + AnySuitable + ../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;%(AdditionalIncludeDirectories) + NDEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + MultiThreadedDLL + true + + + .\Release/libsword.pch + .\Release/ + .\Release/ + .\Release/ + true + Default + true + Speed + true + Level1 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + ../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;%(AdditionalLibraryDirectories) + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/vcppmake/vc8/libsword.vcproj b/lib/vcppmake/vc8/libsword.vcproj deleted file mode 100644 index 167b37e..0000000 --- a/lib/vcppmake/vc8/libsword.vcproj +++ /dev/null @@ -1,7024 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/locales.d/ar-utf8.conf b/locales.d/ar-utf8.conf new file mode 100644 index 0000000..e8de87c --- /dev/null +++ b/locales.d/ar-utf8.conf @@ -0,0 +1,141 @@ +[Meta] +Name=ar +Description=Arabic (Unicode) +Encoding=UTF-8 + +[Text] +Genesis=تكوين +Exodus=خروج +Leviticus=لاويين +Numbers=عدد +Deuteronomy=تثنية +Joshua=يشوع +Judges=قضاه +Ruth=راعوث +I Samuel=صموائيل الاول +II Samuel=صموائيل الثاني +I Kings=ملوك الاول +II Kings=ملوك الثاني +I Chronicles=أخبار الأيام الأول +II Chronicles=أخبار الأيام الثاني +Ezra=عزرا +Nehemiah=نحميا +Esther=أستير +Job=أيوب +Psalms=مزامير +Proverbs=أمثال +Ecclesiastes=الجامعة +Song of Solomon=نشيد الأنشاد +Isaiah=أشعياء +Jeremiah=أرميا +Lamentations=مراثي أرميا +Ezekiel=حزقيال +Daniel=دانيال +Hosea=هوشع +Joel=يوئيل +Amos=عاموس +Obadiah=عوبديا +Jonah=يونان +Micah=ميخا +Nahum=ناحوم +Habakkuk=حبقوق +Zephaniah=صÙنيا +Haggai=حجي +Zechariah=زكريا +Malachi=ملاخي +Matthew=متي +Mark=مرقس +Luke=لوقا +John=يوحنا +Acts=أعمال الرسل +Romans=رومية +I Corinthians=كورنثوس الأولى +II Corinthians=كورنثوس الثانية +Galatians=غلاطية +Ephesians=اÙسس +Philippians=Ùيلبى +Colossians=كولوسي +I Thessalonians=تسالونيكى الأولى +II Thessalonians=تسالونيكى الثانية +I Timothy=تيموثاوس الأولى +II Timothy=تيموثاوس الثانية +Titus=تيطس +Philemon=Ùيلمون +Hebrews=العبرانيين +James=يعقوب +I Peter=بطرس الأولى +II Peter=بطرس الثانية +I John=يوحنا الأولى +II John=يوحنا الثانية +III John=يوحنا الثالثة +Jude=يهوذا +Revelation of John=الرؤيا + +[Book Abbrevs] + +تكوين=Gen +خروج=Exod +لاويين=Lev +عدد=Num +تثنية=Deut +يشوع=Josh +قضاه=Judg +راعوث=Ruth +صموائيل الاول=1Sam +صموائيل الثاني=2Sam +ملوك الاول=1Kgs +ملوك الثاني=2Kgs +أخبار الأيام الأول=1Chr +أخبار الأيام الثاني=2Chr +عزرا=Ezra +نحميا=Neh +أستير=Esth +أيوب=Job +مزامير=Ps +أمثال=Prov +الجامعة=Eccl +نشيد الأنشاد=Song +أشعياء=Isa +أرميا=Jer +مراثي أرميا=Lam +حزقيال=Ezek +دانيال=Dan +هوشع=Hos +يوئيل=Joel +عاموس=Amos +عوبديا=Obad +يونان=Jonah +ميخا=Mic +ناحوم=Nah +حبقوق=Hab +صÙنيا=Zeph +حجي=Hag +زكريا=Zech +ملاخي=Mal +متي=Matt +مرقس=Mark +لوقا=Luke +يوحنا=John +أعمال الرسل=Acts +رومية=Rom +كورنثوس الأولى=1Cor +كورنثوس الثانية=2Cor +غلاطية=Gal +اÙسس=Eph +Ùيلبى=Phil +كولوسي=Col +تسالونيكى الأولى=1Thess +تسالونيكى الثانية=2Thess +تيموثاوس الأولى=1Tim +تيموثاوس الثانية=2Tim +تيطس=Titus +Ùيلمون=Phlm +العبرانيين=Heb +يعقوب=Jas +بطرس الأولى=1Pet +بطرس الثانية=2Pet +يوحنا الأولى=1John +يوحنا الثانية=2John +يوحنا الثالثة=3John +يهوذا=Jude +الرؤيا=Rev diff --git a/locales.d/bg-utf8.conf b/locales.d/bg-utf8.conf new file mode 100644 index 0000000..514b220 --- /dev/null +++ b/locales.d/bg-utf8.conf @@ -0,0 +1,220 @@ +# Bulgarian BIBLE +# БИБЛИЯ ИЛИ СВЕЩЕÐОТО ПИСÐÐИЕ ÐРСТÐРИЯ И ÐОВИЯ ЗÐВЕТ. +# Andrew Ivanov andrew@hacker.bg + +[Meta] +Name=bg +Description=Bulgarian (Unicode) +Encoding=UTF-8 + +[Text] +Genesis=Битие +Exodus=Изход +Leviticus=Левит +Numbers=ЧиÑла +Deuteronomy=Второзаконие +Joshua=ИÑÑƒÑ Ðавин +Judges=Съдии +Ruth=Рут +I Samuel=1 Книга на Царете +II Samuel=2 Kнига на Царете +I Kings=3 Книга на Царете +II Kings=4 Книга на Царете +I Chronicles=1 Книга на ЛетопиÑите +II Chronicles=2 Книга на ЛетопиÑите +Ezra=Ездра +Nehemiah=ÐÐµÐµÐ¼Ð¸Ñ +Esther=ЕÑтир +Job=Йов +Psalms=ПÑалми +Proverbs=Притчи +Ecclesiastes=ЕклиÑиаÑÑ‚ +Song of Solomon=ПеÑен на ПеÑните +Isaiah=ИÑÐ°Ñ +Jeremiah=Ð™ÐµÑ€ÐµÐ¼Ð¸Ñ +Lamentations=Плачът на Ð™ÐµÑ€ÐµÐ¼Ð¸Ñ +Ezekiel=Йезекил +Daniel=Даниил +Hosea=ОÑÐ¸Ñ +Joel=Йоил +Amos=ÐÐ¼Ð¾Ñ +Obadiah=Ðвдий +Jonah=Йона +Micah=Михей +Nahum=Ðаум +Habakkuk=Ðвакум +Zephaniah=Ð¡Ð¾Ñ„Ð¾Ð½Ð¸Ñ +Haggai=Ðгей +Zechariah=Ð—Ð°Ñ…Ð°Ñ€Ð¸Ñ +Malachi=ÐœÐ°Ð»Ð°Ñ…Ð¸Ñ +Matthew=Матей +Mark=Марко +Luke=Лука +John=Йоан +Acts=ДеÑÐ½Ð¸Ñ Ð½Ð° ÐпоÑтолите +Romans=РимлÑни +I Corinthians=1 КоринтÑни +II Corinthians=2 КоринтÑни +Galatians=ГалатÑни +Ephesians=ЕфеÑÑни +Philippians=ФилипÑни +Colossians=КолоÑÑни +I Thessalonians=1 Солунци +II Thessalonians=2 Солунци +I Timothy=1 Тимотей +II Timothy=2 Тимотей +Titus=Тит +Philemon=Филимон +Hebrews=Евреи +James=Яков +I Peter=1 Петрово +II Peter=2 Петрово +I John=1 Йоаново +II John=2 Йоаново +III John=3 Йоаново +Jude=Юда +Revelation of John=Откровението на Йоан + +[Book Abbrevs] + +Битие=Gen +Бит=Gen + +Изход=Exod +Изх=Exod + +Левит=Lev + +ЧиÑла=Num + +Второзаконие=Deut + +ИÑÑƒÑ Ðавин=Josh + +Съдии=Judg + +Рут=Ruth + +1 Книга на Царете=1Sam +1 Царе=1Sam + +2 Kнига на Царете=2Sam +2 Царе=2Sam + +3 Книга на Царете=1Kgs +3 Царе=1Kgs + +4 Книга на Царете=2Kgs +4 Царе=2Kgs + +1 Книга на ЛетопиÑите=1Chr +1 ЛетопиÑи=1Chr + +2 Книга на ЛетопиÑите=2Chr +2 ЛетопиÑи=2Chr + +Ездра=Ezra + +ÐеемиÑ=Neh + +ЕÑтир=Esth + +Йов=Job + +ПÑалми=Ps + +Притчи=Prov + +ЕклиÑиаÑÑ‚=Eccl + +ПеÑен на ПеÑните=Song + +ИÑаÑ=Isa + +ЙеремиÑ=Jer + +Плачът на ЙеремиÑ=Lam + +Йезекил=Ezek + +Даниил=Dan + +ОÑиÑ=Hos + +Йоил=Joel + +ÐмоÑ=Amos + +Ðвдий=Obad + +Йона=Jonah + +Михей=Mic + +Ðаум=Nah + +Ðвакум=Hab + +СофониÑ=Zeph + +Ðгей=Hag + +ЗахариÑ=Zech + +МалахиÑ=Mal + +Матей=Matt + +Марко=Mark + +Лука=Luke + +Йоан=John + +ДеÑÐ½Ð¸Ñ Ð½Ð° ÐпоÑтолите=Acts +ДеÑниÑ=Acts + +РимлÑни=Rom + +1 КоринтÑни=1Cor + +2 КоринтÑни=2Cor + +ГалатÑни=Gal + +ЕфеÑÑни=Eph + +ФилипÑни=Phil + +КолоÑÑни=Col + +1 Солунци=1Thess + +2 Солунци=2Thess + +1 Тимотей=1Tim + +2 Тимотей=2Tim + +Тит=Titus + +Филимон=Phlm + +Евреи=Heb + +Яков=Jas + +1 Петрово=1Pet + +2 Петрово=2Pet + +1 Йоаново=1John + +2 Йоаново=2John + +3 Йоаново=3John + +Юда=Jude + +Откровението на Йоан=Rev +Откровение=Rev diff --git a/locales.d/bg_BG-utf8.conf b/locales.d/bg_BG-utf8.conf deleted file mode 100644 index 514b220..0000000 --- a/locales.d/bg_BG-utf8.conf +++ /dev/null @@ -1,220 +0,0 @@ -# Bulgarian BIBLE -# БИБЛИЯ ИЛИ СВЕЩЕÐОТО ПИСÐÐИЕ ÐРСТÐРИЯ И ÐОВИЯ ЗÐВЕТ. -# Andrew Ivanov andrew@hacker.bg - -[Meta] -Name=bg -Description=Bulgarian (Unicode) -Encoding=UTF-8 - -[Text] -Genesis=Битие -Exodus=Изход -Leviticus=Левит -Numbers=ЧиÑла -Deuteronomy=Второзаконие -Joshua=ИÑÑƒÑ Ðавин -Judges=Съдии -Ruth=Рут -I Samuel=1 Книга на Царете -II Samuel=2 Kнига на Царете -I Kings=3 Книга на Царете -II Kings=4 Книга на Царете -I Chronicles=1 Книга на ЛетопиÑите -II Chronicles=2 Книга на ЛетопиÑите -Ezra=Ездра -Nehemiah=ÐÐµÐµÐ¼Ð¸Ñ -Esther=ЕÑтир -Job=Йов -Psalms=ПÑалми -Proverbs=Притчи -Ecclesiastes=ЕклиÑиаÑÑ‚ -Song of Solomon=ПеÑен на ПеÑните -Isaiah=ИÑÐ°Ñ -Jeremiah=Ð™ÐµÑ€ÐµÐ¼Ð¸Ñ -Lamentations=Плачът на Ð™ÐµÑ€ÐµÐ¼Ð¸Ñ -Ezekiel=Йезекил -Daniel=Даниил -Hosea=ОÑÐ¸Ñ -Joel=Йоил -Amos=ÐÐ¼Ð¾Ñ -Obadiah=Ðвдий -Jonah=Йона -Micah=Михей -Nahum=Ðаум -Habakkuk=Ðвакум -Zephaniah=Ð¡Ð¾Ñ„Ð¾Ð½Ð¸Ñ -Haggai=Ðгей -Zechariah=Ð—Ð°Ñ…Ð°Ñ€Ð¸Ñ -Malachi=ÐœÐ°Ð»Ð°Ñ…Ð¸Ñ -Matthew=Матей -Mark=Марко -Luke=Лука -John=Йоан -Acts=ДеÑÐ½Ð¸Ñ Ð½Ð° ÐпоÑтолите -Romans=РимлÑни -I Corinthians=1 КоринтÑни -II Corinthians=2 КоринтÑни -Galatians=ГалатÑни -Ephesians=ЕфеÑÑни -Philippians=ФилипÑни -Colossians=КолоÑÑни -I Thessalonians=1 Солунци -II Thessalonians=2 Солунци -I Timothy=1 Тимотей -II Timothy=2 Тимотей -Titus=Тит -Philemon=Филимон -Hebrews=Евреи -James=Яков -I Peter=1 Петрово -II Peter=2 Петрово -I John=1 Йоаново -II John=2 Йоаново -III John=3 Йоаново -Jude=Юда -Revelation of John=Откровението на Йоан - -[Book Abbrevs] - -Битие=Gen -Бит=Gen - -Изход=Exod -Изх=Exod - -Левит=Lev - -ЧиÑла=Num - -Второзаконие=Deut - -ИÑÑƒÑ Ðавин=Josh - -Съдии=Judg - -Рут=Ruth - -1 Книга на Царете=1Sam -1 Царе=1Sam - -2 Kнига на Царете=2Sam -2 Царе=2Sam - -3 Книга на Царете=1Kgs -3 Царе=1Kgs - -4 Книга на Царете=2Kgs -4 Царе=2Kgs - -1 Книга на ЛетопиÑите=1Chr -1 ЛетопиÑи=1Chr - -2 Книга на ЛетопиÑите=2Chr -2 ЛетопиÑи=2Chr - -Ездра=Ezra - -ÐеемиÑ=Neh - -ЕÑтир=Esth - -Йов=Job - -ПÑалми=Ps - -Притчи=Prov - -ЕклиÑиаÑÑ‚=Eccl - -ПеÑен на ПеÑните=Song - -ИÑаÑ=Isa - -ЙеремиÑ=Jer - -Плачът на ЙеремиÑ=Lam - -Йезекил=Ezek - -Даниил=Dan - -ОÑиÑ=Hos - -Йоил=Joel - -ÐмоÑ=Amos - -Ðвдий=Obad - -Йона=Jonah - -Михей=Mic - -Ðаум=Nah - -Ðвакум=Hab - -СофониÑ=Zeph - -Ðгей=Hag - -ЗахариÑ=Zech - -МалахиÑ=Mal - -Матей=Matt - -Марко=Mark - -Лука=Luke - -Йоан=John - -ДеÑÐ½Ð¸Ñ Ð½Ð° ÐпоÑтолите=Acts -ДеÑниÑ=Acts - -РимлÑни=Rom - -1 КоринтÑни=1Cor - -2 КоринтÑни=2Cor - -ГалатÑни=Gal - -ЕфеÑÑни=Eph - -ФилипÑни=Phil - -КолоÑÑни=Col - -1 Солунци=1Thess - -2 Солунци=2Thess - -1 Тимотей=1Tim - -2 Тимотей=2Tim - -Тит=Titus - -Филимон=Phlm - -Евреи=Heb - -Яков=Jas - -1 Петрово=1Pet - -2 Петрово=2Pet - -1 Йоаново=1John - -2 Йоаново=2John - -3 Йоаново=3John - -Юда=Jude - -Откровението на Йоан=Rev -Откровение=Rev diff --git a/locales.d/de-utf8.conf b/locales.d/de-utf8.conf index fb1fb7e..5fc6fa5 100644 --- a/locales.d/de-utf8.conf +++ b/locales.d/de-utf8.conf @@ -161,7 +161,10 @@ MATTHÄUS=Matt MARKUS=Mark LUKAS=Luke JOHANNES=John + APOSTELGESCHICHTE=Acts +APG=Acts + RÖMER=Rom 1. KORINTHER=1Cor diff --git a/locales.d/fo-utf8.conf b/locales.d/fo-utf8.conf new file mode 100644 index 0000000..81383e2 --- /dev/null +++ b/locales.d/fo-utf8.conf @@ -0,0 +1,199 @@ +[Meta] +Name=fo +Description=føroyskt (Unicode) +Encoding=UTF-8 + +[Text] +Genesis=1. Mósebók +Exodus=2. Mósebók +Leviticus=3. Mósebók +Numbers=4. Mósebók +Deuteronomy=5. Mósebók +Joshua=Josva +Judges=Dómararnir +Ruth=Rutt +I Samuel=1. Sámuelsbók +II Samuel=2. Sámuelsbók +I Kings=1. Kongabók +II Kings=2. Kongabók +I Chronicles=1. Krønikubók +II Chronicles=2. Krønikubók +Ezra=Ezra +Nehemiah=Nehemias +Esther=Ester +Job=Job +Psalms=Sálmarnir +Proverbs=Orðtøkini +Ecclesiastes=Prædikarin +Song of Solomon=Høysangen +Isaiah=Esaias +Jeremiah=Jeremias +Lamentations=Sorgarsongirnir +Ezekiel=Ezekiel +Daniel=Dániel +Hosea=Hoseas +Joel=Jóel +Amos=Amos +Obadiah=Obadias +Jonah=Jónas +Micah=Mika +Nahum=Nahum +Habakkuk=Habakkuk +Zephaniah=Zefanias +Haggai=Haggai +Zechariah=Zakarias +Malachi=Malakias +Matthew=Matteus +Mark=Markus +Luke=Lukas +John=Jóhannes +Acts=Ãpostlasøgan +Romans=Róm +I Corinthians=1. Korint +II Corinthians=2. Korint +Galatians=Galatia +Ephesians=Efesus +Philippians=Filippi +Colossians=Kolosse +I Thessalonians=1. Tessalonika +II Thessalonians=2. Tessalonika +I Timothy=1. Timoteus +II Timothy=2. Timoteus +Titus=Titus +Philemon=Filemon +Hebrews=Hebrearar +James=Jákup +I Peter=1. Pætur +II Peter=2. Pætur +I John=1. Jóhannes +II John=2. Jóhannes +III John=3. Jóhannes +Jude=Judas +Revelation of John=Opinberingin + +[Book Abbrevs] +ES.=Isa +1. MÓSEBÓK=Gen +2. MÓSEBÓK=Exod +3. MÓSEBÓK=Lev +4. MÓSEBÓK=Num +5. MÓSEBÓK=Deut +1 MÓSEBÓK=Gen +2 MÓSEBÓK=Exod +3 MÓSEBÓK=Lev +4 MÓSEBÓK=Num +5 MÓSEBÓK=Deut +1.MÓSEBÓK=Gen +2.MÓSEBÓK=Exod +3.MÓSEBÓK=Lev +4.MÓSEBÓK=Num +5.MÓSEBÓK=Deut +1MÓSEBÓK=Gen +2MÓSEBÓK=Exod +3MÓSEBÓK=Lev +4MÓSEBÓK=Num +5MÓSEBÓK=Deut +DÓMARARNIR=Judg +1. SÃMUELSBÓK=1Sam +2. SÃMUELSBÓK=2Sam +1. KONGABÓK=1Kgs +2. KONGABÓK=2Kgs +1. KRØNIKUBÓK=1Chr +2. KRØNIKUBÓK=2Chr +1 SÃMUELSBÓK=1Sam +2 SÃMUELSBÓK=2Sam +1 KONGABÓK=1Kgs +2 KONGABÓK=2Kgs +1 KRØNIKUBÓK=1Chr +2 KRØNIKUBÓK=2Chr +1.SÃMUELSBÓK=1Sam +2.SÃMUELSBÓK=2Sam +1.KONGABÓK=1Kgs +2.KONGABÓK=2Kgs +1.KRØNIKUBÓK=1Chr +2.KRØNIKUBÓK=2Chr +1SÃMUELSBÓK=1Sam +2SÃMUELSBÓK=2Sam +1KONGABÓK=1Kgs +2KONGABÓK=2Kgs +1KRØNIKUBÓK=1Chr +2KRØNIKUBÓK=2Chr +NEHEMIAS=Neh +SÃLMARNIR=Ps +ORÃTØKINI=Prov +PRÆDIKARIN=Eccl +HØYSANGEN=Song +ESAIAS=Isa +JEREMIAS=Jer +SORGARSONGIRNIR=Lam +DÃNIEL=Dan +HOSEAS=Hos +OBADIAS=Obad +ZEFANIAS=Zeph +ZAKARIAS=Zech +MALAKIAS=Mal +MATTEUS=Matt +MARKUS=Mark +LUKAS=Luke +JÓHANNES=John +ÃPOSTLASØGAN=Acts +1. KORINT=1Cor +2. KORINT=2Cor +1 KORINT=1Cor +2 KORINT=2Cor +1.KORINT=1Cor +2.KORINT=2Cor +1KORINT=1Cor +2KORINT=2Cor +EFESUS=Eph +FILIPPI=Phil +KOLOSSE=Col +1. TESSALONIKA=1Thess +2. TESSALONIKA=2Thess +1. TIMOTEUS=1Tim +2. TIMOTEUS=2Tim +FILEMON=Phlm +HEBREARAR=Heb +1. PÆTUR=1Pet +2. PÆTUR=2Pet +1. JÓHANNES=1John +2. JÓHANNES=2John +3. JÓHANNES=3John +1 TESSALONIKA=1Thess +2 TESSALONIKA=2Thess +1 TIMOTEUS=1Tim +2 TIMOTEUS=2Tim +1 PÆTUR=1Pet +2 PÆTUR=2Pet +1 JÓHANNES=1John +2 JÓHANNES=2John +3 JÓHANNES=3John +1.TESSALONIKA=1Thess +2.TESSALONIKA=2Thess +1.TIMOTEUS=1Tim +2.TIMOTEUS=2Tim +1.PÆTUR=1Pet +2.PÆTUR=2Pet +1.JÓHANNES=1John +2.JÓHANNES=2John +3.JÓHANNES=3John +1TESSALONIKA=1Thess +2TESSALONIKA=2Thess +1TIMOTEUS=1Tim +2TIMOTEUS=2Tim +1PÆTUR=1Pet +2PÆTUR=2Pet +1JÓHANNES=1John +2JÓHANNES=2John +3JÓHANNES=3John +OPINBERINGIN=Rev +JOSVA=Josh +RUTT=Ruth +JÓEL=Joel +JÓNAS=Jonah +MIKA=Mic +RÓM=Rom +JÃKUP=Jas +JUDAS=Jude +HÃSONG=Song + diff --git a/locales.d/fr-utf8.conf b/locales.d/fr-utf8.conf index a62e511..6b7cc91 100644 --- a/locales.d/fr-utf8.conf +++ b/locales.d/fr-utf8.conf @@ -1,9 +1,3 @@ -# French Bible books for Sword. -# 2001/06/12 domcox@users.sourceforge.net -# 2002/06/06 domcox@users.sourceforge.net -# 2007/07/23 domcox@users.sourceforge.net -# 2009/12/23 domcox@users.sourceforge.net - [Meta] Name=fr Description=French (Unicode) @@ -47,7 +41,7 @@ Nahum=Nahum Habakkuk=Habakuk Zephaniah=Sophonie Haggai=Aggée -Zechariah=Zaccharie +Zechariah=Zacharie Malachi=Malachie Matthew=Matthieu Mark=Marc @@ -115,6 +109,7 @@ NAHUM=Nah HABAKUK=Hab SOPHONIE=Zeph AGGÉE=Hag +ZACHARIE=Zech ZACCHARIE=Zech MALACHIE=Mal MATTHIEU=Matt diff --git a/locales.d/fr.conf b/locales.d/fr.conf index d958ef8..ba9942d 100644 --- a/locales.d/fr.conf +++ b/locales.d/fr.conf @@ -1,9 +1,3 @@ -# French Bible books for Sword. -# 2001/06/12 domcox@users.sourceforge.net -# 2002/06/06 domcox@users.sourceforge.net -# 2007/07/23 domcox@users.sourceforge.net -# 2009/12/23 domcox@users.sourceforge.net - [Meta] Name=fr Description=French @@ -47,7 +41,7 @@ Nahum=Nahum Habakkuk=Habakuk Zephaniah=Sophonie Haggai=Aggée -Zechariah=Zaccharie +Zechariah=Zacharie Malachi=Malachie Matthew=Matthieu Mark=Marc @@ -116,6 +110,7 @@ NAHUM=Nah HABAKUK=Hab SOPHONIE=Zeph AGGÉE=Hag +ZACHARIE=Zech ZACCHARIE=Zech MALACHIE=Mal MATTHIEU=Matt diff --git a/locales.d/iu-utf8.conf b/locales.d/iu-utf8.conf new file mode 100644 index 0000000..72db3d8 --- /dev/null +++ b/locales.d/iu-utf8.conf @@ -0,0 +1,292 @@ +[Meta] +Name=iu +Description=Inuktitut (Unicode) +Encoding=UTF-8 + +[Text] +Genesis=ᒨᓯᓯᑦ ᓯᕗᓪᓖᑦ +Exodus=ᒨᓯᓯᑦ á‚ᑉá¸á–ᑦ +Leviticus=ᒨᓯᓯᑦ á±á–“ᔪá–ᑦ +Numbers=ᒨᓯᓯᑦ ᓯᑕᒪá–ᑦ +Deuteronomy=ᒨᓯᓯᑦ ᑕᓪᓕᒪá–ᑦ +Joshua=ᔮᓱáŠá‘‰ áŠá’¡á“šá–ᑦ +Judges=áƒá“±áŠá–…ᓮᔩᑦ áŠá’¡á“šá–ᑦ +Ruth=ᕉᑎá…ᑉ á…ᓂᒃᑲá…ᓯᓂᖓ +I Samuel=á“´á’§áƒá“•á‘¦ ᓯᕗᓪᓖᑦ +II Samuel=á“´á’§áƒá“•á‘¦ á‚ᑉá¸á–ᑦ +I Kings=áŠá‘•á“ƒá‘¦ ᓯᕗᓪᓖᑦ +II Kings=áŠá‘•á“ƒá‘¦ á‚ᑉá¸á–ᑦ +I Chronicles=ᑯᕉᓂᑲᑦ ᓯᕗᓪᓖᑦ +II Chronicles=ᑯᕉᓂᑲᑦ á‚ᑉá¸á–ᑦ +Ezra=á„ᓱᕋá…ᑉ áŠá’¡á“šá–ᑦ +Nehemiah=ᓂᕼáƒá’¤áŠá…ᑉ áŠá’¡á“šá–ᑦ +Esther=áŠá“¯á‘•á…ᑉ áŠá’¡á“šá–ᑦ +Job=ᔫá±á…ᑉ áŠá’¡á“šá–ᑦ +Psalms=áƒá“á–ᕈᑎᑦ +Proverbs=ᓲᓗᒨᓂá…ᑉ á…ᖃᓪᓚᖕᓂá–ᑦ +Ecclesiastes=áƒá“•á“¯á’ªá“ƒá‘¦ áƒá’ƒá“–ᓯáŠá“¯á‘á”… +Song of Solomon=ᓲᓗᒨᓂá…ᑉ áƒá“á–ᕈᓯá–ᑦ +Isaiah=á‚á“®áŠá“¯á…ᑉ áŠá’¡á“šá–ᑦ +Jeremiah=ᔨᕆᒤáŠá…ᑉ áŠá’¡á“šá–ᑦ +Lamentations=ᔨᕆᒤáŠá…ᑉ á…á’¡á’áŠá•á–•á“‚á–ᑦ +Ezekiel=áƒá”¨á‘­áŠá“•á…ᑉ áŠá’¡á“šá–ᑦ +Daniel=á‘–á“‚áŠá“•á…ᑉ áŠá’¡á“šá–ᑦ +Hosea=ᕼá†á“¯áŠá‘‰ áŠá’¡á“šá–ᑦ +Joel=ᔪáƒá“•á…ᑉ áŠá’¡á“šá–ᑦ +Amos=á‚ᒨᓯá…ᑉ áŠá’¡á“šá–ᑦ +Obadiah=á…á¸á‘áŠá‘‰ áŠá’¡á“šá–ᑦ +Jonah=ᔫᓇá…ᑉ áŠá’¡á“šá–ᑦ +Micah=ᒤᑲá…ᑉ áŠá’¡á“šá–ᑦ +Nahum=ᓇᕼá…á’¥á…ᑉ áŠá’¡á“šá–ᑦ +Habakkuk=ᕼáŠá¸á‘²á…ᑉ áŠá’¡á“šá–ᑦ +Zephaniah=á”­á¸á“áŠá…ᑉ áŠá’¡á“šá–ᑦ +Haggai=ᕼáŠá’Šá‘‰ áŠá’¡á“šá–ᑦ +Zechariah=ᔭᑲᕅáŠá…ᑉ áŠá’¡á“šá–ᑦ +Malachi=ᒪᓚᑬᑉ áŠá’¡á“šá–ᑦ +Matthew=á’«á‘Žá…ᓯá…ᑉ áŠá’¡á“šá–ᑦ +Mark=ᒫᑯᓯá…ᑉ áŠá’¡á“šá–ᑦ +Luke=ᓘᑲᓯá…ᑉ áŠá’¡á“šá–ᑦ +John=ᔪáŠá“‡á“¯á…ᑉ áŠá’¡á“šá–ᑦ +Acts=á‹á´á“¯á‘•á“–ᑦ á±á“‚áŠá•á–•á“‚á–ᑦ +Romans=ᕉᒪᒥá…ᓄᑦ +I Corinthians=ᑯᕆá“á‘ŽáŠá’¥á…ᓄᑦ ᓯᕗᓪᓖᑦ +II Corinthians=ᑯᕆá“á‘ŽáŠá’¥á…ᓄᑦ á‚ᑉá¸á–ᑦ +Galatians=á’ᓔᑎáŠá’¥á…ᓄᑦ +Ephesians=áƒá±á“¯á’¥á…ᓄᑦ +Philippians=á±á“•á±á’¥á…ᓄᑦ +Colossians=ᑯᓘᓯáŠá’¥á…ᓄᑦ +I Thessalonians=á‘Žá“´á“—á“ᑲᒥá…ᓄᑦ ᓯᕗᓪᓖᑦ +II Thessalonians=á‘Žá“´á“—á“ᑲᒥá…ᓄᑦ á‚ᑉá¸á–ᑦ +I Timothy=ᑎᒧᑎᒧᑦ ᓯᕗᓪᓖᑦ +II Timothy=ᑎᒧᑎᒧᑦ á‚ᑉá¸á–ᑦ +Titus=á‘ᑑᓯᒧᑦ +Philemon=á°á“•á’¨á“‚ᒧᑦ +Hebrews=á„ᑉᕈáƒá“„ᑦ +James=ᔧᒥᓯá…ᑉ áŠá’¡á“šá–ᑦ +I Peter=á²á‘¦á‘ᕉᓯᑦ ᓯᕗᓪᓖᑦ +II Peter=á²á‘¦á‘ᕉᓯᑦ á‚ᑉá¸á–ᑦ +I John=ᔪáŠá“‡á“¯á‘¦ ᓯᕗᓪᓖᑦ +II John=ᔪáŠá“‡á“¯á‘¦ á‚ᑉá¸á–ᑦ +III John=ᔪáŠá“‡á“¯á…ᑉ á±á–“ᔪá–ᑦ +Jude=ᔫᑎá…ᑉ áŠá’¡á“šá–ᑦ +Revelation of John=ᔪáŠá“‡á“¯á…ᑉ ᑕᑯᑎᑕá…á“‚á–ᑦ + +[Book Abbrevs] +ᒨᓯᓯᑦ ᓯᕗᓪᓖᑦ=Gen +1 ᒨᓯᓯᑦ=Gen +1ᒨᓯᓯᑦ=Gen + +ᒨᓯᓯᑦ á‚ᑉá¸á–ᑦ=Ex +2 ᒨᓯᓯᑦ=Ex +2ᒨᓯᓯᑦ=Ex + +ᒨᓯᓯᑦ á±á–“ᔪá–ᑦ=Lev +3 ᒨᓯᓯᑦ=Lev +3ᒨᓯᓯᑦ=Lev + +ᒨᓯᓯᑦ ᓯᑕᒪá–ᑦ=Num +4 ᒨᓯᓯᑦ=Num +4ᒨᓯᓯᑦ=Num + +ᒨᓯᓯᑦ ᑕᓪᓕᒪá–ᑦ=Deut +5 ᒨᓯᓯᑦ=Deut +5ᒨᓯᓯᑦ=Deut + +ᔮᓱáŠá‘‰ áŠá’¡á“šá–ᑦ=Josh +ᔮᓱáŠ=Josh + +áƒá“±áŠá–…ᓮᔩᑦ áŠá’¡á“šá–ᑦ=Judg +áƒá“±áŠá–…ᓮᔩᑦ=Judg + +ᕉᑎá…ᑉ á…ᓂᒃᑲá…ᓯᓂᖓ=Ruth +ᕉᑎᑦ=Ruth + +á“´á’§áƒá“•á‘¦ ᓯᕗᓪᓖᑦ=1Sam +1 á“´á’§áƒá“•á‘¦=1Sam +1á“´á’§áƒá“•á‘¦=1Sam + +á“´á’§áƒá“•á‘¦ á‚ᑉá¸á–ᑦ=2Sam +2 á“´á’§áƒá“•á‘¦=2Sam +2á“´á’§áƒá“•á‘¦=2Sam + +áŠá‘•á“ƒá‘¦ ᓯᕗᓪᓖᑦ=1Kgs +1 áŠá‘•á“ƒá‘¦=1Kgs +1áŠá‘•á“ƒá‘¦=1Kgs + +áŠá‘•á“ƒá‘¦ á‚ᑉá¸á–ᑦ=2Kgs +2 áŠá‘•á“ƒá‘¦=2Kgs +2áŠá‘•á“ƒá‘¦=2Kgs + +ᑯᕉᓂᑲᑦ ᓯᕗᓪᓖᑦ=1Chr +1 ᑯᕉᓂᑲᑦ=1Chr +1ᑯᕉᓂᑲᑦ=1Chr + +ᑯᕉᓂᑲᑦ á‚ᑉá¸á–ᑦ=2Chr +2 ᑯᕉᓂᑲᑦ=2Chr +2ᑯᕉᓂᑲᑦ=2Chr + +á„ᓱᕋá…ᑉ áŠá’¡á“šá–ᑦ=Ezra +á„ᓱᕋ=Ezra + +ᓂᕼáƒá’¤áŠá…ᑉ áŠá’¡á“šá–ᑦ=Neh +ᓂᕼáƒá’¤áŠ=Neh + +áŠá“¯á‘•á…ᑉ áŠá’¡á“šá–ᑦ=Esth +áŠá“¯á‘•=Esth + +ᔫá±á…ᑉ áŠá’¡á“šá–ᑦ=Job +ᔫá±=Job + +áƒá“á–ᕈᑎᑦ=Pss +áƒá“á–ᕈᑦ=Pss + +ᓲᓗᒨᓂá…ᑉ á…ᖃᓪᓚᖕᓂá–ᑦ=Prov +ᓲᓗᒨᓂ=Prov + +áƒá“•á“¯á’ªá“ƒá‘¦ áƒá’ƒá“–ᓯáŠá“¯á‘á”…=Eccl +áƒá“•á“¯á’ªá“ƒá‘¦=Eccl + +ᓲᓗᒨᓂá…ᑉ áƒá“á–ᕈᓯá–ᑦ=Song +áƒá“á–ᕈᓰᑦ=Song + +á‚á“®áŠá“¯á…ᑉ áŠá’¡á“šá–ᑦ=Isa +á‚á“®áŠá“¯á‘¦=Isa + +ᔨᕆᒤáŠá…ᑉ áŠá’¡á“šá–ᑦ=Jer +ᔨᕆᒤáŠ=Jer + +ᔨᕆᒤáŠá…ᑉ á…á’¡á’áŠá•á–•á“‚á–ᑦ=Lam +á…á’¡á’áŠá•á–•á“ƒá‘¦=Lam + +áƒá”¨á‘­áŠá“•á…ᑉ áŠá’¡á“šá–ᑦ=Eze +áƒá”¨á‘­áŠá“•á‘¦=Eze + +á‘–á“‚áŠá“•á…ᑉ áŠá’¡á“šá–ᑦ=Dan +á‘–á“‚áŠá“•=Dan + +ᕼá†á“¯áŠá‘‰ áŠá’¡á“šá–ᑦ=Hos +ᕼá†á“¯áŠ=Hos + +ᔪáƒá“•á…ᑉ áŠá’¡á“šá–ᑦ=Joel +ᔪáƒá“•=Joel + +á‚ᒨᓯá…ᑉ áŠá’¡á“šá–ᑦ=Amos +á‚ᒨᓯ=Amos + +á…á¸á‘áŠá‘‰ áŠá’¡á“šá–ᑦ=Ob +á…á¸á‘áŠ=Ob + +ᔫᓇá…ᑉ áŠá’¡á“šá–ᑦ=Jonah +ᔫᓇ=Jonah + +ᒤᑲá…ᑉ áŠá’¡á“šá–ᑦ=Mic +ᒤᑲ=Mic + +ᓇᕼá…á’¥á…ᑉ áŠá’¡á“šá–ᑦ=Nah +ᓇᕼá…á’¥=Nah + +ᕼáŠá¸á‘²á…ᑉ áŠá’¡á“šá–ᑦ=Hab +ᕼáŠá¸á‘²=Hab + +á”­á¸á“áŠá…ᑉ áŠá’¡á“šá–ᑦ=Zeph +á”­á¸á“áŠ=Zeph + +ᕼáŠá’Šá‘‰ áŠá’¡á“šá–ᑦ=Hag +ᕼáŠá’Š=Hag + +ᔭᑲᕅáŠá…ᑉ áŠá’¡á“šá–ᑦ=Zech +ᔭᑲᕅáŠ=Zech + +ᒪᓚᑬᑉ áŠá’¡á“šá–ᑦ=Mal +ᒪᓚᑬ=Mal + +á’«á‘Žá…ᓯá…ᑉ áŠá’¡á“šá–ᑦ=Mt +á’«á‘Žá…ᓯ=Mt + +ᒫᑯᓯá…ᑉ áŠá’¡á“šá–ᑦ=Mk +ᒫᑯᓯ=Mk + +ᓘᑲᓯá…ᑉ áŠá’¡á“šá–ᑦ=Lk +ᓘᑲᓯ=Lk + +ᔪáŠá“‡á“¯á…ᑉ áŠá’¡á“šá–ᑦ=Jn +ᔪáŠá“‡á“¯=Jn + +á‹á´á“¯á‘•á“–ᑦ á±á“‚áŠá•á–•á“‚á–ᑦ=Acts +á‹á´á“¯á‘•á“–ᑦ=Acts + +ᕉᒪᒥá…ᓄᑦ=Rom + +ᑯᕆá“á‘ŽáŠá’¥á…ᓄᑦ ᓯᕗᓪᓖᑦ=1Cor +1 ᑯᕆá“ᑎᑦ=1Cor +1ᑯᕆá“ᑎᑦ=1Cor + +ᑯᕆá“á‘ŽáŠá’¥á…ᓄᑦ á‚ᑉá¸á–ᑦ=2Cor +2 ᑯᕆá“ᑎᑦ=2Cor +2ᑯᕆá“ᑎᑦ=2Cor + +á’ᓔᑎáŠá’¥á…ᓄᑦ=Gal +á’ᓔᑎ=Gal + +áƒá±á“¯á’¥á…ᓄᑦ=Eph +áƒá±á“¯=Eph + +á±á“•á±á’¥á…ᓄᑦ=Php +á±á“•á±=Php + +ᑯᓘᓯáŠá’¥á…ᓄᑦ=Col +ᑯᓘᓯ=Col + +á‘Žá“´á“—á“ᑲᒥá…ᓄᑦ ᓯᕗᓪᓖᑦ=1Thes +1 á‘Žá“´á“—á“=1Thes +1á‘Žá“´á“—á“=1Thes + +á‘Žá“´á“—á“ᑲᒥá…ᓄᑦ á‚ᑉá¸á–ᑦ=2Thes +2 á‘Žá“´á“—á“=2Thes +2á‘Žá“´á“—á“=2Thes + +ᑎᒧᑎᒧᑦ ᓯᕗᓪᓖᑦ=1Tim +1 ᑎᒧᑎ=1Tim +1ᑎᒧᑎ=1Tim + +ᑎᒧᑎᒧᑦ á‚ᑉá¸á–ᑦ=2Tim +2 ᑎᒧᑎ=2Tim +2ᑎᒧᑎ=2Tim + +á‘ᑑᓯᒧᑦ=Tit +á‘ᑑᓯᑦ=Tit + +á°á“•á’¨á“‚ᒧᑦ=Phm +á°á“•á’¨=Phm + +á„ᑉᕈáƒá“„ᑦ=Heb +á„ᑉᕈáƒá‘¦=Heb + +ᔧᒥᓯá…ᑉ áŠá’¡á“šá–ᑦ=Jas +ᔧᒥᓯᑦ=Jas + +á²á‘¦á‘ᕉᓯᑦ ᓯᕗᓪᓖᑦ=1Pet +1 á²á‘¦á‘ᕉᓯᑦ=1Pet +1á²á‘¦á‘ᕉᓯᑦ=1Pet + +á²á‘¦á‘ᕉᓯᑦ á‚ᑉá¸á–ᑦ=2Pet +2 á²á‘¦á‘ᕉᓯᑦ=2Pet +2á²á‘¦á‘ᕉᓯᑦ=2Pet + +ᔪáŠá“‡á“¯á‘¦ ᓯᕗᓪᓖᑦ=1Jn +1 ᔪáŠá“‡á“¯=1Jn +1ᔪáŠá“‡á“¯=1Jn + +ᔪáŠá“‡á“¯á‘¦ á‚ᑉá¸á–ᑦ=2Jn +2 ᔪáŠá“‡á“¯=2Jn +2ᔪáŠá“‡á“¯=2Jn + +ᔪáŠá“‡á“¯á…ᑉ á±á–“ᔪá–ᑦ=3Jn +3 ᔪáŠá“‡á“¯=3Jn +3ᔪáŠá“‡á“¯=3Jn + +ᔫᑎá…ᑉ áŠá’¡á“šá–ᑦ=Jude +ᔫᑎᑦ=Jude + +ᔪáŠá“‡á“¯á…ᑉ ᑕᑯᑎᑕá…á“‚á–ᑦ=Rev +ᑕᑯᑎ=Rev diff --git a/locales.d/locales.conf b/locales.d/locales.conf index b33f1c1..9781e0d 100644 --- a/locales.d/locales.conf +++ b/locales.d/locales.conf @@ -9,13 +9,380 @@ Encoding=UTF-8 [Text] +aa.en=Afar +aa=Qafár af +ab.en=Abkhazian +ab=ÐÒ§Ñуа +ae.en=Avestan +af.en=Afrikaans +ak.en=Akan +am=አማርኛ +am.en=Amharic +an.en=Aragonese +ar.en=Arabic +ar=العربية +as.en=Assamese +as=অসমীয়া +av.en=Avaric +ay=Aymar aru +ay.en=Aymara +az-Cyrl=Ðзәрбајҹан +az=AzÉ™rbaycan / Ðзәрбајҹан / آذربایجان +az-Arab=آذربایجان +az.en=Azerbaijani +az-Latn=AzÉ™rbaycan +ba.en=Bashkir +ba=Башҡорт +be.en=Belarusian +be=БеларуÑÐºÐ°Ñ +bg.en=Bulgarian +bg=БългарÑки +bh.en=Bihari languages +bh=भोजपà¥à¤°à¥€ +bi.en=Bislama +bm.en=Bambara +bn.en=Bengali +bn=বাংলা +bo=བོད་སà¾à½‘་ +bo.en=Tibetan +br=Brezhoneg +br.en=Breton +bs=Bosanski +bs.en=Bosnian +ca=Català +ca.en=Catalan +ce.en=Chechen +ce=Ðохчийн +ch=Chamoru +ch.en=Chamorro +co=Corsu +co.en=Corsican +cr.en=Cree +cs=ÄŒeÅ¡tina +cs.en=Czech +cu.en=Church Slavic +cu=СловѣÌньÑкъ Ñ©ê™ê™‘Ìкъ +cv.en=Chuvash +cv=Чăвашла +cy=Cymraeg +cy.en=Welsh +da=Dansk +da.en=Danish +de=Deutsch +de.en=German +dv.en=Dhivehi +dz=རྫོང་འ+dz.en=Dzongkha +ee.en=Ewe +el.en=Modern Greek (1453-) +el=Ελληνικά +en=English +en.en=English +en-GB=English (UK) +en-US=English (US) +eo.en=Esperanto +es.en=Spanish +es=Español +et=Eesti Keel +et.en=Estonian +eu.en=Basque +eu=Euskara +fa.en=Persian +fa=Ùارسی +ff.en=Fulah +fi.en=Finnish +fi=Suomi +fj.en=Fijian +fj=Na vosa vaka-Viti +fo.en=Faroese +fo=Føroyskt +fr.en=French +fr=Français +fy.en=Western Frisian +fy=Frysk +ga.en=Irish +ga=Gaeilge +gd=A' Ghàidhlig +gd.en=Scottish Gaelic +gl.en=Galician +gl=Galego +gn.en=Guarani +gn=ગà«àªœàª°àª¾àª¤à«€ +gu.en=Gujarati +gv.en=Manx +gv=Gaelg +ha.en=Hausa +he.en=Hebrew +he=עברית +hi.en=Hindi +hi=हिनà¥à¤¦à¥€ +ho.en=Hiri Motu +hr.en=Croatian +hr=Hrvatski +ht.en=Haitian +ht=Kreyòl ayisyen +hu.en=Hungarian +hu=Magyar +hy.en=Armenian +hy=Õ€Õ¡ÕµÕ¥Ö€Õ¥Õ¶ +hz.en=Herero +hz=Otjiherero +ia.en=Interlingua (International Auxiliary Language) +id=Bahasa Indonesia +id.en=Indonesian +ie.en=Interlingue +ig.en=Igbo +ii.en=Sichuan Yi +ik.en=Inupiaq +ik=Iñupiak +in.en=Indonesian +io.en=Ido +is.en=Icelandic +is=Ãslenska +it.en=Italian +it=Italiano +iu=áƒá“„ᒃᑎá‘ᑦ +iu.en=Inuktitut +iw.en=Hebrew +ja.en=Japanese +ja=日本語 +ji.en=Yiddish +jv.en=Javanese +jw.en=Javanese +ka.en=Georgian +ka=ქáƒáƒ áƒ—ული +kg.en=Kongo +ki.en=Kikuyu +ki=GÄ©kÅ©yÅ© +kj.en=Kuanyama +kj=Oshikwanyama +kk.en=Kazakh +kk=Қазақша +kl.en=Kalaallisut +km=ភាសាážáŸ’មែរ +km.en=Central Khmer +kn.en=Kannada +kn=ಕನà³à²¨à²¡ +ko=í•œêµ­ë§ +ko.en=Korean +ko-KP=ì¡°ì„ ë§ +kr.en=Kanuri +ks-Arab=کٲشÙر +ks-Deva=कॉशà¥à¤° +ks.en=Kashmiri +ks=कॉशà¥à¤° / کٲشÙر +ku-Arab=كوردی +ku-Cyrl=К'ӧрди +ku.en=Kurdish +ku=Kurdî / كوردی / К'ӧрди +ku-Latn=Kurdî +kv.en=Komi +kv=Коми +kw.en=Cornish +kw=Kernewek +ky.en=Kirghiz +ky=Кыргызча +la.en=Latin +la=lingua latina +lb.en=Luxembourgish +lb=Lëtzebuergesch +lg.en=Ganda +li.en=Limburgan +ln.en=Lingala +ln=Lingála +lo=ພາສາລາວ +lo.en=Lao +lt.en=Lithuanian +lt=Lietuvių +lu.en=Luba-Katanga +lv.en=Latvian +lv=LatvieÅ¡u +mg.en=Malagasy +mh.en=Marshallese +mh=Kajin M̧ajeļ +mi.en=Maori +mi=MÄori +mk.en=Macedonian +mk=МакедонÑки +ml.en=Malayalam +ml=മലയാളം +mn.en=Mongolian +mn=Монгол +mo.en=Moldavian +mr.en=Marathi +mr=मराठी +ms=Bahasa Melayu +ms.en=Malay (macrolanguage) +mt.en=Maltese +mt=Malti +my.en=Burmese +my=မြန်မာစ +na=Dorerin Naoero +na.en=Nauru +nb=BokmÃ¥l +nb.en=Norwegian BokmÃ¥l +nd.en=North Ndebele +nd=Sindebele +ne.en=Nepali +ne=नेपाली +ng.en=Ndonga +ng=Owambo +nl.en=Dutch +nl=Nederlands +nn.en=Norwegian Nynorsk +nn=Nynorsk +no.en=Norwegian +no=Norsk +nr.en=South Ndebele +nr=Nrebele +nv=Diné bizaad +nv.en=Navajo +ny=Chicheŵa +ny.en=Nyanja +oc.en=Occitan (post 1500) +oj.en=Ojibwa +om.en=Oromo +or=ଓଡ଼ିଆ +or.en=Oriya +os.en=Ossetian +os=Иронау +pa-Arab=پنجابی +pa-Deva=पंजाबी +pa.en=Panjabi +pa-Guru=ਪੰਜਾਬੀ +pa=ਪੰਜਾਬੀ / پنجابی / पंजाबी +pi.en=Pali +pi=पािऴ +pl.en=Polish +pl=Polszczyzna +ps.en=Pushto +ps=پښتو +pt-BR=Português Brasileiro +pt.en=Portuguese +pt=Português +qu.en=Quechua +rm.en=Romansh +rm=Rumantsch +rn.en=Rundi +rn=Kirundi +ro.en=Romanian +ro=Română +ru.en=Russian +ru=РуÑÑкий +rw.en=Kinyarwanda +sa.en=Sanskrit +sa=संसà¥à¤•à¥ƒà¤¤à¤®à¥ +sc.en=Sardinian +sc=Sardu +sd.en=Sindhi +sd=سنڌي +se.en=Northern Sami +se=Sámegiella +sg.en=Sango +sg=Sängö +sh.en=Serbo-Croatian +si.en=Sinhala +si=සිංහල +sk.en=Slovak +sk=SlovenÄina +sl.en=Slovenian +sl=SlovenÅ¡Äina +sm.en=Samoan +sm=Gagana Samoa +sn=chiShona +sn.en=Shona +so.en=Somali +so=Soomaaliga +sq.en=Albanian +sq=Shqip +sr-Cyrl=СрпÑки +sr.en=Serbian +sr-Latn=Srpski +sr=СрпÑки / Srpski +ss.en=Swati +ss=SiSwati +st.en=Southern Sotho +st=Sesotho +su=Basa Sunda +su.en=Sundanese +sv.en=Swedish +sv=Svenska +sw.en=Swahili (macrolanguage) +sw=Kiswahili +ta.en=Tamil +ta=தமிழ௠+te.en=Telugu +te=తెలà±à°—à± +tg-Arab=تاجیکی‎ +tg-Cyrl=Тоҷикӣ +tg.en=Tajik +tg-Latn=tojikÄ« +tg=Тоҷикӣ / TojikÄ« / تاجیکی‎ +th=ภาษาไทย +th.en=Thai +ti.en=Tigrinya +tk-Arab=تورکمنچه +tk-Cyrl=Түркменче +tk.en=Turkmen +tk-Latn=Türkmençe +tk=Türkmençe / Түркменче / تورکمنچه +tl.en=Tagalog +tl-Tglg=ᜆᜄᜎᜓᜄ +tl=Wikang Tagalog +tn.en=Tswana +tn=Setswana +to.en=Tonga (Tonga Islands) +tr.en=Turkish +tr=Türkçe +ts.en=Tsonga +ts=Xitsonga +tt-Cyrl=Татарча +tt.en=Tatar +tt-Latn=Tatarça +tt=Tatarça / Татарча +tw.en=Twi +ty.en=Tahitian +ty=Reo MÄ'ohi +ug-Arab=ئۇيغۇرچە +ug-Cyrl=Уйғурчә +ug.en=Uighur +ug-Latn=Uyghurche‎ +ug=Uyghurche‎ / ئۇيغۇرچە / Уйғурчә +uk.en=Ukrainian +uk=УкраїнÑька +ur-Arab=اردو +ur-Deva=उरà¥à¤¦à¥‚ +ur.en=Urdu +ur=اردو / उरà¥à¤¦à¥‚ +uz-Cyrl=Ўзбек +uz.en=Uzbek +uz-Latn=O'zbek +uz=O'zbek / Ўзбек +ve.en=Venda +vi.en=Vietnamese +vi=Tiếng Việt +vo.en=Volapük +wa.en=Walloon +wo.en=Wolof +xh.en=Xhosa +xh=isiXhosa +yi.en=Yiddish +yi=ייִדיש +yo=èdèe Yorùbá +yo.en=Yoruba +za.en=Zhuang +za=Vahcuengh +zh.en=Chinese +zh-Hans=简体中文 +zh-Hant=ç¹ä½“中文 +zh=中文 +zu.en=Zulu +zu=isiZulu aaa.en=Ghotuo aab.en=Alumu-Tesu aac.en=Ari aad.en=Amal aae.en=Arbëreshë Albanian -aa.en=Afar -aa=Qafár af aaf.en=Aranadan aag.en=Ambrak aah.en=Abu' Arapesh @@ -25,7 +392,6 @@ aal.en=Afade aam.en=Aramanik aan.en=Anambé aao.en=Algerian Saharan Arabic -aao.en=Algerian Saharan Arabic aap.en=Pará Arára aaq.en=Eastern Abnaki aas.en=Aasáx @@ -40,12 +406,9 @@ abb.en=Bankon abc.en=Ambala Ayta abd.en=Camarines Norte Agta abe.en=Western Abnaki -ab.en=Abkhazian -ab=ÐÒ§Ñуа abf.en=Abai Sungai abg.en=Abaga abh.en=Tajiki Arabic -abh.en=Tajiki Arabic abi.en=Abidji abj.en=Aka-Bea abl.en=Lampung Nyo @@ -59,7 +422,6 @@ abs.en=Ambonese Malay abt.en=Ambulas abu.en=Abure abv.en=Baharna Arabic -abv.en=Baharna Arabic abw.en=Pal abx.en=Inabaknon aby.en=Aneme Wake @@ -74,30 +436,24 @@ aci.en=Aka-Cari ack.en=Aka-Kora acl.en=Akar-Bale acm.en=Mesopotamian Arabic -acm.en=Mesopotamian Arabic acn.en=Achang acp.en=Eastern Acipa acq.en=Ta'izzi-Adeni Arabic -acq.en=Ta'izzi-Adeni Arabic -acr.en=Achi acr=Achí +acr.en=Achi acs.en=Acroá act.en=Achterhoeks acu.en=Achuar-Shiwiar acv.en=Achumawi acw.en=Hijazi Arabic -acw.en=Hijazi Arabic -acx.en=Omani Arabic acx.en=Omani Arabic acy.en=Cypriot Arabic -acy.en=Cypriot Arabic acz.en=Acheron ada.en=Adangme adb.en=Adabe add.en=Dzodinka ade.en=Adele adf.en=Dhofari Arabic -adf.en=Dhofari Arabic adg.en=Andegerebinha adh.en=Adhola adi.en=Adi @@ -109,7 +465,6 @@ adp.en=Adap adq.en=Adangbe adr.en=Adonara ads.en=Adamorobe Sign Language -ads.en=Adamorobe Sign Language adt.en=Adnyamathanha adu.en=Aduge adw.en=Amundava @@ -119,18 +474,13 @@ ady=адыгaÐ±Ð·Ñ adz.en=Adzera aea.en=Areba aeb.en=Tunisian Arabic -aeb.en=Tunisian Arabic aec.en=Saidi Arabic -aec.en=Saidi Arabic -aed.en=Argentine Sign Language aed.en=Argentine Sign Language aee.en=Northeast Pashayi -ae.en=Avestan aek.en=Haeke ael.en=Ambele aem.en=Arem aen.en=Armenian Sign Language -aen.en=Armenian Sign Language aeq.en=Aer aer.en=Eastern Arrernte aes.en=Alsea @@ -140,11 +490,8 @@ aey.en=Amele aez.en=Aeka afa.en=Afro-Asiatic languages afb.en=Gulf Arabic -afb.en=Gulf Arabic afd.en=Andai afe.en=Putukwam -af.en=Afrikaans -afg.en=Afghan Sign Language afg.en=Afghan Sign Language afh.en=Afrihili afi.en=Akrukay @@ -223,7 +570,6 @@ aja.en=Aja (Sudan) ajg.en=Aja (Benin) aji.en=Ajië ajp.en=South Levantine Arabic -ajp.en=South Levantine Arabic ajt.en=Judeo-Tunisian Arabic aju.en=Judeo-Moroccan Arabic ajw.en=Ajawa @@ -232,7 +578,6 @@ akb.en=Batak Angkola akc.en=Mpur akd.en=Ukpet-Ehom ake.en=Akawaio -ak.en=Akan akf.en=Akpa akg.en=Anakalangu akh.en=Angal Heneng @@ -273,7 +618,6 @@ alr.en=Alutor als.en=Tosk Albanian alt.en=Southern Altai alu.en='Are'are -aluku.en=Aluku dialect alv.en=Atlantic-Congo languages alw.en=Alaba-K’abeena alx.en=Amol @@ -283,8 +627,6 @@ ama.en=Amanayé amb.en=Ambo amc.en=Amahuaca ame.en=Yanesha' -am.en=Amharic -am=አማርኛ amf.en=Hamer-Banna amg.en=Amarag ami.en=Amis @@ -310,10 +652,9 @@ anb.en=Andoa anc.en=Ngas and.en=Ansus ane.en=Xârâcùù -an.en=Aragonese anf.en=Animere -ang.en=Old English (ca. 450-1100) ang=Englisc +ang.en=Old English (ca. 450-1100) anh.en=Nend ani.en=Andi anj.en=Anor @@ -355,8 +696,6 @@ aoz.en=Uab Meto apa.en=Apache languages apb.en=Sa'a apc.en=North Levantine Arabic -apc.en=North Levantine Arabic -apd.en=Sudanese Arabic apd.en=Sudanese Arabic ape.en=Bukiyip apg.en=Ampanang @@ -387,49 +726,33 @@ aqm.en=Atohwaim aqn.en=Northern Alta aqp.en=Atakapa aqr.en=Arhâ -Arab.en=Arabic -arb.en=Standard Arabic arb.en=Standard Arabic arc.en=Official Aramaic (700-300 BCE) ard.en=Arabana are.en=Western Arrarnta -ar.en=Arabic -ar=العربية -arevela.en=Eastern Armenian -arevmda.en=Western Armenian arh.en=Arhuaco ari.en=Arikara arj.en=Arapaso ark.en=Arikapú arl.en=Arabela -Armi.en=Imperial Aramaic -Armn.en=Armenian arn.en=Mapudungun aro.en=Araona arp.en=Arapaho arq.en=Algerian Arabic -arq.en=Algerian Arabic arr.en=Karo (Brazil) ars.en=Najdi Arabic -ars.en=Najdi Arabic art.en=Artificial languages aru.en=Aruá (Amazonas State) arv.en=Arbore arw.en=Arawak arx.en=Aruá (Rodonia State) ary.en=Moroccan Arabic -ary.en=Moroccan Arabic -arz.en=Egyptian Arabic arz.en=Egyptian Arabic asa.en=Asu (Tanzania) asb.en=Assiniboine asc.en=Casuarina Coast Asmat asd.en=Asas ase.en=American Sign Language -ase.en=American Sign Language -as.en=Assamese -as=অসমীয়া -asf.en=Australian Sign Language asf.en=Australian Sign Language asg.en=Cishingini ash.en=Abishira @@ -440,8 +763,6 @@ asl.en=Asilulu asn.en=Xingú Asuriní aso.en=Dano asp.en=Algerian Sign Language -asp.en=Algerian Sign Language -asq.en=Austrian Sign Language asq.en=Austrian Sign Language asr.en=Asuri ass.en=Ipulo @@ -450,7 +771,6 @@ ast=Llingua Llïonesa asu.en=Tocantins Asurini asv.en=Asoa asw.en=Australian Aborigines Sign Language -asw.en=Australian Aborigines Sign Language asx.en=Muratayak asy.en=Yaosakor Asmat asz.en=As @@ -504,25 +824,21 @@ auw.en=Awyi aux.en=Aurá auy.en=Awiyaana auz.en=Uzbeki Arabic -auz.en=Uzbeki Arabic avb.en=Avau avd.en=Alviri-Vidari -av.en=Avaric avi.en=Avikam avk.en=Kotava avl.en=Eastern Egyptian Bedawi Arabic -avl.en=Eastern Egyptian Bedawi Arabic avn.en=Avatime avo.en=Agavotaguerra avs.en=Aushiri -Avst.en=Avestan avt.en=Au avu.en=Avokaya avv.en=Avá-Canoeiro awa.en=Awadhi awb.en=Awa (Papua New Guinea) -awc.en=Cicipu awc=Cicipu +awc.en=Cicipu awd.en=Arawakan languages awe.en=Awetí awh.en=Awbono @@ -549,20 +865,14 @@ ayb.en=Ayizo Gbe ayc.en=Southern Aymara ayd.en=Ayabadhu aye.en=Ayere -ay.en=Aymara -ay=Aymar aru ayg.en=Ginyanga ayh.en=Hadrami Arabic -ayh.en=Hadrami Arabic ayi.en=Leyigha ayk.en=Akuku ayl.en=Libyan Arabic -ayl.en=Libyan Arabic -ayn.en=Sanaani Arabic ayn.en=Sanaani Arabic ayo.en=Ayoreo ayp.en=North Mesopotamian Arabic -ayp.en=North Mesopotamian Arabic ayq.en=Ayi (Papua New Guinea) ayr.en=Central Aymara ays.en=Sorsogon Ayta @@ -572,23 +882,18 @@ ayx.en=Ayi (China) ayy.en=Tayabas Ayta ayz.en=Mai Brat aza.en=Azha -az-Arab=Ðзәрбајҹан azb-Arab=Ðзәрбајҹан +azb=AzÉ™rbaycan / Ðзәрбајҹан / آذربایجان azb-Cyrl=آذربایجان azb.en=South Azerbaijani -azb=AzÉ™rbaycan / Ðзәрбајҹан / آذربایجان azb-Latn=AzÉ™rbaycan azc.en=Uto-Aztecan languages -az-Cyrl=آذربایجان -az.en=Azerbaijani -az=AzÉ™rbaycan / Ðзәрбајҹан / آذربایجان azg.en=San Pedro Amuzgos Amuzgo azj-Arab=Ðзәрбајҹан +azj=AzÉ™rbaycan / Ðзәрбајҹан / آذربایجان azj-Cyrl=آذربایجان azj.en=North Azerbaijani -azj=AzÉ™rbaycan / Ðзәрбајҹан / آذربایجان azj-Latn=AzÉ™rbaycan -az-Latn=AzÉ™rbaycan azm.en=Ipalapa Amuzgo azo.en=Awing azt.en=Faire Atta @@ -598,25 +903,19 @@ bab.en=Bainouk-Gunyuño bac.en=Badui bad.en=Banda languages bae.en=Baré -ba.en=Bashkir -ba=Башҡорт baf.en=Nubaca bag.en=Tuki bah.en=Bahamas Creole English bai.en=Bamileke languages baj.en=Barakai -baku1926.en=Unified Turkic Latin Alphabet (Historical) bal.en=Baluchi -Bali.en=Balinese -Bamu.en=Bamum ban.en=Balinese bao.en=Waimaha bap.en=Bantawa -bar.en=Bavarian bar=Bairisch +bar.en=Bavarian bas.en=Basa (Cameroon) bat.en=Baltic languages -Batk.en=Batak bau.en=Bada (Nigeria) bav.en=Vengo baw.en=Bambili-Bambui @@ -649,7 +948,6 @@ bbw.en=Baba bbx.en=Bubia bby.en=Befang bbz.en=Babalia Creole Arabic -bbz.en=Babalia Creole Arabic bca.en=Central Bai bcb.en=Bainouk-Samik bcc.en=Southern Balochi @@ -705,8 +1003,6 @@ beb.en=Bebele bec.en=Iceve-Maci bed.en=Bedoanas bee.en=Byangsi -be.en=Belarusian -be=БеларуÑÐºÐ°Ñ bef.en=Benabena beg.en=Belait beh.en=Biali @@ -714,7 +1010,6 @@ bei.en=Bekati' bej.en=Beja bek.en=Bebeli bem.en=Bemba (Zambia) -Beng.en=Bengali beo.en=Beami bep.en=Besoa beq.en=Beembe @@ -736,10 +1031,8 @@ bff.en=Bofi bfg.en=Busang Kayan bfh.en=Blafe bfi.en=British Sign Language -bfi.en=British Sign Language bfj.en=Bafanji bfk.en=Ban Khor Sign Language -bfk.en=Ban Khor Sign Language bfl.en=Banda-Ndélé bfm.en=Mmen bfn.en=Bunak @@ -758,8 +1051,6 @@ bgb.en=Bobongko bgc.en=Haryanvi bgd.en=Rathwi Bareli bge.en=Bauria -bg.en=Bulgarian -bg=БългарÑки bgf.en=Bangandu bgg.en=Bugun bgi.en=Giangan @@ -785,8 +1076,6 @@ bhb.en=Bhili bhc.en=Biga bhd.en=Bhadrawahi bhe.en=Bhaya -bh.en=Bihari languages -bh=भोजपà¥à¤°à¥€ bhf.en=Odiai bhg.en=Binandere bhh.en=Bukharic @@ -813,7 +1102,6 @@ bib.en=Bissa bic.en=Bikaru bid.en=Bidiyo bie.en=Bepour -bi.en=Bislama bif.en=Biafada big.en=Biangai bij.en=Vaghat-Ya-Bijim-Legeri @@ -825,7 +1113,6 @@ bio.en=Nai bip.en=Bila biq.en=Bipi bir.en=Bisorio -biske.en=The San Giorgio dialect of Resian bit.en=Berinomo biu.en=Biete biv.en=Southern Birifor @@ -847,7 +1134,6 @@ bjk.en=Barok bjl.en=Bulu (Papua New Guinea) bjm.en=Bajelani bjn.en=Banjar -bjn.en=Banjar bjo.en=Mid-Southern Banda bjq.en=Southern Betsimisaraka Malagasy bjr.en=Binumarien @@ -893,7 +1179,6 @@ blf.en=Buol blg.en=Balau blh.en=Kuwaa bli.en=Bolia -Blis.en=Blissymbols blj.en=Bolongan blk.en=Pa'o Karen bll.en=Biloxi @@ -915,7 +1200,6 @@ bmb.en=Bembe bmc.en=Biem bmd.en=Baga Manduri bme.en=Limassa -bm.en=Bambara bmf.en=Bom bmg.en=Bamwe bmh.en=Kein @@ -942,8 +1226,6 @@ bnb.en=Bookan bnc.en=Central Bontoc bnd.en=Banda (Indonesia) bne.en=Bintauna -bn.en=Bengali -bn=বাংলা bnf.en=Masiwang bng.en=Benga bni.en=Bangi @@ -967,11 +1249,8 @@ bnz.en=Beezen boa.en=Bora bob.en=Aweer boe.en=Mundabli -bo.en=Tibetan -bo=བོད་སà¾à½‘་ bof.en=Bolon bog.en=Bamako Sign Language -bog.en=Bamako Sign Language boh.en=Boma boi.en=Barbareño boj.en=Anjam @@ -980,9 +1259,7 @@ bol.en=Bole bom.en=Berom bon.en=Bine boo.en=Tiemacèwè Bozo -boont.en=Boontling bop.en=Bonkiman -Bopo.en=Bopomofo boq.en=Bogaya bor.en=Borôro bot.en=Bongo @@ -1028,7 +1305,6 @@ bqk.en=Banda-Mbrès bql.en=Bilakura bqm.en=Wumboko bqn.en=Bulgarian Sign Language -bqn.en=Bulgarian Sign Language bqo.en=Balo bqp.en=Busa bqq.en=Biritai @@ -1040,16 +1316,11 @@ bqv.en=Begbere-Ejar bqw.en=Buru (Nigeria) bqx.en=Baangi bqy.en=Bengkala Sign Language -bqy.en=Bengkala Sign Language bqz.en=Bakaka bra.en=Braj -Brah.en=Brahmi -Brai.en=Braille brb.en=Lave brc.en=Berbice Creole Dutch brd.en=Baraamu -br.en=Breton -br=Brezhoneg brf.en=Bera brg.en=Baure brh.en=Brahui @@ -1075,8 +1346,6 @@ bsa.en=Abinomn bsb.en=Brunei Bisaya bsc.en=Bassari bse.en=Wushi -bs.en=Bosnian -bs=Bosanski bsf.en=Bauchi bsg.en=Bashkardi bsh.en=Kati @@ -1107,7 +1376,6 @@ btg.en=Gagnoa Bété bth.en=Biatah Bidayuh bti.en=Burate btj.en=Bacanese Malay -btj.en=Bacanese Malay btk.en=Batak languages btl.en=Bhatola btm.en=Batak Mandailing @@ -1131,8 +1399,6 @@ bud.en=Ntcham bue.en=Beothuk buf.en=Bushoong bug.en=Buginese -Bugi.en=Buginese -Buhd.en=Buhid buh.en=Younuo Bunu bui.en=Bongili buj.en=Basa-Gurmana @@ -1155,7 +1421,6 @@ bvb.en=Bube bvc.en=Baelelea bvd.en=Baeggu bve.en=Berau Malay -bve.en=Berau Malay bvf.en=Boor bvg.en=Bonkeng bvh.en=Bure @@ -1163,7 +1428,6 @@ bvi.en=Belanda Viri bvj.en=Baan bvk.en=Bukat bvl.en=Bolivian Sign Language -bvl.en=Bolivian Sign Language bvm.en=Bamunka bvn.en=Buna bvo.en=Bolgo @@ -1171,7 +1435,6 @@ bvq.en=Birri bvr.en=Burarra bvt.en=Bati (Indonesia) bvu.en=Bukit Malay -bvu.en=Bukit Malay bvv.en=Baniva bvw.en=Boga bvx.en=Dibole @@ -1268,7 +1531,6 @@ bzp.en=Kemberano bzq.en=Buli (Indonesia) bzr.en=Biri bzs.en=Brazilian Sign Language -bzs.en=Brazilian Sign Language bzt.en=Brithenig bzu.en=Burmeso bzv.en=Bebe @@ -1281,24 +1543,19 @@ cab.en=Garifuna cac.en=Chuj cad.en=Caddo cae.en=Lehar -ca.en=Catalan -ca=Català caf.en=Southern Carrier cag.en=Nivaclé cah.en=Cahuarano cai.en=Central American Indian languages caj.en=Chané cak.en=Kaqchikel -Cakm.en=Chakma cal.en=Carolinian cam.en=Cemuhî can.en=Chambri -Cans.en=Unified Canadian Aboriginal Syllabics cao.en=Chácobo cap.en=Chipaya caq.en=Car Nicobarese car.en=Galibi Carib -Cari.en=Carian cas.en=Tsimané cau.en=Caucasian languages cav.en=Cavineña @@ -1352,17 +1609,13 @@ cdj.en=Churahi cdm.en=Chepang cdn.en=Chaudangsi cdo.en=Min Dong Chinese -cdo.en=Min Dong Chinese cdr.en=Cinda-Regi-Tiyal cds.en=Chadian Sign Language -cds.en=Chadian Sign Language cdy.en=Chadong cdz.en=Koda cea.en=Lower Chehalis ceb.en=Cebuano ceb=Sinugboanon -ce.en=Chechen -ce=Ðохчийн ceg.en=Chamacoco cel.en=Celtic languages cen.en=Cen @@ -1375,13 +1628,9 @@ cga.en=Changriwa cgc.en=Kagayanen cgg.en=Chiga cgk.en=Chocangacakha -Cham.en=Cham chb.en=Chibcha chc.en=Catawba chd.en=Highland Oaxaca Chontal -ch.en=Chamorro -ch=Chamoru -Cher.en=Cherokee chf.en=Tabasco Chontal chg.en=Chagatai chh.en=Chinook @@ -1393,8 +1642,8 @@ chn.en=Chinook jargon cho.en=Choctaw chp.en=Chipewyan chq.en=Quiotepec Chinantec -chr.en=Cherokee chr=á£áŽ³áŽ© +chr.en=Cherokee cht.en=Cholón chw.en=Chuwabu chx.en=Chantyal @@ -1411,7 +1660,6 @@ cim.en=Cimbrian cin.en=Cinta Larga cip.en=Chiapanec cir.en=Tiri -Cirt.en=Cirth ciw.en=Chippewa ciy.en=Chaima cja.en=Western Cham @@ -1427,7 +1675,6 @@ cjr.en=Chorotega cjs.en=Shor cjv.en=Chuave cjy.en=Jinyu Chinese -cjy.en=Jinyu Chinese cka.en=Khumi Awa Chin ckb.en=Central Kurdish ckh.en=Chak @@ -1464,7 +1711,6 @@ cmk.en=Chimakum cml.en=Campalagian cmm.en=Michigamea cmn.en=Mandarin Chinese -cmn.en=Mandarin Chinese cmo.en=Central Mnong cmr.en=Mro Chin cms.en=Messapic @@ -1484,13 +1730,10 @@ cnu.en=Chenoua cnw.en=Ngawn Chin cnx.en=Middle Cornish coa.en=Cocos Islands Malay -coa.en=Cocos Islands Malay cob.en=Chicomuceltec coc.en=Cocopa cod.en=Cocama-Cocamilla coe.en=Koreguaje -co.en=Corsican -co=Corsu cof.en=Colorado cog.en=Chong coh.en=Chonyi-Dzihana-Kauma @@ -1500,9 +1743,8 @@ col.en=Columbia-Wenatchi com.en=Comanche con.en=Cofán coo.en=Comox -cop.en=Coptic cop=Ⲙⲉⲧⲣⲉⲙ̀ⲛⲭâ²â²™â²“ -Copt.en=Coptic +cop.en=Coptic coq.en=Coquille cot.en=Caquinte cou.en=Wamey @@ -1520,11 +1762,9 @@ cpg.en=Cappadocian Greek cpi.en=Chinese Pidgin English cpn.en=Cherepon cpp.en=Portuguese-based creoles and pidgins -Cprt.en=Cypriot cps.en=Capiznon cpu.en=Pichis Ashéninka cpx.en=Pu-Xian Chinese -cpx.en=Pu-Xian Chinese cpy.en=South Ucayali Ashéninka cqd.en=Chuanqiandian Cluster Miao cqu.en=Chilean Quechua @@ -1532,7 +1772,6 @@ cra.en=Chara crb.en=Island Carib crc.en=Lonwolwol crd.en=Coeur d'Alene -cr.en=Cree crf.en=Caramanta crg.en=Michif crh.en=Crimean Tatar @@ -1556,29 +1795,18 @@ crz.en=Cruzeño csa.en=Chiltepec Chinantec csb.en=Kashubian csc.en=Catalan Sign Language -csc.en=Catalan Sign Language csd.en=Chiangmai Sign Language -csd.en=Chiangmai Sign Language -cse.en=Czech Sign Language cse.en=Czech Sign Language -cs.en=Czech -cs=ÄŒeÅ¡tina csf.en=Cuba Sign Language -csf.en=Cuba Sign Language -csg.en=Chilean Sign Language csg.en=Chilean Sign Language csh.en=Asho Chin csi.en=Coast Miwok csk.en=Jola-Kasa csl.en=Chinese Sign Language -csl.en=Chinese Sign Language csm.en=Central Sierra Miwok csn.en=Colombian Sign Language -csn.en=Colombian Sign Language cso.en=Sochiapam Chinantec csq.en=Croatia Sign Language -csq.en=Croatia Sign Language -csr.en=Costa Rican Sign Language csr.en=Costa Rican Sign Language css.en=Southern Ohlone cst.en=Northern Ohlone @@ -1598,14 +1826,12 @@ cto.en=Emberá-Catío ctp.en=Western Highland Chatino cts.en=Northern Catanduanes Bicolano ctt.en=Wayanad Chetti -ctu.en=Chol ctu=Ch'ol +ctu.en=Chol ctz.en=Zacatepec Chatino cua.en=Cua cub.en=Cubeo cuc.en=Usila Chinantec -cu.en=Church Slavic -cu=СловѣÌньÑкъ Ñ©ê™ê™‘Ìкъ cug.en=Cung cuh.en=Chuka cui.en=Cuiba @@ -1623,8 +1849,6 @@ cuu.en=Tai Ya cuv.en=Cuvok cuw.en=Chukwa cux.en=Tepeuxila Cuicatec -cv.en=Chuvash -cv=Чăвашла cvg.en=Chug cvn.en=Valle Nacional Chinantec cwa.en=Kabwa @@ -1635,24 +1859,16 @@ cwg.en=Chewong cwt.en=Kuwaataay cya.en=Nopala Chatino cyb.en=Cayubaba -cy.en=Welsh -cy=Cymraeg cyo.en=Cuyonon -Cyrl.en=Cyrillic -Cyrs.en=Cyrillic (Old Church Slavonic variant) -czh.en=Huizhou Chinese czh.en=Huizhou Chinese czk.en=Knaanic czn.en=Zenzontepec Chatino czo.en=Min Zhong Chinese -czo.en=Min Zhong Chinese czt.en=Zotung Chin daa.en=Dangaléat dac.en=Dambi dad.en=Marik dae.en=Duupa -da.en=Danish -da=Dansk daf.en=Dan dag.en=Dagbani dah.en=Gwahatike @@ -1704,8 +1920,6 @@ ddw.en=Dawera-Daweloor dec.en=Dagik ded.en=Dedua dee.en=Dewoin -de.en=German -de=Deutsch def.en=Dezfuli deg.en=Degema deh.en=Dehwari @@ -1718,7 +1932,6 @@ dep.en=Pidgin Delaware deq.en=Dendi (Central African Republic) der.en=Deori des.en=Desano -Deva.en=Devanagari dev.en=Domung dez.en=Dengese dga.en=Southern Dagaare @@ -1838,7 +2051,6 @@ don.en=Toura (Papua New Guinea) doo.en=Dongo dop.en=Lukpa doq.en=Dominican Sign Language -doq.en=Dominican Sign Language dor.en=Dori'o dos.en=Dogosé dot.en=Dass @@ -1867,15 +2079,12 @@ drw.en=Darwazi dry.en=Darai dsb.en=Lower Sorbian dse.en=Dutch Sign Language -dse.en=Dutch Sign Language dsh.en=Daasanach dsi.en=Disa dsl.en=Danish Sign Language -dsl.en=Danish Sign Language dsn.en=Dusner dso.en=Desiya dsq.en=Tadaksahak -Dsrt.en=Deseret dta.en=Daur dtb.en=Labuk-Kinabatangan Kadazan dti.en=Ana Tinga Dogon @@ -1902,7 +2111,6 @@ dum.en=Middle Dutch (ca. 1050-1350) dun.en=Dusun Deyah duo.en=Dupaninan Agta dup.en=Duano -dup.en=Duano duq.en=Dusun Malang dur.en=Dii dus.en=Dumi @@ -1913,7 +2121,6 @@ dux.en=Duungooma duy.en=Dicamay Agta duz.en=Duli dva.en=Duau -dv.en=Dhivehi dwa.en=Diri dwl.en=Walo Kumbe Dogon dwr.en=Dawro @@ -1931,8 +2138,6 @@ dyu.en=Dyula dyy.en=Dyaabugay dza.en=Tunzu dzd.en=Daza -dz.en=Dzongkha -dz=རྫོང་འdzg.en=Dazaga dzl.en=Dzalakha dzn.en=Dzando @@ -1942,10 +2147,8 @@ ebr.en=Ebrié ebu.en=Embu ecr.en=Eteocretan ecs.en=Ecuadorian Sign Language -ecs.en=Ecuadorian Sign Language ecy.en=Eteocypriot eee.en=E -ee.en=Ewe efa.en=Efai efe.en=Efe efi.en=Efik @@ -1953,10 +2156,7 @@ ega.en=Ega egl.en=Emilian ego.en=Eggon egx.en=Egyptian languages -Egyd.en=Egyptian demotic egy.en=Egyptian (Ancient) -Egyh.en=Egyptian hieratic -Egyp.en=Egyptian hieroglyphs ehu.en=Ehueun eip.en=Eipomek eit.en=Eitiep @@ -1974,8 +2174,6 @@ ekp.en=Ekpeye ekr.en=Yace eky.en=Eastern Kayah ele.en=Elepi -el.en=Modern Greek (1453-) -el=Ελληνικά elh.en=El Hugeirat eli.en=Nding elk.en=Elkei @@ -2002,9 +2200,7 @@ ena.en=Apali enb.en=Markweeta enc.en=En end.en=Ende -en.en=English enf.en=Forest Enets -en-GB=English (UK) enh.en=Tundra Enets enm.en=Middle English (1100-1500) enn.en=Engenni @@ -2012,10 +2208,8 @@ eno.en=Enggano enq.en=Enga enr.en=Emumu enu.en=Enu -en-US=English (US) env.en=Enwan (Edu State) enw.en=Enwan (Akwa Ibom State) -eo.en=Esperanto eot.en=Beti (Côte d'Ivoire) epi.en=Epie era.en=Eravallan @@ -2029,17 +2223,12 @@ ers.en=Ersu ert.en=Eritai erw.en=Erokwanas ese.en=Ese Ejja -es.en=Spanish -es=Español esh.en=Eshtehardi esi.en=North Alaskan Inupiatun esk.en=Northwest Alaska Inupiatun esl.en=Egypt Sign Language -esl.en=Egypt Sign Language esm.en=Esuma esn.en=Salvadoran Sign Language -esn.en=Salvadoran Sign Language -eso.en=Estonian Sign Language eso.en=Estonian Sign Language esq.en=Esselen ess.en=Central Siberian Yupik @@ -2047,11 +2236,7 @@ esu.en=Central Yupik esx.en=Eskimo-Aleut languages etb.en=Etebi etc.en=Etchemin -et.en=Estonian -et=Eesti Keel -eth.en=Ethiopian Sign Language eth.en=Ethiopian Sign Language -Ethi.en=Ethiopic etn.en=Eton (Vanuatu) eto.en=Eton (Cameroon) etr.en=Edolo @@ -2060,8 +2245,6 @@ ett.en=Etruscan etu.en=Ejagham etx.en=Eten etz.en=Semimi -eu.en=Basque -eu=Euskara euq.en=Basque (family) eve.en=Even evh.en=Uvbie @@ -2074,8 +2257,6 @@ eze.en=Uzekwe faa.en=Fasu fab.en=Fa D'ambu fad.en=Wagi -fa.en=Persian -fa=Ùارسی faf.en=Fagani fag.en=Finongan fah.en=Baissa Fali @@ -2093,24 +2274,18 @@ fax.en=Fala fay.en=Southwestern Fars faz.en=Northwestern Fars fcs.en=Quebec Sign Language -fcs.en=Quebec Sign Language fer.en=Feroge -ff.en=Fulah ffi.en=Foia Foia ffm.en=Maasina Fulfulde fgr.en=Fongoro fia.en=Nobiin fie.en=Fyer -fi.en=Finnish -fi=Suomi fil.en=Filipino fip.en=Fipa fir.en=Firan fit.en=Tornedalen Finnish fiu.en=Finno-Ugrian languages fiw.en=Fiwaga -fj.en=Fijian -fj=Na vosa vaka-Viti fkv.en=Kven Finnish fla.en=Kalispel-Pend d'Oreille flh.en=Foau @@ -2124,13 +2299,9 @@ fmu.en=Far Western Muria fng.en=Fanagalo fni.en=Fania fod.en=Foodo -fo.en=Faroese -fo=Føroyskt foi.en=Foi fom.en=Foma fon.en=Fon -fonipa.en=International Phonetic Alphabet -fonupa.en=Uralic Phonetic Alphabet for.en=Fore fos.en=Siraya fox.en=Formosan languages @@ -2138,8 +2309,6 @@ fpe.en=Fernando Po Creole English fqs.en=Fas frc.en=Cajun French frd.en=Fordata -fr.en=French -fr=Français frk.en=Frankish frm.en=Middle French (ca. 1400-1600) fro.en=Old French (842-ca. 1400) @@ -2149,10 +2318,7 @@ frr.en=Northern Frisian frs.en=Eastern Frisian frt.en=Fortsenal fse.en=Finnish Sign Language -fse.en=Finnish Sign Language fsl.en=French Sign Language -fsl.en=French Sign Language -fss.en=Finland-Swedish Sign Language fss.en=Finland-Swedish Sign Language fub.en=Adamawa Fulfulde fuc.en=Pulaar @@ -2173,14 +2339,10 @@ fuy.en=Fuyug fvr.en=Fur fwa.en=Fwâi fwe.en=Fwe -fy.en=Western Frisian -fy=Frysk gaa.en=Ga gab.en=Gabri gad.en=Gaddang gae.en=Guarequena -ga.en=Irish -ga=Gaeilge gaf.en=Gende gag.en=Gagauz gah.en=Alekano @@ -2190,7 +2352,6 @@ gak.en=Gamkonora gal.en=Galoli gam.en=Kandawo gan.en=Gan Chinese -gan.en=Gan Chinese gao.en=Gants gap.en=Gal gaq.en=Gata' @@ -2240,8 +2401,6 @@ gdb.en=Pottangi Ollar Gadaba gdc.en=Gugu Badhun gdd.en=Gedaged gde.en=Gude -gd.en=Scottish Gaelic -gd=A' Ghàidhlig gdf.en=Guduf-Gava gdg.en=Ga'dang gdh.en=Gadjerawang @@ -2267,15 +2426,13 @@ gej.en=Gen gek.en=Yiwom gel.en=Kag-Fer-Jiir-Koor-Ror-Us-Zuksun gem.en=Germanic languages -Geok.en=Khutsuri (Asomtavruli and Nuskhuri) -Geor.en=Georgian (Mkhedruli) geq.en=Geme ges.en=Geser-Gorom gew.en=Gera gex.en=Garre gey.en=Enya -gez.en=Geez gez=áŒá‹•á‹ +gez.en=Geez gfk.en=Patpatar gft.en=Gafat gga.en=Gao @@ -2328,11 +2485,8 @@ gka.en=Guya gke.en=Ndai gkn.en=Gokana gkp.en=Guinea Kpelle -Glag.en=Glagolitic glc.en=Bon Gula gld.en=Nanai -gl.en=Galician -gl=Galego glh.en=Northwest Pashayi gli.en=Guliguli glj.en=Gula Iro @@ -2361,8 +2515,6 @@ gnb.en=Gangte gnc.en=Guanche gnd.en=Zulgo-Gemzek gne.en=Ganang -gn.en=Guarani -gn=ગà«àªœàª°àª¾àª¤à«€ gng.en=Ngangam gnh.en=Lere gni.en=Gooniyandi @@ -2390,16 +2542,14 @@ goj.en=Gowlan gok.en=Gowli gol.en=Gola gom.en=Goan Konkani -gom.en=Goan Konkani gon.en=Gondi goo.en=Gone Dau gop.en=Yeretuar goq.en=Gorap gor.en=Gorontalo gos.en=Gronings -got.en=Gothic got=ðŒ²ðŒ¿ð„ðŒ¹ðƒðŒºðŒ° -Goth.en=Gothic +got.en=Gothic gou.en=Gavar gow.en=Gorowa gox.en=Gobu @@ -2416,7 +2566,6 @@ grb.en=Grebo grc.en=Ancient Greek (to 1453) grc=Ἑλληνική grd.en=Guruntum-Mbaaru -Grek.en=Greek grg.en=Madi grh.en=Gbiri-Niragu gri.en=Ghari @@ -2435,17 +2584,13 @@ grx.en=Guriaso gry.en=Barclayville Grebo grz.en=Guramalum gse.en=Ghanaian Sign Language -gse.en=Ghanaian Sign Language -gsg.en=German Sign Language gsg.en=German Sign Language gsl.en=Gusilay gsm.en=Guatemalan Sign Language -gsm.en=Guatemalan Sign Language gsn.en=Gusan gso.en=Southwest Gbaya gsp.en=Wasembo gss.en=Greek Sign Language -gss.en=Greek Sign Language gsw.en=Swiss German gta.en=Guató gti.en=Gbati-ri @@ -2454,12 +2599,10 @@ gub.en=Guajajára guc.en=Wayuu gud.en=Yocoboué Dida gue.en=Gurinji -gu.en=Gujarati guf.en=Gupapuyngu gug.en=Paraguayan Guaraní guh.en=Guahibo gui.en=Eastern Bolivian Guaraní -Gujr.en=Gujarati guk.en=Gumuz gul.en=Sea Island Creole English gum.en=Guambiano @@ -2468,8 +2611,6 @@ guo.en=Guayabero gup.en=Gunwinggu guq.en=Aché gur.en=Farefare -Guru.en=Gurmukhi -gus.en=Guinean Sign Language gus.en=Guinean Sign Language gut.en=Maléku Jaíka guu.en=Yanomamö @@ -2480,8 +2621,6 @@ guz.en=Gusii gva.en=Guana (Paraguay) gvc.en=Guanano gve.en=Duwet -gv.en=Manx -gv=Gaelg gvf.en=Golin gvj.en=Guajá gvl.en=Gulay @@ -2525,27 +2664,18 @@ gzi.en=Gazi gzn.en=Gane haa.en=Han hab.en=Hanoi Sign Language -hab.en=Hanoi Sign Language hac.en=Gurani had.en=Hatam hae.en=Eastern Oromo -ha.en=Hausa -haf.en=Haiphong Sign Language haf.en=Haiphong Sign Language hag.en=Hanga hah.en=Hahon hai.en=Haida haj.en=Hajong hak.en=Hakka Chinese -hak.en=Hakka Chinese hal.en=Halang ham.en=Hewa han.en=Hangaza -Hang.en=Hangul -Hani.en=Han -Hano.en=Hanunoo -Hans.en=Han (Simplified variant) -Hant.en=Han (Traditional variant) hao.en=Hakö hap.en=Hupla haq.en=Ha @@ -2567,19 +2697,13 @@ hca.en=Andaman Creole Hindi hch.en=Huichol hdn.en=Northern Haida hds.en=Honduras Sign Language -hds.en=Honduras Sign Language hdy.en=Hadiyya hea.en=Northern Qiandong Miao -Hebr.en=Hebrew hed.en=Herdé -he.en=Hebrew -he=עברית heg.en=Helong heh.en=Hehe hei.en=Heiltsuk hem.en=Hemba -hepburn.en=Hepburn romanization -heploc.en=Hepburn romanization, Library of Congress method hgm.en=Hai//om hgw.en=Haigwai hhi.en=Hoia Hoia @@ -2588,8 +2712,6 @@ hhy.en=Hoyahoya hia.en=Lamang hib.en=Hibito hid.en=Hidatsa -hi.en=Hindi -hi=हिनà¥à¤¦à¥€ hif.en=Fiji Hindi hif=फ़िजि हिनà¥à¤¦à¥€ hig.en=Kamwe @@ -2600,18 +2722,15 @@ hik.en=Seit-Kaitetu hil.en=Hiligaynon him.en=Himachali languages hio.en=Tsoa -Hira.en=Hiragana hir.en=Himarimã hit.en=Hittite hiw.en=Hiw hix.en=Hixkaryána hji.en=Haji -hji.en=Haji hka.en=Kahe hke.en=Hunde hkk.en=Hunjara-Kaina Ke hks.en=Hong Kong Sign Language -hks.en=Hong Kong Sign Language hla.en=Halia hlb.en=Halbi hld.en=Halang Doan @@ -2632,7 +2751,6 @@ hmk.en=Maek hml.en=Luopohe Hmong hmm.en=Central Mashan Hmong hmn.en=Hmong -Hmng.en=Pahawh Hmong hmp.en=Northern Mashan Hmong hmq.en=Eastern Qiandong Miao hmr.en=Hmar @@ -2659,7 +2777,6 @@ hob.en=Mari (Madang Province) hoc.en=Ho hod.en=Holma hoe.en=Horom -ho.en=Hiri Motu hoh.en=Hobyót hoi.en=Holikachuk hoj.en=Hadothi @@ -2670,7 +2787,6 @@ hoo.en=Holoholo hop.en=Hopi hor.en=Horo hos.en=Ho Chi Minh City Sign Language -hos.en=Ho Chi Minh City Sign Language hot.en=Hote hov.en=Hovongan how.en=Honi @@ -2678,13 +2794,9 @@ hoy.en=Holiya hoz.en=Hozo hpo.en=Hpon hps.en=Hawai'i Pidgin Sign Language -hps.en=Hawai'i Pidgin Sign Language hra.en=Hrangkhol hre.en=Hre -hr.en=Croatian -hr=Hrvatski hrk.en=Haruku -Hrkt.en=(alias for Hiragana + Katakana) hrm.en=Horned Miao hro.en=Haroi hrr.en=Horuru @@ -2694,14 +2806,9 @@ hrx.en=Hunsrik hrz.en=Harzani hsb.en=Upper Sorbian hsh.en=Hungarian Sign Language -hsh.en=Hungarian Sign Language -hsl.en=Hausa Sign Language hsl.en=Hausa Sign Language hsn.en=Xiang Chinese -hsn.en=Xiang Chinese hss.en=Harsusi -ht.en=Haitian -ht=Kreyòl ayisyen hti.en=Hoti hto.en=Minica Huitoto hts.en=Hadza @@ -2711,8 +2818,6 @@ hub.en=Huambisa huc.en=.en=/Hua hud.en=Huaulu hue.en=San Francisco Del Mar Huave -hu.en=Hungarian -hu=Magyar huf.en=Humene hug.en=Huachipaeri huh.en=Huilliche @@ -2721,7 +2826,6 @@ huj.en=Northern Guiyang Hmong huk.en=Hulung hul.en=Hula hum.en=Hungana -Hung.en=Old Hungarian huo.en=Hu hup.en=Hupa huq.en=Tsat @@ -2744,12 +2848,7 @@ hwa.en=Wané hwc.en=Hawai'i Creole English hwo.en=Hwana hya.en=Hya -hy.en=Armenian -hy=Õ€Õ¡ÕµÕ¥Ö€Õ¥Õ¶ hyx.en=Armenian (family) -hz.en=Herero -hz=Otjiherero -ia.en=Interlingua (International Auxiliary Language iai.en=Iaai ian.en=Iatmul iap.en=Iapama @@ -2769,21 +2868,17 @@ iby.en=Ibani ica.en=Ede Ica ich.en=Etkywan icl.en=Icelandic Sign Language -icl.en=Icelandic Sign Language icr.en=Islander Creole English ida.en=Idakho-Isukha-Tiriki idb.en=Indo-Portuguese idc.en=Idon idd.en=Ede Idaca ide.en=Idere -id.en=Indonesian -id=Bahasa Indonesia idi.en=Idi idr.en=Indri ids.en=Idesa idt.en=Idaté idu.en=Idoma -ie.en=Interlingue ifa.en=Amganad Ifugao ifb.en=Batad Ifugao ife.en=Ifè @@ -2794,7 +2889,6 @@ ifu.en=Mayoyao Ifugao ify.en=Keley-I Kallahan igb.en=Ebira ige.en=Igede -ig.en=Igbo igg.en=Igana igl.en=Igala igm.en=Kanggape @@ -2805,7 +2899,6 @@ igw.en=Igwe ihb.en=Iha Based Pidgin ihi.en=Ihievbe ihp.en=Iha -ii.en=Sichuan Yi iir.en=Indo-Iranian languages ijc.en=Izon ije.en=Biseni @@ -2814,8 +2907,6 @@ ijn.en=Kalabari ijo.en=Ijo languages ijs.en=Southeast Ijo ike.en=Eastern Canadian Inuktitut -ik.en=Inupiaq -ik=Iñupiak iki.en=Iko ikk.en=Ika ikl.en=Ikulu @@ -2834,7 +2925,6 @@ ilk.en=Ilongot ill.en=Iranun ilo.en=Iloko ils.en=International Sign -ils.en=International Sign ilu.en=Ili'uun ilv.en=Ilue ilw.en=Talur @@ -2849,23 +2939,18 @@ ims.en=Marsian imy.en=Milyan inb.en=Inga inc.en=Indic languages -Inds.en=Indus ine.en=Indo-European languages -in.en=Indonesian ing.en=Degexit'an inh.en=Ingush inj.en=Jungle Inga inl.en=Indonesian Sign Language -inl.en=Indonesian Sign Language inm.en=Minaean inn.en=Isinai ino.en=Inoke-Yate inp.en=Iñapari ins.en=Indian Sign Language -ins.en=Indian Sign Language int.en=Intha inz.en=Ineseño -io.en=Ido ior.en=Inor iou.en=Tuma-Irumu iow.en=Iowa-Oto @@ -2887,10 +2972,6 @@ isa.en=Isabi isc.en=Isconahua isd.en=Isnag ise.en=Italian Sign Language -ise.en=Italian Sign Language -is.en=Icelandic -is=Ãslenska -isg.en=Irish Sign Language isg.en=Irish Sign Language ish.en=Esan isi.en=Nkem-Nkum @@ -2898,15 +2979,11 @@ ism.en=Masimasi isn.en=Isanzu iso.en=Isoko isr.en=Israeli Sign Language -isr.en=Israeli Sign Language ist.en=Istriot isu.en=Isu (Menchum Division) -Ital.en=Old Italic (Etruscan, Oscan, etc.) itb.en=Binongan Itneg itc.en=Italic languages ite.en=Itene -it.en=Italian -it=Italiano iti.en=Inlaod Itneg itk.en=Judeo-Italian itl.en=Itelmen @@ -2920,12 +2997,9 @@ itw.en=Ito itx.en=Itik ity.en=Moyadan Itneg itz.en=Itzá -iu.en=Inuktitut -iu=áƒá“„ᒃᑎá‘ᑦ ium.en=Iu Mien ivb.en=Ibatan ivv.en=Ivatan -iw.en=Hebrew iwk.en=I-Wak iwm.en=Iwam iwo.en=Iwur @@ -2943,13 +3017,10 @@ jab.en=Hyam jac.en=Popti' jad.en=Jahanka jae.en=Yabem -ja.en=Japanese -ja=日本語 jaf.en=Jara jah.en=Jah Hut jaj.en=Zazao jak.en=Jakun -jak.en=Jakun jal.en=Yalahatan jam.en=Jamaican Creole English jao.en=Yanyuwa @@ -2958,8 +3029,6 @@ jar.en=Jarawa (Nigeria) jas.en=New Caledonian Javanese jat.en=Jakati jau.en=Yaur -Java.en=Javanese -jax.en=Jambi Malay jax.en=Jambi Malay jay.en=Yan-nhangu jaz.en=Jawe @@ -2971,7 +3040,6 @@ jbr.en=Jofotek-Bromnya jbt.en=Jabutí jbu.en=Jukun Takum jcs.en=Jamaican Country Sign Language -jcs.en=Jamaican Country Sign Language jct.en=Krymchak jda.en=Jad jdg.en=Jadgali @@ -2992,13 +3060,11 @@ jge.en=Judeo-Georgian jgo.en=Ngomba jhi.en=Jehai jhs.en=Jhankot Sign Language -jhs.en=Jhankot Sign Language jia.en=Jina jib.en=Jibu jic.en=Tol jid.en=Bu jie.en=Jilbe -ji.en=Yiddish jig.en=Djingili jih.en=Shangzhai jii.en=Jiiddu @@ -3034,10 +3100,8 @@ job.en=Joba jod.en=Wojenaka jor.en=Jorá jos.en=Jordanian Sign Language -jos.en=Jordanian Sign Language jow.en=Jowulu jpa.en=Jewish Palestinian Aramaic -Jpan.en=Japanese (alias for Han + Hiragana + Katakana) jpr.en=Judeo-Persian jpx.en=Japanese (family) jqr.en=Jaqaru @@ -3047,7 +3111,6 @@ jrr.en=Jiru jrt.en=Jorto jru.en=Japrería jsl.en=Japanese Sign Language -jsl.en=Japanese Sign Language jua.en=Júma jub.en=Wannu juc.en=Jurchen @@ -3061,15 +3124,12 @@ juo.en=Jiba jup.en=Hupdë jur.en=Jurúna jus.en=Jumla Sign Language -jus.en=Jumla Sign Language jut.en=Jutish juu.en=Ju juw.en=Wãpha juy.en=Juray jvd.en=Javindo -jv.en=Javanese jvn.en=Caribbean Javanese -jw.en=Javanese jwi.en=Jwira-Pepesa jya.en=Jiarong jye.en=Judeo-Yemeni Arabic @@ -3079,17 +3139,13 @@ kab.en=Kabyle kac.en=Kachin kad.en=Kadara kae.en=Ketangalan -ka.en=Georgian -ka=ქáƒáƒ áƒ—ული kaf.en=Katso kag.en=Kajaman kah.en=Kara (Central African Republic) kai.en=Karekare kaj.en=Jju kak.en=Kayapa Kallahan -Kali.en=Kayah Li kam.en=Kamba (Kenya) -Kana.en=Katakana kao.en=Xaasongaxango kap.en=Bezhta kaq.en=Capanahua @@ -3232,12 +3288,10 @@ kgb.en=Kawe kgc.en=Kasseng kgd.en=Kataang kge.en=Komering -kg.en=Kongo kgf.en=Kube kgg.en=Kusunda kgh.en=Upper Tanudan Kalinga kgi.en=Selangor Sign Language -kgi.en=Selangor Sign Language kgj.en=Gamale Kham kgk.en=Kaiwá kgl.en=Kunggari @@ -3255,7 +3309,6 @@ kgw.en=Karon Dori kgx.en=Kamaru kgy.en=Kyerung kha.en=Khasi -Khar.en=Kharoshthi khb.en=Lü khc.en=Tukang Besi North khd.en=Bädi Kanum @@ -3267,7 +3320,6 @@ khi.en=Khoisan languages khj.en=Kuturmi khk.en=Halh Mongolian khl.en=Lusi -Khmr.en=Khmer khn.en=Khandesi kho.en=Khotanese khp.en=Kapori @@ -3286,8 +3338,6 @@ kib.en=Koalib kic.en=Kickapoo kid.en=Koshin kie.en=Kibet -ki.en=Kikuyu -ki=GÄ©kÅ©yÅ© kif.en=Eastern Parbate Kham kig.en=Kimaama kih.en=Kilmeri @@ -3311,8 +3361,6 @@ kjb.en=Q'anjob'al kjc.en=Coastal Konjo kjd.en=Southern Kiwai kje.en=Kisar -kj.en=Kuanyama -kj=Oshikwanyama kjf.en=Khalaj kjg.en=Khmu kjh.en=Khakas @@ -3335,11 +3383,8 @@ kjz.en=Bumthangkha kka.en=Kakanda kkb.en=Kwerisa kkc.en=Odoodee -kkcor.en=Common Cornish orthography of Revived Cornish kkd.en=Kinuku kke.en=Kakabe -kk.en=Kazakh -kk=Қазақша kkf.en=Kalaktang Monpa kkg.en=Mabaka Valley Kalinga kkh.en=Khün @@ -3366,7 +3411,6 @@ klb.en=Kiliwa klc.en=Kolbila kld.en=Gamilaraay kle.en=Kulung (Nepal) -kl.en=Kalaallisut klf.en=Kendeje klg.en=Tagakaulu Kalagan klh.en=Weliki @@ -3393,8 +3437,6 @@ kmb.en=Kimbundu kmc.en=Southern Dong kmd.en=Madukayang Kalinga kme.en=Bakole -km.en=Central Khmer -km=ភាសាážáŸ’មែរ kmf.en=Kare (Papua New Guinea) kmg.en=Kâte kmh.en=Kalam @@ -3419,11 +3461,8 @@ kmz.en=Khorasani Turkish kna.en=Dera (Nigeria) knb.en=Lubuagan Kalinga knc.en=Central Kanuri -Knda.en=Kannada knd.en=Konda kne.en=Kankanaey -kn.en=Kannada -kn=ಕನà³à²¨à²¡ knf.en=Mankanya kng.en=Koongo kni.en=Kanufi @@ -3432,7 +3471,6 @@ knk.en=Kuranko knl.en=Keninjal knm.en=Kanamarí knn.en=Konkani (individual language) -knn.en=Konkani (individual language) kno.en=Kono (Sierra Leone) knp.en=Kwanja knq.en=Kintaq @@ -3449,20 +3487,16 @@ koa.en=Konomala koc.en=Kpati kod.en=Kodi koe.en=Kacipo-Balesi -ko.en=Korean -ko=í•œêµ­ë§ kof.en=Kubi kog.en=Cogui koh.en=Koyo koi.en=Komi-Permyak koj.en=Sara Dunjo kok.en=Konkani (macrolanguage) -ko-KP=ì¡°ì„ ë§ kol.en=Kol (Papua New Guinea) koo.en=Konzo kop.en=Kwato koq.en=Kota (Gabon) -Kore.en=Korean (alias for Hangul + Han) kos.en=Kosraean kot.en=Lagwan kou.en=Koke @@ -3528,7 +3562,6 @@ krb.en=Karkin krc.en=Karachay-Balkar krd.en=Kairui-Midiki kre.en=Panará -kr.en=Kanuri krf.en=Koro (Vanuatu) krh.en=Kurama kri.en=Krio @@ -3549,14 +3582,10 @@ krx.en=Karon kry.en=Kryts krz.en=Sota Kanum ksa.en=Shuwa-Zamani -ks-Arab=کٲشÙر ksb.en=Shambala ksc.en=Southern Kalinga ksd.en=Kuanua -ks-Deva=कॉशà¥à¤° kse.en=Kuni -ks.en=Kashmiri -ks=कॉशà¥à¤° / کٲشÙر ksf.en=Bafia ksg.en=Kusaghe ksh.en=Kölsch @@ -3586,7 +3615,6 @@ kte.en=Nubri ktf.en=Kwami ktg.en=Kalkutung kth.en=Karanga -Kthi.en=Kaithi kti.en=North Muyu ktj.en=Plapo Krumen ktk.en=Kaniet @@ -3605,21 +3633,16 @@ ktw.en=Kato ktx.en=Kaxararí kty.en=Kango (Bas-Uélé District) ktz.en=Ju/'hoan -ku-Arab=كوردی kub.en=Kutep kuc.en=Kwinsu -ku-Cyrl=К'ӧрди kud.en='Auhelawa kue.en=Kuman -ku.en=Kurdish -ku=Kurdî / كوردی / К'ӧрди kuf.en=Western Katu kug.en=Kupa kuh.en=Kushi kui.en=Kuikúro-Kalapálo kuj.en=Kuria kuk.en=Kepo' -ku-Latn=Kurdî kul.en=Kulere kum.en=Kumyk kun.en=Kunama @@ -3636,19 +3659,15 @@ kuy.en=Kuuku-Ya'u kuz.en=Kunza kva.en=Bagvalal kvb.en=Kubu -kvb.en=Kubu kvc.en=Kove kvd.en=Kui (Indonesia) kve.en=Kalabakan -kv.en=Komi -kv=Коми kvf.en=Kabalai kvg.en=Kuni-Boazi kvh.en=Komodo kvi.en=Kwang kvj.en=Psikye kvk.en=Korean Sign Language -kvk.en=Korean Sign Language kvl.en=Brek Karen kvm.en=Kendem kvn.en=Border Kuna @@ -3656,7 +3675,6 @@ kvo.en=Dobel kvp.en=Kompane kvq.en=Geba Karen kvr.en=Kerinci -kvr.en=Kerinci kvs.en=Kunggara kvt.en=Lahta Karen kvu.en=Yinbaw Karen @@ -3670,8 +3688,6 @@ kwb.en=Kwa kwc.en=Likwala kwd.en=Kwaio kwe.en=Kwerba -kw.en=Cornish -kw=Kernewek kwf.en=Kwara'ae kwg.en=Sara Kaba Deme kwh.en=Kowiai @@ -3697,7 +3713,6 @@ kxa.en=Kairiru kxb.en=Krobu kxc.en=Konso kxd.en=Brunei -kxd.en=Brunei kxe.en=Kakihum kxf.en=Manumanaw Karen kxh.en=Karo (Ethiopia) @@ -3724,8 +3739,6 @@ kyb.en=Butbut Kalinga kyc.en=Kyaka kyd.en=Karey kye.en=Krache -ky.en=Kirghiz -ky=Кыргызча kyf.en=Kouya kyg.en=Keyagana kyh.en=Karok @@ -3779,8 +3792,6 @@ lac.en=Lacandon lac=Hach T'É™n lad.en=Ladino lae.en=Pattani -la.en=Latin -la=lingua latina laf.en=Lafofa lag.en=Langi lah.en=Lahnda @@ -3789,16 +3800,11 @@ laj.en=Lango (Uganda) lak.en=Laka (Nigeria) lal.en=Lalia lam.en=Lamba -Lana.en=Tai Tham lan.en=Laru -Laoo.en=Lao lap.en=Laka (Chad) laq.en=Qabiao lar.en=Larteh las.en=Lama (Togo) -Latf.en=Latin (Fraktur variant) -Latg.en=Latin (Gaelic variant) -Latn.en=Latin lau.en=Laba law.en=Lauje lax.en=Tiwa @@ -3808,8 +3814,6 @@ lba.en=Lui lbb.en=Label lbc.en=Lakkia lbe.en=Lak -lb.en=Luxembourgish -lb=Lëtzebuergesch lbf.en=Tinani lbg.en=Laopang lbi.en=La'bi @@ -3820,7 +3824,6 @@ lbo.en=Laven lbq.en=Wampar lbr.en=Northern Lorung lbs.en=Libyan Sign Language -lbs.en=Libyan Sign Language lbt.en=Lachi lbu.en=Labu lbv.en=Lavatbura-Lamusong @@ -3831,8 +3834,6 @@ lbz.en=Lardil lcc.en=Legenyem lcd.en=Lola lce.en=Loncong -lce.en=Loncong -lcf.en=Lubu lcf.en=Lubu lch.en=Luchazi lcl.en=Lisela @@ -3868,7 +3869,6 @@ lel.en=Lele (Democratic Republic of Congo) lem.en=Nomaande len.en=Lenca leo.en=Leti (Cameroon) -Lepc.en=Lepcha lep.en=Lepcha leq.en=Lembena ler.en=Lenkau @@ -3884,7 +3884,6 @@ lfa.en=Lefa lfn.en=Lingua Franca Nova lga.en=Lungga lgb.en=Laghu -lg.en=Ganda lgg.en=Lugbara lgh.en=Laghuu lgi.en=Lengilu @@ -3912,7 +3911,6 @@ lib.en=Likum lic.en=Hlai lid.en=Nyindrou lie.en=Likila -li.en=Limburgan lif.en=Limbu lig.en=Ligbi lih.en=Lihir @@ -3920,20 +3918,14 @@ lii.en=Lingkhim lij.en=Ligurian lik.en=Lika lil.en=Lillooet -Limb.en=Limbu -Lina.en=Linear A -Linb.en=Linear B lio.en=Liki -lipaw.en=The Lipovaz dialect of Resian lip.en=Sekpele liq.en=Libido lir.en=Liberian English lis.en=Lisu -Lisu.en=Lisu liu.en=Logorik liv.en=Liv liw.en=Col -liw.en=Col lix.en=Liabuku liy.en=Banda-Bambari liz.en=Libinza @@ -3973,7 +3965,6 @@ llo.en=Khlor llp.en=North Efate llq.en=Lolak lls.en=Lithuanian Sign Language -lls.en=Lithuanian Sign Language llu.en=Lau llx.en=Lauan lma.en=East Limba @@ -4003,8 +3994,6 @@ lmz.en=Lumbee lna.en=Langbashe lnb.en=Mbalanhu lnd.en=Lundayeh -ln.en=Lingala -ln=Lingála lng.en=Langobardic lnh.en=Lanoh lni.en=Daantanai' @@ -4020,8 +4009,6 @@ loa.en=Loloda lob.en=Lobi loc.en=Inonhan loe.en=Saluan -lo.en=Lao -lo=ພາສາລາວ lof.en=Logol log.en=Logo loh.en=Narim @@ -4066,23 +4053,16 @@ lsa.en=Lasgerdi lsd.en=Lishana Deni lse.en=Lusengo lsg.en=Lyons Sign Language -lsg.en=Lyons Sign Language lsh.en=Lish lsi.en=Lashi lsl.en=Latvian Sign Language -lsl.en=Latvian Sign Language lsm.en=Saamia lso.en=Laos Sign Language -lso.en=Laos Sign Language -lsp.en=Panamanian Sign Language lsp.en=Panamanian Sign Language lsr.en=Aruop lss.en=Lasi lst.en=Trinidad and Tobago Sign Language -lst.en=Trinidad and Tobago Sign Language ltc.en=Late Middle Chinese -lt.en=Lithuanian -lt=Lietuvių lti.en=Leti (Indonesia) ltn.en=Latundê lto.en=Tsotso @@ -4092,7 +4072,6 @@ lua.en=Luba-Lulua luc.en=Aringa lud.en=Ludian lue.en=Luvale -lu.en=Luba-Katanga luf.en=Laua lui.en=Luiseno luj.en=Luna @@ -4112,8 +4091,6 @@ luw.en=Luo (Cameroon) luy.en=Luyia luz.en=Southern Luri lva.en=Maku'a -lv.en=Latvian -lv=LatvieÅ¡u lvk.en=Lavukaleve lvu.en=Levuka lwa.en=Lwalu @@ -4126,12 +4103,9 @@ lwo.en=Luwo lwt.en=Lewotobi lww.en=Lewo lya.en=Layakha -Lyci.en=Lycian -Lydi.en=Lydian lyg.en=Lyngngam lyn.en=Luyana lzh.en=Literary Chinese -lzh.en=Literary Chinese lzl.en=Litzlitz lzn.en=Leinong Naga lzz.en=Laz @@ -4145,9 +4119,7 @@ mai.en=Maithili maj.en=Jalapa De Díaz Mazatec mak.en=Makasar mam.en=Mam -Mand.en=Mandaic man.en=Mandingo -Mani.en=Manichaean map.en=Austronesian languages maq.en=Chiquihuitlán Mazatec mas.en=Masai @@ -4156,8 +4128,6 @@ mau.en=Huautla Mazatec mav.en=Sateré-Mawé maw.en=Mampruli max.en=North Moluccan Malay -max.en=North Moluccan Malay -Maya.en=Mayan hieroglyphs maz.en=Central Mazahua mba.en=Higaonon mbb.en=Western Bukidnon Manobo @@ -4222,7 +4192,6 @@ mdi.en=Mamvu mdj.en=Mangbetu mdk.en=Mangbutu mdl.en=Maltese Sign Language -mdl.en=Maltese Sign Language mdm.en=Mayogo mdn.en=Mbati mdp.en=Mbala @@ -4251,11 +4220,9 @@ mel.en=Central Melanau mem.en=Mangala men.en=Mende (Sierra Leone) meo.en=Kedah Malay -meo.en=Kedah Malay mep.en=Miriwung meq.en=Merey mer.en=Meru -Mero.en=Meroitic mes.en=Masmaje met.en=Mato meu.en=Motu @@ -4264,8 +4231,6 @@ mew.en=Maaka mey.en=Hassaniyya mez.en=Menominee mfa.en=Pattani Malay -mfa.en=Pattani Malay -mfb.en=Bangka mfb.en=Bangka mfc.en=Mba mfd.en=Mendankwe-Nkwen @@ -4284,7 +4249,6 @@ mfp.en=Makassar Malay mfq.en=Moba mfr.en=Marithiel mfs.en=Mexican Sign Language -mfs.en=Mexican Sign Language mft.en=Mokerang mfu.en=Mbwela mfv.en=Mandjak @@ -4297,7 +4261,6 @@ mgb.en=Mararit mgc.en=Morokodo mgd.en=Moru mge.en=Mango -mg.en=Malagasy mgf.en=Maklew mgg.en=Mpongmpong mgh.en=Makhuwa-Meetto @@ -4324,8 +4287,6 @@ mhb.en=Mahongwe mhc.en=Mocho mhd.en=Mbugu mhe.en=Besisi -mh.en=Marshallese -mh=Kajin M̧ajeļ mhf.en=Mamaa mhg.en=Margu mhh.en=Maskoy Pidgin @@ -4351,8 +4312,6 @@ mib.en=Atatláhuca Mixtec mic.en=Mi'kmaq mid.en=Mandaic mie.en=Ocotepec Mixtec -mi.en=Maori -mi=MÄori mif.en=Mofu-Gudur mig.en=San Miguel El Grande Mixtec mih.en=Chayuco Mixtec @@ -4362,7 +4321,6 @@ mik.en=Mikasuki mil.en=Peñoles Mixtec mim.en=Alacatlatzala Mixtec min.en=Minangkabau -min.en=Minangkabau mio.en=Pinotepa Nacional Mixtec mip.en=Apasco-Apoala Mixtec miq.en=Mískito @@ -4402,8 +4360,6 @@ mka.en=Mbre mkb.en=Mal Paharia mkc.en=Siliput mke.en=Mawchi -mk.en=Macedonian -mk=МакедонÑки mkf.en=Miya mkg.en=Mak (China) mkh.en=Mon-Khmer languages @@ -4430,8 +4386,6 @@ mlb.en=Mbule mlc.en=Cao Lan mld.en=Malakhel mle.en=Manambu -ml.en=Malayalam -ml=മലയാളം mlf.en=Mal mlh.en=Mape mli.en=Malimpung @@ -4449,7 +4403,6 @@ mlu.en=To'abaita mlv.en=Motlav mlw.en=Moloko mlx.en=Malfaxal -Mlym.en=Malayalam mlz.en=Malaynon mma.en=Mama mmb.en=Momina @@ -4481,8 +4434,6 @@ mnb.en=Muna mnc.en=Manchu mnd.en=Mondé mne.en=Naba -mn.en=Mongolian -mn=Монгол mnf.en=Mundani mng.en=Eastern Mnong mnh.en=Mono (Democratic Republic of Congo) @@ -4494,7 +4445,6 @@ mnm.en=Mapena mnn.en=Southern Mnong mno.en=Manobo languages mnp.en=Min Bei Chinese -mnp.en=Min Bei Chinese mnq.en=Minriq mnr.en=Mono (USA) mns.en=Mansi @@ -4509,7 +4459,6 @@ moa.en=Mwan moc.en=Mocoví mod.en=Mobilian moe.en=Montagnais -mo.en=Moldavian mof.en=Mohegan-Montauk-Narragansett mog.en=Mongondow moh.en=Mohawk @@ -4517,10 +4466,7 @@ moi.en=Mboi moj.en=Monzombo mok.en=Morori mom.en=Monimbo -Mong.en=Mongolian -monoton.en=Monotonic Greek moo.en=Monom -Moon.en=Moon mop.en=Mopán Maya moq.en=Mor (Bomberai Peninsula) mor.en=Moro @@ -4563,7 +4509,6 @@ mqc.en=Mangole mqe.en=Matepi mqf.en=Momuna mqg.en=Kota Bangun Kutai Malay -mqg.en=Kota Bangun Kutai Malay mqh.en=Tlazoyaltepec Mixtec mqi.en=Mariri mqj.en=Mamasa @@ -4588,9 +4533,6 @@ mrb.en=Marino mrc.en=Maricopa mrd.en=Western Magar mre.en=Martha's Vineyard Sign Language -mre.en=Martha's Vineyard Sign Language -mr.en=Marathi -mr=मराठी mrf.en=Elseng mrg.en=Miri mrh.en=Mara Chin @@ -4614,15 +4556,11 @@ mrz.en=Marind msb.en=Masbatenyo msc.en=Sankaran Maninka msd.en=Yucatec Maya Sign Language -msd.en=Yucatec Maya Sign Language mse.en=Musey -ms.en=Malay (macrolanguage) -ms=Bahasa Melayu msf.en=Mekwei msg.en=Moraid msh.en=Masikoro Malagasy msi.en=Sabah Malay -msi.en=Sabah Malay msj.en=Ma (Democratic Republic of Congo) msk.en=Mansaka msl.en=Molof @@ -4632,7 +4570,6 @@ mso.en=Mombum msp.en=Maritsauá msq.en=Caac msr.en=Mongolian Sign Language -msr.en=Mongolian Sign Language mss.en=West Masela mst.en=Cataelano Mandaya msu.en=Musom @@ -4646,9 +4583,6 @@ mtb.en=Anyin Morofo mtc.en=Munit mtd.en=Mualang mte.en=Mono (Solomon Islands) -Mtei.en=Meitei Mayek -mt.en=Maltese -mt=Malti mtf.en=Murik (Papua New Guinea) mtg.en=Una mth.en=Munggui @@ -4677,7 +4611,6 @@ mue.en=Media Lengua mug.en=Musgu muh.en=Mündü mui.en=Musi -mui.en=Musi muj.en=Mabire muk.en=Mugom mul.en=Multiple languages @@ -4774,8 +4707,6 @@ myb.en=Mbay myc.en=Mayeka myd.en=Maramba mye.en=Myene -my.en=Burmese -my=မြန်မာစ myf.en=Bambassi myg.en=Manta myh.en=Makah @@ -4784,7 +4715,6 @@ myj.en=Mangayat myk.en=Mamara Senoufo myl.en=Moma mym.en=Me'en -Mymr.en=Myanmar myn.en=Mayan languages myo.en=Anfillo myp.en=Pirahã @@ -4801,11 +4731,9 @@ myz.en=Classical Mandaic mza.en=Santa María Zacatepec Mixtec mzb.en=Tumzabt mzc.en=Madagascar Sign Language -mzc.en=Madagascar Sign Language mzd.en=Malimba mze.en=Morawa mzg.en=Monastic Sign Language -mzg.en=Monastic Sign Language mzh.en=Wichí Lhamtés Güisnay mzi.en=Ixcatlán Mazatec mzj.en=Manya @@ -4824,15 +4752,12 @@ mzv.en=Manza mzw.en=Deg mzx.en=Mawayana mzy.en=Mozambican Sign Language -mzy.en=Mozambican Sign Language mzz.en=Maiadomu naa.en=Namla nab.en=Southern Nambikuára nac.en=Narak nad.en=Nijadali nae.en=Naka'ela -na.en=Nauru -na=Dorerin Naoero naf.en=Nabak nag.en=Naga Pidgin nah.en=Nahuatl languages @@ -4842,7 +4767,6 @@ nak.en=Nakanai nal.en=Nalik nam.en=Nangikurrunggurr nan.en=Min Nan Chinese -nan.en=Min Nan Chinese nao.en=Naaba nap.en=Neapolitan naq.en=Nama (Namibia) @@ -4858,8 +4782,6 @@ nbb.en=Ndoe nbc.en=Chang Naga nbd.en=Ngbinda nbe.en=Konyak Naga -nb.en=Norwegian BokmÃ¥l -nb=BokmÃ¥l nbf.en=Naxi nbg.en=Nagarchal nbh.en=Ngamo @@ -4873,7 +4795,6 @@ nbp.en=Nnam nbq.en=Nggem nbr.en=Numana-Nunku-Gbantu-Numbu nbs.en=Namibian Sign Language -nbs.en=Namibian Sign Language nbt.en=Na nbu.en=Rongmei Naga nbv.en=Ngamambo @@ -4898,7 +4819,6 @@ nco.en=Sibe ncp.en=Ndaktup ncr.en=Ncane ncs.en=Nicaraguan Sign Language -ncs.en=Nicaraguan Sign Language nct.en=Chothe Naga ncu.en=Chumburung ncx.en=Central Puebla Nahuatl @@ -4907,8 +4827,6 @@ nda.en=Ndasa ndb.en=Kenswei Nsei ndc.en=Ndau ndd.en=Nde-Nsele-Nta -nd.en=North Ndebele -nd=Sindebele ndf.en=Nadruvian ndg.en=Ndengereko ndh.en=Ndali @@ -4929,16 +4847,12 @@ ndv.en=Ndut ndw.en=Ndobo ndx.en=Nduga ndy.en=Lutos -ndyuka.en=Ndyuka dialect ndz.en=Ndogo nea.en=Eastern Ngad'a neb.en=Toura (Côte d'Ivoire) nec.en=Nedebang ned.en=Nde-Gbite -nedis.en=Natisone dialect nee.en=Kumak -ne.en=Nepali -ne=नेपाली nef.en=Nefamese neg.en=Negidal neh.en=Nyenkha @@ -4967,8 +4881,6 @@ ngb.en=Northern Ngbandi ngc.en=Ngombe (Democratic Republic of Congo) ngd.en=Ngando (Central African Republic) nge.en=Ngemba -ng.en=Ndonga -ng=Owambo ngf.en=Trans-New Guinea languages ngg.en=Ngbaka Manza ngh.en=N/u @@ -5043,7 +4955,6 @@ njb.en=Nocte Naga njd.en=Ndonde Hamba njh.en=Lotha Naga nji.en=Gudanji -njiva.en=The Gniva dialect of Resian njj.en=Njen njl.en=Njalgulgule njm.en=Angami Naga @@ -5061,7 +4972,6 @@ nkc.en=Nkongho nkd.en=Koireng nke.en=Duke nkf.en=Inpui Naga -Nkgb.en=Nakhi Geba nkg.en=Nekgini nkh.en=Khezha Naga nki.en=Thangal Naga @@ -5070,7 +4980,6 @@ nkk.en=Nokuku nkm.en=Namat nkn.en=Nkangala nko.en=Nkonya -Nkoo.en=N’Ko nkp.en=Niuatoputapu nkr.en=Nukuoro nks.en=North Asmat @@ -5083,8 +4992,6 @@ nkz.en=Nkari nla.en=Ngombale nlc.en=Nalca nle.en=East Nyala -nl.en=Dutch -nl=Nederlands nlg.en=Gela nli.en=Grangali nlj.en=Nyali @@ -5129,8 +5036,6 @@ nnb.en=Nande nnc.en=Nancere nnd.en=West Ambae nne.en=Ngandyera -nn.en=Norwegian Nynorsk -nn=Nynorsk nnf.en=Ngaing nng.en=Maring Naga nnh.en=Ngiemboon @@ -5155,8 +5060,6 @@ noa.en=Woun Meu noc.en=Nuk nod.en=Northern Thai noe.en=Nimadi -no.en=Norwegian -no=Norsk nof.en=Nomane nog.en=Nogai noh.en=Nomu @@ -5192,8 +5095,6 @@ nra.en=Ngom nrb.en=Nara nrc.en=Noric nre.en=Southern Rengma Naga -nr.en=South Ndebele -nr=Nrebele nrg.en=Narango nri.en=Chokri Naga nrl.en=Ngarluma @@ -5211,18 +5112,14 @@ nse.en=Nsenga nsg.en=Ngasa nsh.en=Ngoshie nsi.en=Nigerian Sign Language -nsi.en=Nigerian Sign Language nsk.en=Naskapi nsl.en=Norwegian Sign Language -nsl.en=Norwegian Sign Language nsm.en=Sumi Naga nsn.en=Nehan nso.en=Pedi nsp.en=Nepalese Sign Language -nsp.en=Nepalese Sign Language nsq.en=Northern Sierra Miwok nsr.en=Maritime Sign Language -nsr.en=Maritime Sign Language nss.en=Nali nst.en=Tase Naga nsu.en=Sierra Negra Nahuatl @@ -5269,8 +5166,6 @@ nuw.en=Nguluwan nux.en=Mehek nuy.en=Nunggubuyu nuz.en=Tlamacazapa Nahuatl -nv.en=Navajo -nv=Diné bizaad nvh.en=Nasarian nvm.en=Namiae nwa.en=Nawathinehena @@ -5297,8 +5192,6 @@ nyb.en=Nyangbo nyc.en=Nyanga-li nyd.en=Nyore nye.en=Nyengo -ny.en=Nyanja -ny=Chicheŵa nyf.en=Giryama nyg.en=Nyindu nyh.en=Nyigina @@ -5325,7 +5218,6 @@ nzi.en=Nzima nzk.en=Nzakara nzm.en=Zeme Naga nzs.en=New Zealand Sign Language -nzs.en=New Zealand Sign Language nzu.en=Teke-Nzikou nzy.en=Nzakambay oaa.en=Orok @@ -5340,7 +5232,6 @@ obr.en=Old Burmese obt.en=Old Breton obu.en=Obulom oca.en=Ocaina -oc.en=Occitan (post 1500) och.en=Old Chinese oco.en=Old Cornish ocu.en=Atzingo Matlatzinca @@ -5351,7 +5242,6 @@ odu.en=Odual ofo.en=Ofo ofs.en=Old Frisian ofu.en=Efutop -Ogam.en=Ogham ogb.en=Ogbia ogc.en=Ogbah oge.en=Old Georgian @@ -5364,7 +5254,6 @@ oia.en=Oirata oin.en=Inebu One ojb.en=Northwestern Ojibwa ojc.en=Central Ojibwa -oj.en=Ojibwa ojg.en=Eastern Ojibwa ojp.en=Old Japanese ojs.en=Severn Ojibwa @@ -5379,7 +5268,6 @@ oki.en=Okiek okj.en=Oko-Juwoi okk.en=Kwamtim One okl.en=Old Kentish Sign Language -okl.en=Old Kentish Sign Language okm.en=Middle Korean (10th-16th cent.) okn.en=Oki-No-Erabu oko.en=Old Korean (3rd-9th cent.) @@ -5389,7 +5277,6 @@ oku.en=Oku okv.en=Orokaiva okx.en=Okpe (Northwestern Edo) ola.en=Walungge -Olck.en=Ol Chiki old.en=Mochi ole.en=Olekha olm.en=Oloma @@ -5399,7 +5286,6 @@ oma.en=Omaha-Ponca omb.en=East Ambae omc.en=Mochica ome.en=Omejes -om.en=Oromo omg.en=Omagua omi.en=Omi omk.en=Omok @@ -5444,32 +5330,22 @@ opy.en=Ofayé ora.en=Oroha orc.en=Orma ore.en=Orejón -or.en=Oriya -or=ଓଡ଼ିଆ org.en=Oring orh.en=Oroqen -Orkh.en=Old Turkic -orn.en=Orang Kanaq orn.en=Orang Kanaq oro.en=Orokolo orr.en=Oruma ors.en=Orang Seletar -ors.en=Orang Seletar ort.en=Adivasi Oriya oru.en=Ormuri orv.en=Old Russian orw.en=Oro Win orx.en=Oro -Orya.en=Oriya orz.en=Ormu osa.en=Osage osc.en=Oscan -os.en=Ossetian -os=Иронау osi.en=Osing -Osma.en=Osmanya oso.en=Ososo -osojs.en=The Oseacco dialect of Resian osp.en=Old Spanish ost.en=Osatu osu.en=Southern One @@ -5507,22 +5383,16 @@ oym.en=Wayampi oyy.en=Oya'oya ozm.en=Koonzime paa.en=Papuan languages -pa-Arab=پنجابی pab.en=Parecís pac.en=Pacoh pad.en=Paumarí -pa-Deva=पंजाबी pae.en=Pagibete -pa.en=Panjabi -pa=ਪੰਜਾਬੀ / پنجابی / पंजाबी paf.en=Paranawát pag.en=Pangasinan -pa-Guru=ਪੰਜਾਬੀ pah.en=Tenharim pai.en=Pe pak.en=Parakanã pal.en=Pahlavi -pamaka.en=Pamaka dialect pam.en=Pampanga pao.en=Northern Paiute pap.en=Papiamento @@ -5589,12 +5459,10 @@ pei.en=Chichimeca-Jonaz pej.en=Northern Pomo pek.en=Penchal pel.en=Pekal -pel.en=Pekal pem.en=Phende peo.en=Old Persian (ca. 600-400 B.C.) pep.en=Kunja peq.en=Southern Pomo -Perm.en=Old Permic pes.en=Western Farsi pev.en=Pémono pex.en=Petats @@ -5604,7 +5472,6 @@ pfa.en=Pááfang pfe.en=Peere pfl.en=Pfaelzisch pga.en=Sudanese Creole Arabic -pga.en=Sudanese Creole Arabic pgg.en=Pangwali pgi.en=Pagi pgk.en=Rerep @@ -5613,19 +5480,14 @@ pgs.en=Pangseng pgu.en=Pagu pgy.en=Pongyong pha.en=Pa-Hng -Phag.en=Phags-pa phd.en=Phudagi phg.en=Phuong phh.en=Phukha phi.en=Philippine languages phk.en=Phake phl.en=Phalura -Phli.en=Inscriptional Pahlavi -Phlp.en=Psalter Pahlavi -Phlv.en=Book Pahlavi phm.en=Phimbi phn.en=Phoenician -Phnx.en=Phoenician pho.en=Phunoi phq.en=Phana' phr.en=Pahari-Potwari @@ -5638,8 +5500,6 @@ pib.en=Yine pic.en=Pinji pid.en=Piaroa pie.en=Piro -pi.en=Pali -pi=पािऴ pif.en=Pingelapese pig.en=Pisabo pih.en=Pitcairn-Norfolk @@ -5648,7 +5508,6 @@ pij.en=Pijao pil.en=Yom pim.en=Powhatan pin.en=Piame -pinyin.en=Pinyin romanization pio.en=Piapoco pip.en=Pero pir.en=Piratapuyo @@ -5671,7 +5530,6 @@ pko.en=Pökoot pkp.en=Pukapuka pkr.en=Attapady Kurumba pks.en=Pakistan Sign Language -pks.en=Pakistan Sign Language pkt.en=Maleng pku.en=Paku pla.en=Miani @@ -5679,8 +5537,6 @@ plb.en=Polonombauk plc.en=Central Palawano pld.en=Polari ple.en=Palu'e -pl.en=Polish -pl=Polszczyzna plf.en=Central Malayo-Polynesian languages plg.en=Pilagá plh.en=Paulohi @@ -5691,7 +5547,6 @@ pln.en=Palenquero plo.en=Oluta Popoluca plp.en=Palpa plq.en=Palaic -Plrd.en=Miao plr.en=Palaka Senoufo pls.en=San Marcos Tlalcoyalco Popoloca plt.en=Plateau Malagasy @@ -5751,7 +5606,6 @@ pog.en=Potiguára poh.en=Poqomchi' poi.en=Highland Popoluca pok.en=Pokangá -polyton.en=Polytonic Greek pom.en=Southeastern Pomo pon.en=Pohnpeian poo.en=Central Pomo @@ -5793,7 +5647,6 @@ prh.en=Porohanon pri.en=Paicî prk.en=Parauk prl.en=Peruvian Sign Language -prl.en=Peruvian Sign Language prm.en=Kibiri prn.en=Prasuni pro.en=Old Provençal (to 1500) @@ -5803,46 +5656,31 @@ prr.en=Puri prs.en=Dari prs=دری prt.en=Phai -Prti.en=Inscriptional Parthian pru.en=Puragi prw.en=Parawen prx.en=Purik pry.en=Pray 3 prz.en=Providencia Sign Language -prz.en=Providencia Sign Language psa.en=Asue Awyu psc.en=Persian Sign Language -psc.en=Persian Sign Language -psd.en=Plains Indian Sign Language psd.en=Plains Indian Sign Language pse.en=Central Malay -pse.en=Central Malay -ps.en=Pushto -ps=پښتو -psg.en=Penang Sign Language psg.en=Penang Sign Language psh.en=Southwest Pashayi psi.en=Southeast Pashayi psl.en=Puerto Rican Sign Language -psl.en=Puerto Rican Sign Language psm.en=Pauserna psn.en=Panasuan pso.en=Polish Sign Language -pso.en=Polish Sign Language -psp.en=Philippine Sign Language psp.en=Philippine Sign Language psq.en=Pasi psr.en=Portuguese Sign Language -psr.en=Portuguese Sign Language pss.en=Kaulong pst.en=Central Pashto psu.en=Sauraseni PrÄkrit psw.en=Port Sandwich psy.en=Piscataway pta.en=Pai Tavytera -pt-BR=Português Brasileiro -pt.en=Portuguese -pt=Português pth.en=Pataxó Hã-Ha-Hãe pti.en=Pintiini ptn.en=Patani @@ -5896,7 +5734,6 @@ qub.en=Huallaga Huánuco Quechua quc.en=K'iche' quc=Qatzijob'al qud.en=Calderón Highland Quichua -qu.en=Quechua quf.en=Lambayeque Quechua qug.en=Chimborazo Highland Quichua quh.en=South Bolivian Quechua @@ -6012,7 +5849,6 @@ rit.en=Ritarungo riu.en=Riung rjg.en=Rajong rji.en=Raji -Rjng.en=Rejang rjs.en=Rajbanshi rka.en=Kraol rkb.en=Rikbaktsa @@ -6025,8 +5861,6 @@ rmb.en=Rembarunga rmc.en=Carpathian Romani rmd.en=Traveller Danish rme.en=Angloromani -rm.en=Romansh -rm=Rumantsch rmf.en=Kalo Finnish Romani rmg.en=Traveller Norwegian rmh.en=Murkim @@ -6039,7 +5873,6 @@ rmo.en=Sinte Romani rmp.en=Rempi rmr.en=Caló rms.en=Romanian Sign Language -rms.en=Romanian Sign Language rmt.en=Domari rmu.en=Tavringer Romani rmv.en=Romanova @@ -6049,8 +5882,6 @@ rmy.en=Vlax Romani rmz.en=Marma rna.en=Runa rnd.en=Ruund -rn.en=Rundi -rn=Kirundi rng.en=Ronga rnl.en=Ranglong rnn.en=Roon @@ -6061,8 +5892,6 @@ rob.en=Tae' roc.en=Cacgia Roglai rod.en=Rogo roe.en=Ronji -ro.en=Romanian -ro=Română rof.en=Rombo rog.en=Northern Roglai rol.en=Romblomanon @@ -6070,18 +5899,14 @@ rom.en=Romany roo.en=Rotokas rop.en=Kriol ror.en=Rongga -Roro.en=Rongorongo rou.en=Runga row.en=Dela-Oenale -rozaj.en=Resian rpn.en=Repanbitip rpt.en=Rapting rri.en=Ririo rro.en=Waima rsb.en=Romano-Serbian rsi.en=Rennellese Sign Language -rsi.en=Rennellese Sign Language -rsl.en=Russian Sign Language rsl.en=Russian Sign Language rth.en=Ratahan rtm.en=Rotuman @@ -6089,14 +5914,11 @@ rtw.en=Rathawi rub.en=Gungu ruc.en=Ruuli rue.en=Rusyn -ru.en=Russian -ru=РуÑÑкий ruf.en=Luguru rug.en=Roviana ruh.en=Ruga rui.en=Rufiji ruk.en=Che -Runr.en=Runic ruo.en=Istro Romanian rup.en=Macedo-Romanian ruq.en=Megleno Romanian @@ -6105,7 +5927,6 @@ ruu.en=Lanas Lobu ruy.en=Mala (Nigeria) ruz.en=Ruma rwa.en=Rawo -rw.en=Kinyarwanda rwk.en=Rwa rwm.en=Amba (Uganda) rwo.en=Rawa @@ -6119,8 +5940,6 @@ sac.en=Meskwaki sad.en=Sandawe sae.en=Sabanê sae=Sabanês -sa.en=Sanskrit -sa=संसà¥à¤•à¥ƒà¤¤à¤®à¥ saf.en=Safaliba sah.en=Yakut sai.en=South American Indian languages @@ -6128,17 +5947,13 @@ saj.en=Sahu sak.en=Sake sal.en=Salishan languages sam.en=Samaritan Aramaic -Samr.en=Samaritan sao.en=Sause sap.en=Sanapaná saq.en=Samburu -Sara.en=Sarati -Sarb.en=Old South Arabian sar.en=Saraveca sas.en=Sasak sat.en=Santali sau.en=Saleman -Saur.en=Saurashtra sav.en=Saafi-Saafi saw.en=Sawi sax.en=Sa @@ -6173,8 +5988,6 @@ sbz.en=Sara Kaba sca.en=Sansu scb.en=Chut sce.en=Dongxiang -sc.en=Sardinian -sc=Sardu scf.en=San Miguel Creole French scg.en=Sanggau sch.en=Sakachep @@ -6183,8 +5996,6 @@ sck.en=Sadri scl.en=Shina scn.en=Sicilian sco.en=Scots -scotland.en=Scottish Standard English -scouse.en=Scouse scp.en=Helambu Sherpa scq.en=Sa'och scs.en=North Slavey @@ -6196,15 +6007,12 @@ sda.en=Toraja-Sa'dan sdb.en=Shabak sdc.en=Sassarese Sardinian sde.en=Surubu -sd.en=Sindhi -sd=سنڌي sdf.en=Sarli sdg.en=Savi sdh.en=Southern Kurdish sdj.en=Suundi sdk.en=Sos Kundi sdl.en=Saudi Arabian Sign Language -sdl.en=Saudi Arabian Sign Language sdm.en=Semandang sdn.en=Gallurese Sardinian sdo.en=Bukar-Sadung Bidayuh @@ -6221,8 +6029,6 @@ seb.en=Shempire Senoufo sec.en=Sechelt sed.en=Sedang see.en=Seneca -se.en=Northern Sami -se=Sámegiella sef.en=Cebaara Senoufo seg.en=Segeju seh.en=Sena @@ -6244,18 +6050,13 @@ sew.en=Sewa Bay sey.en=Secoya sez.en=Senthang Chin sfb.en=Langue des signes de Belgique Francophone -sfb.en=Langue des signes de Belgique Francophone sfm.en=Small Flowery Miao sfs.en=South African Sign Language -sfs.en=South African Sign Language sfw.en=Sehwi sga.en=Old Irish (to 900) sgb.en=Mag-Anchi Ayta sgc.en=Kipsigis sge.en=Segai -sg.en=Sango -sg=Sängö -sgg.en=Swiss-German Sign Language sgg.en=Swiss-German Sign Language sgh.en=Shughni sgi.en=Suga @@ -6263,7 +6064,6 @@ sgk.en=Sangkong sgl.en=Sanglechi-Ishkashimi sgm.en=Singa sgn.en=Sign languages -Sgnw.en=SignWriting sgo.en=Songa sgp.en=Singpho sgr.en=Sangisari @@ -6271,14 +6071,11 @@ sgt.en=Brokpake sgu.en=Salas sgw.en=Sebat Bet Gurage sgx.en=Sierra Leone Sign Language -sgx.en=Sierra Leone Sign Language sgz.en=Sursurunga sha.en=Shall-Zwall -Shaw.en=Shavian shb.en=Ninam shc.en=Sonde she.en=Sheko -sh.en=Serbo-Croatian shg.en=Shua shh.en=Shoshoni shi.en=Tachelhit @@ -6294,7 +6091,6 @@ shr.en=Shi shs.en=Shuswap sht.en=Shasta shu.en=Chadian Arabic -shu.en=Chadian Arabic shv.en=Shehri shw.en=Shwai shx.en=She @@ -6304,8 +6100,6 @@ sia.en=Akkala Sami sib.en=Sebop sid.en=Sidamo sie.en=Simaa -si.en=Sinhala -si=සිංහල sif.en=Siamou sig.en=Paasaal sih.en=Zire @@ -6314,7 +6108,6 @@ sij.en=Numbami sik.en=Sikiana sil.en=Tumulung Sisaala sim.en=Mende (Papua New Guinea) -Sinh.en=Sinhala sio.en=Siouan languages sip.en=Sikkimese siq.en=Sonia @@ -6348,8 +6141,6 @@ skb.en=Saek skc.en=Sauk skd.en=Southern Sierra Miwok ske.en=Seke (Vanuatu) -sk.en=Slovak -sk=SlovenÄina skf.en=Sakirabiá skg.en=Sakalava Malagasy skh.en=Sikule @@ -6374,9 +6165,6 @@ sla.en=Slavic languages slc.en=Sáliba sld.en=Sissala sle.en=Sholaga -sl.en=Slovenian -sl=SlovenÅ¡Äina -slf.en=Swiss-Italian Sign Language slf.en=Swiss-Italian Sign Language slg.en=Selungai Murut slh.en=Southern Puget Sound Salish @@ -6389,7 +6177,6 @@ slp.en=Lamaholot slq.en=Salchuq slr.en=Salar sls.en=Singapore Sign Language -sls.en=Singapore Sign Language slt.en=Sila slu.en=Selaru slw.en=Sialum @@ -6400,8 +6187,6 @@ sma.en=Southern Sami smb.en=Simbari smc.en=Som smd.en=Sama -sm.en=Samoan -sm=Gagana Samoa smf.en=Auwe smg.en=Simbali smh.en=Samei @@ -6425,8 +6210,6 @@ smz.en=Simeku snb.en=Sebuyau snc.en=Sinaugoro sne.en=Bau Bidayuh -sn.en=Shona -sn=chiShona snf.en=Noon sng.en=Sanga (Democratic Republic of Congo) snh.en=Shinabo @@ -6452,14 +6235,11 @@ sob.en=Sobei soc.en=So (Democratic Republic of Congo) sod.en=Songoora soe.en=Songomeno -so.en=Somali -so=Soomaaliga sog.en=Sogdian soh.en=Aka soi.en=Sonha soj.en=Soi sok.en=Sokoro -solba.en=The Stolvizza dialect of Resian sol.en=Solos son.en=Songhai languages soo.en=Songo @@ -6492,8 +6272,6 @@ spu.en=Sapuan spx.en=South Picene spy.en=Sabaot sqa.en=Shama-Sambuga -sq.en=Albanian -sq=Shqip sqh.en=Shau sqj.en=Albanian languages sqm.en=Suma @@ -6502,22 +6280,17 @@ sqo.en=Sorkhei sqq.en=Sou sqr.en=Siculo Arabic sqs.en=Sri Lankan Sign Language -sqs.en=Sri Lankan Sign Language sqt.en=Soqotri squ.en=Squamish sra.en=Saruga srb.en=Sora src.en=Logudorese Sardinian -sr-Cyrl=СрпÑки sre.en=Sara -sr.en=Serbian -sr=СрпÑки / Srpski srf.en=Nafi srg.en=Sulod srh.en=Sarikoli sri.en=Siriano srk.en=Serudung Murut -sr-Latn=Srpski srl.en=Isirawa srm.en=Saramaccan srn.en=Sranan Tongo @@ -6538,12 +6311,9 @@ ssb.en=Southern Sama ssc.en=Suba-Simbiti ssd.en=Siroi sse.en=Balangingi -ss.en=Swati -ss=SiSwati ssf.en=Thao ssg.en=Seimat ssh.en=Shihhi Arabic -ssh.en=Shihhi Arabic ssi.en=Sansi ssj.en=Sausi ssk.en=Sunam @@ -6552,10 +6322,8 @@ ssm.en=Semnam ssn.en=Waata sso.en=Sissano ssp.en=Spanish Sign Language -ssp.en=Spanish Sign Language ssq.en=So'a ssr.en=Swiss-French Sign Language -ssr.en=Swiss-French Sign Language sss.en=Sô sst.en=Sinasina ssu.en=Susuami @@ -6567,8 +6335,6 @@ sta.en=Settla stb.en=Northern Subanen std.en=Sentinel ste.en=Liana-Seti -st.en=Southern Sotho -st=Sesotho stf.en=Seta stg.en=Trieng sth.en=Shelta @@ -6591,15 +6357,12 @@ sua.en=Sulka sub.en=Suku suc.en=Western Subanon sue.en=Suena -su.en=Sundanese -su=Basa Sunda sug.en=Suganga sui.en=Suki suj.en=Shubi suk.en=Sukuma sul.en=Surigaonon sum.en=Sumo-Mayangna -Sund.en=Sundanese suq.en=Suri sur.en=Mwaghavul sus.en=Susu @@ -6613,28 +6376,20 @@ sva.en=Svan svb.en=Ulau-Suain svc.en=Vincentian Creole English sve.en=Serili -sv.en=Swedish -sv=Svenska -svk.en=Slovakian Sign Language svk.en=Slovakian Sign Language svr.en=Savara svs.en=Savosavo svx.en=Skalvian -swb.en=Maore Comorian swb=Comorian +swb.en=Maore Comorian swc.en=Congo Swahili -swc.en=Congo Swahili -sw.en=Swahili (macrolanguage) -sw=Kiswahili swf.en=Sere swg.en=Swabian swh.en=Swahili (individual language) -swh.en=Swahili (individual language) swi.en=Sui swj.en=Sira swk.en=Malawi Sena swl.en=Swedish Sign Language -swl.en=Swedish Sign Language swm.en=Samosa swn.en=Sawknah swo.en=Shanenawa @@ -6668,20 +6423,14 @@ syd.en=Samoyedic languages syi.en=Seki syk.en=Sukur syl.en=Sylheti -Sylo.en=Syloti Nagri sym.en=Maya Samo syn.en=Senaya syo.en=Suoy -Syrc.en=Syriac -Syre.en=Syriac (Estrangelo variant) -syr.en=Syriac syr=Ü Ü«Ü¢Ü Ü£Ü˜ÜªÜÜÜ -Syrj.en=Syriac (Western variant) -Syrn.en=Syriac (Eastern variant) +syr.en=Syriac sys.en=Sinyar syw.en=Kagate syy.en=Al-Sayyid Bedouin Sign Language -syy.en=Al-Sayyid Bedouin Sign Language sza.en=Semelai szb.en=Ngalum szc.en=Semaq Beri @@ -6698,28 +6447,20 @@ tab.en=Tabassaran tac.en=Lowland Tarahumara tad.en=Tause tae.en=Tariana -ta.en=Tamil -ta=தமிழ௠taf.en=Tapirapé -Tagb.en=Tagbanwa tag.en=Tagoi tai.en=Tai languages taj.en=Eastern Tamang tak.en=Tala -Tale.en=Tai Le tal.en=Tal -Talu.en=New Tai Lue -Taml.en=Tamil tan.en=Tangale tao.en=Yami tap.en=Taabwa taq.en=Tamasheq -tarask.en=Belarusian in Taraskievica orthography tar.en=Central Tarahumara tas.en=Tay Boi tau.en=Upper Tanana tav.en=Tatuyo -Tavt.en=Tai Viet taw.en=Tai tax.en=Tamki tay.en=Atayal @@ -6799,17 +6540,13 @@ teb.en=Tetete tec.en=Terik ted.en=Tepo Krumen tee.en=Huehuetla Tepehua -te.en=Telugu -te=తెలà±à°—à± tef.en=Teressa teg.en=Teke-Tege teh.en=Tehuelche tei.en=Torricelli tek.en=Ibali Teke -Telu.en=Telugu tem.en=Timne ten.en=Tama (Colombia) -Teng.en=Tengwar teo.en=Teso tep.en=Tepecano teq.en=Temein @@ -6823,25 +6560,18 @@ tex.en=Tennet tey.en=Tulishi tfi.en=Tofin Gbe tfn.en=Tanaina -Tfng.en=Tifinagh tfo.en=Tefaro tfr.en=Teribe tft.en=Ternate tga.en=Sagalla -tg-Arab=تاجیکی‎ tgb.en=Tobilung tgc.en=Tigak -tg-Cyrl=Тоҷикӣ tgd.en=Ciwogai tge.en=Eastern Gorkha Tamang -tg.en=Tajik -tg=Тоҷикӣ / TojikÄ« / تاجیکی‎ tgf.en=Chalikha tgg.en=Tangga tgh.en=Tobagonian Creole English tgi.en=Lawunuia -tg-Latn=tojikÄ« -Tglg.en=Tagalog tgo.en=Sudest tgp.en=Tangoa tgq.en=Tring @@ -6853,13 +6583,9 @@ tgv.en=Tingui-Boto tgw.en=Tagwana Senoufo tgx.en=Tagish tgy.en=Togoyo -Thaa.en=Thaana -Thai.en=Thai thc.en=Tai Hang Tong thd.en=Thayore the.en=Chitwania Tharu -th.en=Thai -th=ภาษาไทย thf.en=Thangmi thh.en=Northern Tarahumara thi.en=Tai Long @@ -6879,11 +6605,9 @@ thx.en=The thy.en=Tha thz.en=Tayart Tamajeq tia.en=Tidikelt Tamazight -Tibt.en=Tibetan tic.en=Tira tid.en=Tidong tie.en=Tingal -ti.en=Tigrinya tif.en=Tifal tig.en=Tigre tih.en=Timugon Murut @@ -6913,16 +6637,11 @@ tjo.en=Temacine Tamazight tjs.en=Southern Tujia tju.en=Tjurruru tka.en=Truká -tk-Arab=تورکمنچه tkb.en=Buksa -tk-Cyrl=Түркменче tkd.en=Tukudede tke.en=Takwane -tk.en=Turkmen -tk=Türkmençe / Түркменче / تورکمنچه tkf.en=Tukumanféd tkk.en=Takpa -tk-Latn=Türkmençe tkl.en=Tokelau tkm.en=Takelma tkn.en=Toku-No-Shima @@ -6939,8 +6658,6 @@ tla.en=Southwestern Tepehuan tlb.en=Tobelo tlc.en=Yecuatla Totonac tld.en=Talaud -tl.en=Tagalog -tl=Wikang Tagalog tlf.en=Telefol tlg.en=Tofanma tlh.en=Klingon @@ -6957,7 +6674,6 @@ tlq.en=Tai Loi tlr.en=Talise tls.en=Tambotalo tlt.en=Teluti -tl-Tglg=ᜆᜄᜎᜓᜄ tlu.en=Tulehu tlv.en=Taliabu tlw.en=South Wemale @@ -6986,7 +6702,6 @@ tmt.en=Tasmate tmu.en=Iau tmv.en=Tembo (Motembo) tmw.en=Temuan -tmw.en=Temuan tmy.en=Tami tmz.en=Tamanaku tna.en=Tacana @@ -6994,8 +6709,6 @@ tnb.en=Western Tunebo tnc.en=Tanimuca-Retuarã tnd.en=Angosturas Tunebo tne.en=Tinoc Kallahan -tn.en=Tswana -tn=Setswana tnf.en=Tangshewi tng.en=Tobanga tnh.en=Maiani @@ -7020,7 +6733,6 @@ tob.en=Toba toc.en=Coyutla Totonac tod.en=Toma toe.en=Tomedes -to.en=Tonga (Tonga Islands) tof.en=Gizrra tog.en=Tonga (Nyasa) toh.en=Gitonga @@ -7077,8 +6789,6 @@ trb.en=Terebu trc.en=Copala Triqui trd.en=Turi tre.en=East Tarangan -tr.en=Turkish -tr=Türkçe trf.en=Trinidadian Creole English trg.en=Lishán Didán trh.en=Turaka @@ -7105,9 +6815,6 @@ tsb.en=Tsamai tsc.en=Tswa tsd.en=Tsakonian tse.en=Tunisian Sign Language -tse.en=Tunisian Sign Language -ts.en=Tsonga -ts=Xitsonga tsf.en=Southwestern Tamang tsg.en=Tausug tsh.en=Tsuvan @@ -7116,35 +6823,27 @@ tsj.en=Tshangla tsk.en=Tseku tsl.en=Ts'ün-Lao tsm.en=Turkish Sign Language -tsm.en=Turkish Sign Language tsp.en=Northern Toussian tsq.en=Thai Sign Language -tsq.en=Thai Sign Language tsr.en=Akei tss.en=Taiwan Sign Language -tss.en=Taiwan Sign Language tsu.en=Tsou tsv.en=Tsogo tsw.en=Tsishingini tsx.en=Mubami tsy.en=Tebul Sign Language -tsy.en=Tebul Sign Language tsz.en=Purepecha tta.en=Tutelo ttb.en=Gaa ttc.en=Tektiteko -tt-Cyrl=Татарча ttd.en=Tauade tte.en=Bwanabwana -tt.en=Tatar -tt=Tatarça / Татарча ttf.en=Tuotomb ttg.en=Tutong tth.en=Upper Ta'oih tti.en=Tobati ttj.en=Tooro ttk.en=Totoro -tt-Latn=Tatarça ttl.en=Totela ttm.en=Northern Tutchone ttn.en=Towei @@ -7200,7 +6899,6 @@ twb.en=Western Tawbuid twc.en=Teshenawa twd.en=Twents twe.en=Tewa (Indonesia) -tw.en=Twi twf.en=Northern Tiwa twg.en=Tereweng twh.en=Tai Dón @@ -7235,8 +6933,6 @@ txx.en=Tatana txy.en=Tanosy Malagasy tya.en=Tauya tye.en=Kyenga -ty.en=Tahitian -ty=Reo MÄ'ohi tyh.en=O'du tyi.en=Teke-Tsaayi tyj.en=Tai Do @@ -7251,13 +6947,12 @@ tyv.en=Tuvinian tyx.en=Teke-Tyee tyz.en=Tày tza.en=Tanzanian Sign Language -tza.en=Tanzanian Sign Language tzh.en=Tzeltal tzj.en=Tz'utujil tzm.en=Central Atlas Tamazight tzn.en=Tugun -tzo.en=Tzotzil tzo=Bats'i k'op +tzo.en=Tzotzil tzx.en=Tabriak uam.en=Uamué uan.en=Kuan @@ -7267,8 +6962,6 @@ ubi.en=Ubi ubr.en=Ubir ubu.en=Umbu-Ungu uby.en=Ubykh -uccor.en=Unified Cornish orthography of Revived Cornish -ucrcor.en=Unified Cornish Revised orthography of Revived Cornish uda.en=Uda ude.en=Udihe udg.en=Muduga @@ -7280,35 +6973,23 @@ udu.en=Uduk ues.en=Kioko ufi.en=Ufim uga.en=Ugaritic -ug-Arab=ئۇيغۇرچە -Ugar.en=Ugaritic ugb.en=Kuku-Ugbanh -ug-Cyrl=Уйғурчә uge.en=Ughele -ug.en=Uighur -ug=Uyghurche‎ / ئۇيغۇرچە / Уйғурчә -ug-Latn=Uyghurche‎ -ugn.en=Ugandan Sign Language ugn.en=Ugandan Sign Language ugo.en=Ugong ugy.en=Uruguayan Sign Language -ugy.en=Uruguayan Sign Language uha.en=Uhami uhn.en=Damal uis.en=Uisai uiv.en=Iyive uji.en=Tanjijili uka.en=Kaburi -uk.en=Ukrainian -uk=УкраїнÑька ukg.en=Ukuriguma ukh.en=Ukhwejo ukl.en=Ukrainian Sign Language -ukl.en=Ukrainian Sign Language ukp.en=Ukpe-Bayobiri ukq.en=Ukwa uks.en=Urubú-Kaapor Sign Language -uks.en=Urubú-Kaapor Sign Language uku.en=Ukue ukw.en=Ukwuani-Aboh-Ndoni ula.en=Fungwa @@ -7348,20 +7029,15 @@ uok.en=Uokha upi.en=Umeda upv.en=Uripiv-Wala-Rano-Atchin ura.en=Urarina -ur-Arab=اردو urb.en=Urubú-Kaapor urc.en=Urningangg -ur-Deva=उरà¥à¤¦à¥‚ ure.en=Uru -ur.en=Urdu -ur=اردو / उरà¥à¤¦à¥‚ urf.en=Uradhi urg.en=Urigina urh.en=Urhobo uri.en=Urim urj.en=Uralic languages urk.en=Urak Lawoi' -urk.en=Urak Lawoi' url.en=Urali urm.en=Urapmin urn.en=Uruangnirin @@ -7395,23 +7071,15 @@ uvh.en=Uri uvl.en=Lote uwa.en=Kuku-Uwanh uya.en=Doko-Uyanga -uz-Cyrl=Ўзбек -uz.en=Uzbek -uz=O'zbek / Ўзбек -uz-Latn=O'zbek -uzn.en=Northern Uzbek uzn.en=Northern Uzbek uzs.en=Southern Uzbek -uzs.en=Southern Uzbek vaa.en=Vaagri Booli vae.en=Vale vaf.en=Vafsi vag.en=Vagla vah.en=Varhadi-Nagpuri vai.en=Vai -Vaii.en=Vai vaj.en=Vasekela Bushman -valencia.en=Valencian val.en=Vehes vam.en=Vanimo van.en=Valman @@ -7425,7 +7093,6 @@ vay.en=Wayu vbb.en=Southeast Babar vec.en=Venetian ved.en=Veddah -ve.en=Venda vel.en=Veluws vem.en=Vemgo-Mabas veo.en=Ventureño @@ -7433,30 +7100,24 @@ vep.en=Veps ver.en=Mom Jango vgr.en=Vaghri vgt.en=Vlaamse Gebarentaal -vgt.en=Vlaamse Gebarentaal vic.en=Virgin Islands Creole English vid.en=Vidunda -vi.en=Vietnamese -vi=Tiếng Việt vif.en=Vili vig.en=Viemo vil.en=Vilela vin.en=Vinza vis.en=Vishavan -Visp.en=Visible Speech vit.en=Viti viv.en=Iduna vka.en=Kariyarra vki.en=Ija-Zuba vkj.en=Kujarge vkk.en=Kaur -vkk.en=Kaur vkl.en=Kulisusu vkm.en=Kamakan vko.en=Kodeoha vkp.en=Korlai Creole Portuguese vkt.en=Tenggarong Kutai Malay -vkt.en=Tenggarong Kutai Malay vku.en=Kurrama vlp.en=Valpei vls.en=Vlaams @@ -7486,7 +7147,6 @@ vmz.en=Mazatlán Mazatec vnk.en=Vano vnm.en=Vinmavis vnp.en=Vunapu -vo.en=Volapük vor.en=Voro vot.en=Votic vra.en=Vera'a @@ -7494,10 +7154,7 @@ vro.en=Võro vrs.en=Varisi vrt.en=Burmbar vsi.en=Moldova Sign Language -vsi.en=Moldova Sign Language vsl.en=Venezuelan Sign Language -vsl.en=Venezuelan Sign Language -vsv.en=Valencian Sign Language vsv.en=Valencian Sign Language vto.en=Vitou vum.en=Vumbu @@ -7507,18 +7164,16 @@ vwa.en=Awa (China) waa.en=Walla Walla wab.en=Wab wac.en=Wasco-Wishram -wadegile.en=Wade-Giles romanization wad.en=Wandamen wae.en=Walser -wa.en=Walloon waf.en=Wakoná wag.en=Wa'ema wah.en=Watubela wai.en=Wares waj.en=Waffa wak.en=Wakashan languages -wal.en=Wolaytta wal=ወላይትኛ +wal.en=Wolaytta wam.en=Wampanoag wan.en=Wan wao.en=Wappo @@ -7652,7 +7307,6 @@ wob.en=Wè Northern woc.en=Wogeo wod.en=Wolani woe.en=Woleaian -wo.en=Wolof wof.en=Gambian Wolof wog.en=Wogamusin woi.en=Kamang @@ -7705,7 +7359,6 @@ wun.en=Bungu wur.en=Wurrugu wut.en=Wutung wuu.en=Wu Chinese -wuu.en=Wu Chinese wuv.en=Wuvulu-Aua wux.en=Wulna wuy.en=Wauyai @@ -7785,8 +7438,6 @@ xha.en=Harami xhc.en=Hunnic xhd.en=Hadrami xhe.en=Khetrani -xh.en=Xhosa -xh=isiXhosa xhr.en=Hernican xht.en=Hattic xhu.en=Hurrian @@ -7809,7 +7460,6 @@ xkf.en=Khengkha xkg.en=Kagoro xkh.en=Karahawyana xki.en=Kenyan Sign Language -xki.en=Kenyan Sign Language xkj.en=Kajali xkk.en=Kaco' xkl.en=Mainstream Kenyah @@ -7850,8 +7500,6 @@ xmh.en=Kuku-Muminh xmj.en=Majera xmk.en=Ancient Macedonian xml.en=Malaysian Sign Language -xml.en=Malaysian Sign Language -xmm.en=Manado Malay xmm.en=Manado Malay xmn.en=Manichaean Middle Persian xmo.en=Morerebi @@ -7859,7 +7507,6 @@ xmp.en=Kuku-Mu'inh xmq.en=Kuku-Mangk xmr.en=Meroitic xms.en=Moroccan Sign Language -xms.en=Moroccan Sign Language xmt.en=Matbat xmu.en=Kamu xmv.en=Antankarana Malagasy @@ -7889,7 +7536,6 @@ xor.en=Korubo xow.en=Kowaki xpc.en=Pecheneg xpe.en=Liberia Kpelle -Xpeo.en=Old Persian xpg.en=Phrygian xpi.en=Pictish xpk.en=Kulina Pano @@ -7930,7 +7576,6 @@ xsq.en=Makhuwa-Saka xsr.en=Sherpa xss.en=Assan xsu.en=Sanumá -Xsux.en=Sumero-Akkadian cuneiform xsv.en=Sudovian xsy.en=Saisiyat xta.en=Alcozauca Mixtec @@ -8032,7 +7677,6 @@ yde.en=Yangum Dey ydg.en=Yidgha ydk.en=Yoidik yds.en=Yiddish Sign Language -yds.en=Yiddish Sign Language yea.en=Ravula yec.en=Yeniche yee.en=Yimas @@ -8055,13 +7699,10 @@ yha.en=Baha Buyang yhd.en=Judeo-Iraqi Arabic yhl.en=Hlepho Phowa yia.en=Yinggarda -yi=ייִדיש -yi.en=Yiddish yif.en=Ache yig.en=Wusa Nasu yih.en=Western Yiddish yii.en=Yidiny -Yiii.en=Yi yij.en=Yindjibarndi yik.en=Dongshanba Lalo yil.en=Yindjilandji @@ -8130,8 +7771,6 @@ yno.en=Yong yns.en=Yansi ynu.en=Yahuna yob.en=Yoba -yo=èdèe Yorùbá -yo.en=Yoruba yog.en=Yogad yoi.en=Yonaguni yok.en=Yokuts @@ -8163,7 +7802,6 @@ yrw.en=Yarawata ysc.en=Yassic ysd.en=Samatao ysl.en=Yugoslavian Sign Language -ysl.en=Yugoslavian Sign Language ysn.en=Sani yso.en=Nisi (China) ysp.en=Southern Lolopo @@ -8178,7 +7816,6 @@ yub.en=Yugambal yuc.en=Yuchi yud.en=Judeo-Tripolitanian Arabic yue.en=Yue Chinese -yue.en=Yue Chinese yuf.en=Havasupai-Walapai-Yavapai yug.en=Yug yui.en=Yurutí @@ -8215,8 +7852,6 @@ zab.en=San Juan Guelavía Zapotec zac.en=Ocotlán Zapotec zad.en=Cajonos Zapotec zae.en=Yareni Zapotec -za=Vahcuengh -za.en=Zhuang zaf.en=Ayoquesco Zapotec zag.en=Zaghawa zah.en=Zangwal @@ -8256,17 +7891,12 @@ zgn.en=Guibian Zhuang zgr.en=Magori zhb.en=Zhaba zhd.en=Dai Zhuang -zh.en=Chinese -zh=中文 -zh-Hans=简体中文 -zh-Hant=ç¹ä½“中文 zhi.en=Zhire zhn.en=Nong Zhuang zhw.en=Zhoa zhx.en=Chinese (family) zia.en=Zia zib.en=Zimbabwe Sign Language -zib.en=Zimbabwe Sign Language zik.en=Zimakani zim.en=Mesme zin.en=Zinza @@ -8288,7 +7918,6 @@ zkz.en=Khazar zle.en=East Slavic languages zlj.en=Liujiang Zhuang zlm.en=Malay (individual language) -zlm.en=Malay (individual language) zln.en=Lianshan Zhuang zlq.en=Liuqian Zhuang zls.en=South Slavic languages @@ -8302,7 +7931,6 @@ zmf.en=Mfinu zmg.en=Marti Ke zmh.en=Makolkol zmi.en=Negeri Sembilan Malay -zmi.en=Negeri Sembilan Malay zmj.en=Maridjabin zmk.en=Mandandanyi zml.en=Madngele @@ -8369,8 +7997,6 @@ zrs.en=Mairasi zsa.en=Sarasira zsk.en=Kaskean zsl.en=Zambian Sign Language -zsl.en=Zambian Sign Language -zsm.en=Standard Malay zsm.en=Standard Malay zsr.en=Southern Rincon Zapotec zsu.en=Sukurum @@ -8387,8 +8013,6 @@ ztu.en=Güilá Zapotec ztx.en=Zaachila Zapotec zty.en=Yatee Zapotec zua.en=Zeem -zu=isiZulu -zu.en=Zulu zuh.en=Tokano zum.en=Kumzari zun.en=Zuni @@ -8401,3 +8025,160 @@ zyn.en=Yongnan Zhuang zyp.en=Zyphe zza.en=Zaza zzj.en=Zuojiang Zhuang +Arab.en=Arabic +Armi.en=Imperial Aramaic +Armn.en=Armenian +Avst.en=Avestan +Bali.en=Balinese +Bamu.en=Bamum +Batk.en=Batak +Beng.en=Bengali +Blis.en=Blissymbols +Bopo.en=Bopomofo +Brah.en=Brahmi +Brai.en=Braille +Bugi.en=Buginese +Buhd.en=Buhid +Cakm.en=Chakma +Cans.en=Unified Canadian Aboriginal Syllabics +Cari.en=Carian +Cham.en=Cham +Cher.en=Cherokee +Cirt.en=Cirth +Copt.en=Coptic +Cprt.en=Cypriot +Cyrl.en=Cyrillic +Cyrs.en=Cyrillic (Old Church Slavonic variant) +Deva.en=Devanagari +Dsrt.en=Deseret +Egyd.en=Egyptian demotic +Egyh.en=Egyptian hieratic +Egyp.en=Egyptian hieroglyphs +Ethi.en=Ethiopic +Geok.en=Khutsuri (Asomtavruli and Nuskhuri) +Geor.en=Georgian (Mkhedruli) +Glag.en=Glagolitic +Goth.en=Gothic +Grek.en=Greek +Gujr.en=Gujarati +Guru.en=Gurmukhi +Hang.en=Hangul +Hani.en=Han +Hano.en=Hanunoo +Hans.en=Han (Simplified variant) +Hant.en=Han (Traditional variant) +Hebr.en=Hebrew +Hira.en=Hiragana +Hmng.en=Pahawh Hmong +Hrkt.en=(alias for Hiragana + Katakana) +Hung.en=Old Hungarian +Inds.en=Indus +Ital.en=Old Italic (Etruscan, Oscan, etc.) +Java.en=Javanese +Jpan.en=Japanese (alias for Han + Hiragana + Katakana) +Kali.en=Kayah Li +Kana.en=Katakana +Khar.en=Kharoshthi +Khmr.en=Khmer +Knda.en=Kannada +Kore.en=Korean (alias for Hangul + Han) +Kthi.en=Kaithi +Lana.en=Tai Tham +Laoo.en=Lao +Latf.en=Latin (Fraktur variant) +Latg.en=Latin (Gaelic variant) +Latn.en=Latin +Lepc.en=Lepcha +Limb.en=Limbu +Lina.en=Linear A +Linb.en=Linear B +Lisu.en=Lisu +Lyci.en=Lycian +Lydi.en=Lydian +Mand.en=Mandaic +Mani.en=Manichaean +Maya.en=Mayan hieroglyphs +Mero.en=Meroitic +Mlym.en=Malayalam +Mong.en=Mongolian +Moon.en=Moon +Mtei.en=Meitei Mayek +Mymr.en=Myanmar +Nkgb.en=Nakhi Geba +Nkoo.en=N’Ko +Ogam.en=Ogham +Olck.en=Ol Chiki +Orkh.en=Old Turkic +Orya.en=Oriya +Osma.en=Osmanya +Perm.en=Old Permic +Phag.en=Phags-pa +Phli.en=Inscriptional Pahlavi +Phlp.en=Psalter Pahlavi +Phlv.en=Book Pahlavi +Phnx.en=Phoenician +Plrd.en=Miao +Prti.en=Inscriptional Parthian +Rjng.en=Rejang +Roro.en=Rongorongo +Runr.en=Runic +Samr.en=Samaritan +Sara.en=Sarati +Sarb.en=Old South Arabian +Saur.en=Saurashtra +Sgnw.en=SignWriting +Shaw.en=Shavian +Sinh.en=Sinhala +Sund.en=Sundanese +Sylo.en=Syloti Nagri +Syrc.en=Syriac +Syre.en=Syriac (Estrangelo variant) +Syrj.en=Syriac (Western variant) +Syrn.en=Syriac (Eastern variant) +Tagb.en=Tagbanwa +Tale.en=Tai Le +Talu.en=New Tai Lue +Taml.en=Tamil +Tavt.en=Tai Viet +Telu.en=Telugu +Teng.en=Tengwar +Tfng.en=Tifinagh +Tglg.en=Tagalog +Thaa.en=Thaana +Thai.en=Thai +Tibt.en=Tibetan +Ugar.en=Ugaritic +Vaii.en=Vai +Visp.en=Visible Speech +Xpeo.en=Old Persian +Xsux.en=Sumero-Akkadian cuneiform +Yiii.en=Yi +aluku.en=Aluku dialect +biske.en=The San Giorgio dialect of Resian +boont.en=Boontling +kkcor.en=Common Cornish orthography of Revived Cornish +lipaw.en=The Lipovaz dialect of Resian +nedis.en=Natisone dialect +njiva.en=The Gniva dialect of Resian +osojs.en=The Oseacco dialect of Resian +rozaj.en=Resian +solba.en=The Stolvizza dialect of Resian +uccor.en=Unified Cornish orthography of Revived Cornish +fonipa.en=International Phonetic Alphabet +fonupa.en=Uralic Phonetic Alphabet +heploc.en=Hepburn romanization, Library of Congress method +ndyuka.en=Ndyuka dialect +pamaka.en=Pamaka dialect +pinyin.en=Pinyin romanization +scouse.en=Scouse +tarask.en=Belarusian in Taraskievica orthography +ucrcor.en=Unified Cornish Revised orthography of Revived Cornish +arevela.en=Eastern Armenian +arevmda.en=Western Armenian +hepburn.en=Hepburn romanization +monoton.en=Monotonic Greek +polyton.en=Polytonic Greek +baku1926.en=Unified Turkic Latin Alphabet (Historical) +scotland.en=Scottish Standard English +valencia.en=Valencian +wadegile.en=Wade-Giles romanization diff --git a/locales.d/pon_utf8.conf b/locales.d/pon_utf8.conf new file mode 100644 index 0000000..3e55d8e --- /dev/null +++ b/locales.d/pon_utf8.conf @@ -0,0 +1,151 @@ +[Meta] +Name=pon +Description=Pohnpeian (Unicode) +Encoding=UTF-8 + +[Text] +Genesis=SENESIS +Exodus=EKSODUS +Leviticus=LIPAI +Numbers=NEMPE KAN +Deuteronomy=DEUDERONOMI +Joshua=SOSUA +Judges=SOUNKOPWUNG KAN +Ruth=RUD +I Samuel=KEIEUN SAMUEL +II Samuel=KERIAUN SAMUEL +I Kings=KEIEUN NANMWARKI KAN +II Kings=KERIAUN NANMWARKI KAN +I Chronicles=KEIEUN KRONIKEL +II Chronicles=KERIAUN KRONIKEL +Ezra=ESRA +Nehemiah=NEHMAIA +Esther=ESTER +Job=SOHP +Psalms=MELKAHKA KAN +Proverbs=LEPIN PADAHK AUDAPAN KAN +Ecclesiastes=EKLESIADES +Song of Solomon=MELKAHKAHN MELKAHKA KAN +Isaiah=AISEIA +Jeremiah=SEREMAIA +Lamentations=KOUL KEDEPWIDEPW KAN +Ezekiel=ESEKIEL +Daniel=DANIEL +Hosea=OSEIA +Joel=SOEL +Amos=EIMWOS +Obadiah=OPADAIA +Jonah=SONA +Micah=MAIKA +Nahum=NAHUM +Habakkuk=APAKUK +Zephaniah=SEPANAIA +Haggai=AKKAI +Zechariah=SEKARAIA +Malachi=MALAKAI +Matthew=MADIU +Mark=MARK +Luke=LUK +John=SOHN +Acts=WIEWIA KAN +Romans=ROM +I Corinthians=1 KORINT +II Corinthians=2 KORINT +Galatians=KALESIA +Ephesians=EPISOS +Philippians=PILIPAI +Colossians=KOLOSE +I Thessalonians=1 DESELONIKA +II Thessalonians=2 DESELONIKA +I Timothy=1 TIMOTY +II Timothy=2 TIMOTY +Titus=TAITUS +Philemon=PAILIMWON +Hebrews=IPRU +James=SEIMS +I Peter=1 PITER +II Peter=2 PITER +I John=1 SOHN +II John=2 SOHN +III John=3 SOHN +Jude=SUD +Revelation of John=KAUDIAHL + +[Book Abbrevs] + +SEN=Gen +EKS=Exod +LIP=Lev +NEMP=Num +DEUD=Deut +SOS=Josh +S K=Judg +1 SAM=1Sam +2 SAM=2Sam +1 NAN=1Kgs +2 NAN=2Kgs +1 KRON=1Chr +2 KRON=2Chr +ESRA=Ezra +NEH=Neh +EST=Esth +SOHP=Job +MEL=Ps +LEP PAD=Prov +EKL=Eccl +MEL MEL=Song +AIS=Isa +SER=Jer +KOUL KED=Lam +ESEK=Ezek +DAN=Dan +OS=Hos +SOEL=Joel +EIMW=Amos +OP=Obad +SONA=Jonah +MAIKA=Mic +NAH=Nah +APAK=Hab +SEP=Zeph +AK=Hag +SEK=Zech +MAL=Mal + +MAD=Matt +MK=Mark +LUK=Luke +SOHN=John +WIE=Acts +ROM=Rom +1 KOR=1Cor +2 KOR=2Cor +KAL=Gal +EP=Eph +PIL=Phil +KOL=Col +1 DES=1Thess +2 DES= 2Thess +1 TIM=1Tim +2 TIM=2Tim +1Tim=1Tim +2TIM=2Tim +IPRU=Heb +SEIMS=Jas +1 PIT=1Pet +2 PIT=2Pet +1 SOHN=1John +2 SOHN=2John +3 SOHN=3John +SUD=Jude +KAUD=Rev + +1 Mak=1Macc +2 Mak=2Macc +Dob=Tob +Kupw=Wis +Par=Bar +Pel=Bel +Sir=Sir +Su=Sus + diff --git a/locales.d/ru-utf8.conf b/locales.d/ru-utf8.conf new file mode 100644 index 0000000..6f20ca2 --- /dev/null +++ b/locales.d/ru-utf8.conf @@ -0,0 +1,681 @@ +# Russian BIBLE +# БИБЛИЯ, КÐИГИ СВЯЩЕÐÐОГО ПИСÐÐИЯ ВЕТХОГО И ÐОВОГО ЗÐВЕТÐ. +# Працює під Linux Ñ– Windows верÑÑ–Ñ— проекту SWORD +# Pavlo Bohmat bohm@ukr.net + +# Converted with iconv by Martin Gruner + +[Meta] +Name=ru +Description=Russian (Unicode) +Encoding=UTF-8 + +[Text] +Genesis=Бытие +Exodus=ИÑход +Leviticus=Левит +Numbers=ЧиÑла +Deuteronomy=Второзаконие +Joshua=ИиÑÑƒÑ Ðавин +Judges=Судьи +Ruth=Руфь +I Samuel=1. ЦарÑтв +II Samuel=2. ЦарÑтв +I Kings=3. ЦарÑтв +II Kings=4. ЦарÑтв +I Chronicles=1. Паралипоменон +II Chronicles=2. Паралипоменон +Prayer of Manasses=Молитва МанаÑÑии +Ezra=Ездра +Nehemiah=ÐÐµÐµÐ¼Ð¸Ñ +I Esdras=2. Ездры +Tobit=Товита +Judith=Иудифь +Esther=ЕÑфирь +Job=Иов +Psalms=ПÑалтирь +Proverbs=Притчи +Ecclesiastes=ЕкклеÑиаÑÑ‚ +Song of Solomon=ПеÑÐ½Ñ ÐŸÐµÑней +Wisdom=ПремудроÑÑ‚ÑŒ Соломона +Sirach=Сирах +Isaiah=ИÑÐ°Ð¸Ñ +Jeremiah=Ð˜ÐµÑ€ÐµÐ¼Ð¸Ñ +Lamentations=Плач Иеремии +Epistle of Jeremiah=ПоÑлание Иеремии +Baruch=Варуха +Ezekiel=Иезекииль +Daniel=Даниил +Hosea=ОÑÐ¸Ñ +Joel=Иоиль +Amos=ÐÐ¼Ð¾Ñ +Obadiah=Ðвдий +Jonah=Иона +Micah=Михей +Nahum=Ðаум +Habakkuk=Ðввакум +Zephaniah=Ð¡Ð¾Ñ„Ð¾Ð½Ð¸Ñ +Haggai=Ðггей +Zechariah=Ð—Ð°Ñ…Ð°Ñ€Ð¸Ñ +Malachi=ÐœÐ°Ð»Ð°Ñ…Ð¸Ñ +I Maccabees=1. МаккавейÑÐºÐ°Ñ +II Maccabees=2. МаккавейÑÐºÐ°Ñ +III Maccabees=3. МаккавейÑÐºÐ°Ñ +II Esdras=3. Ездры +Matthew=От ÐœÐ°Ñ‚Ñ„ÐµÑ +Mark=От Марка +Luke=От Луки +John=От Иоанна +Acts=ДеÑÐ½Ð¸Ñ +Romans=К РимлÑнам +I Corinthians=1. КоринфÑнам +II Corinthians=2. КоринфÑнам +Galatians=К Галатам +Ephesians=К ЕфеÑÑнам +Philippians=К Филиппийцам +Colossians=К КолоÑÑÑнам +I Thessalonians=1. ФеÑÑалоникийцам +II Thessalonians=2. ФеÑÑалоникийцам +I Timothy=1. Тимофею +II Timothy=2. Тимофею +Titus=К Титу +Philemon=К Филимону +Hebrews=К ЕвреÑм +James=Иакова +I Peter=1. Петра +II Peter=2. Петра +I John=1. Иоанна +II John=2. Иоанна +III John=3. Иоанна +Jude=Иуды +Revelation of John=Откровение + +[Book Abbrevs] + +1Ðœ=Gen +1Ðœ.=Gen +быт=Gen +быт.=Gen +Быт=Gen +Быт.=Gen +бытие=Gen +Бытие=Gen +2Ðœ=Exod +2Ðœ.=Exod +иÑÑ…=Exod +иÑÑ….=Exod +ИÑÑ…=Exod +ИÑÑ….=Exod +иÑход=Exod +ИÑход=Exod +3Ðœ=Lev +3Ðœ.=Lev +лев=Lev +лев.=Lev +Лев=Lev +Лев.=Lev +левит=Lev +Левит=Lev +4Ðœ=Num +4Ðœ.=Num +чиÑ=Num +чиÑ.=Num +ЧиÑ=Num +ЧиÑ.=Num +чиÑла=Num +ЧиÑла=Num +5Ðœ=Deut +5Ðœ.=Deut +втор=Deut +втор.=Deut +Втор=Deut +Втор.=Deut +Второзаконие=Deut +ииÑ.нав.=Josh +егошуи=Josh +Егошуи=Josh +ег=Josh +ег.=Josh +ииÑÑƒÑ Ð½Ð°Ð²Ð¸Ð½=Josh +ИиÑÑƒÑ Ðавин=Josh +Ñуд=Judg +Ñуд.=Judg +Ñудьи=Judg +Судьи=Judg +руф=Ruth +руф.=Ruth +руфь=Ruth +Руфь=Ruth + +1. ЦарÑтв=1Sam +1 ЦарÑтв=1Sam +1ЦарÑтв=1Sam +1цар=1Sam +1цар.=1Sam +1 цар=1Sam +1 цар.=1Sam +1Цар=1Sam +1Цар.=1Sam +1 Цар=1Sam +1 Цар.=1Sam + +2. ЦарÑтв=2Sam +2 ЦарÑтв=2Sam +2ЦарÑтв=2Sam +2цар=2Sam +2цар.=2Sam +2 цар=2Sam +2 цар.=2Sam +2Цар=2Sam +2Цар.=2Sam +2 Цар=2Sam +2 Цар.=2Sam + +3. ЦарÑтв=1Kgs +3 ЦарÑтв=1Kgs +3ЦарÑтв=1Kgs +3цар=1Kgs +3цар.=1Kgs +3 цар=1Kgs +3 цар.=1Kgs +3Цар=1Kgs +3Цар.=1Kgs +3 Цар=1Kgs +3 Цар.=1Kgs + +4. ЦарÑтв=2Kgs +4 ЦарÑтв=2Kgs +4ЦарÑтв=2Kgs +4цар=2Kgs +4цар.=2Kgs +4 цар=2Kgs +4 цар.=2Kgs +4Цар=2Kgs +4Цар.=2Kgs +4 Цар=2Kgs +4 Цар.=2Kgs + +1. Паралипоменон=1Chr +1 Паралипоменон=1Chr +1Паралипоменон=1Chr +1пар=1Chr +1пар.=1Chr +1 пар=1Chr +1 пар.=1Chr +1 Пар=1Chr +1 Пар.=1Chr + +2. Паралипоменон=2Chr +2 Паралипоменон=2Chr +2Паралипоменон=2Chr +2пар=2Chr +2пар.=2Chr +2 пар=2Chr +2 пар.=2Chr +2Пар=2Chr +2Пар.=2Chr +2 Пар=2Chr +2 Пар.=2Chr + +Молитва МанаÑÑии=PrMan +МанаÑÑии=PrMan +Ман.=PrMan +ман.=PrMan +Ман=PrMan +ман=PrMan + +ездр=Ezra +ездр.=Ezra +Ездр=Ezra +Ездр.=Ezra +езд=Ezra +езд.=Ezra +Езд=Ezra +Езд.=Ezra +Ездра=Ezra +неем=Neh +неем.=Neh +Ðеем=Neh +Ðеем.=Neh +ÐеемиÑ=Neh + +2. Ездры=1Esd +2 Ездры=1Esd +2Ездры=1Esd +2Езд.=1Esd +2Езд=1Esd +2-Ñ Ð•Ð·Ð´Ñ€Ñ‹=1Esd +2-Ñ Ð•Ð·Ð´.=1Esd +2-Ñ Ð•Ð·Ð´=1Esd +2 Ездры=1Esd +2 Езд.=1Esd +2 Езд=1Esd +2 езд=1Esd +2 ездр=1Esd +2езд=1Esd +2ездр=1Esd +2. езд=1Esd +2. ездр=1Esd + +Товита=Tob +Товит=Tob +Тов.=Tob +Тов=Tob + +Юдифь=Jdt +Иудифь=Jdt +юдифь=Jdt +иудифь=Jdt + +еÑÑ„=Esth +еÑÑ„.=Esth +ЕÑÑ„=Esth +ЕÑÑ„.=Esth +ЕÑфирь=Esth +иов=Job +иов.=Job +Иов=Job +пÑ=Ps +пÑ.=Ps +ПÑ=Ps +ПÑ.=Ps +ПÑалтирь=Ps +прит=Prov +прит.=Prov +Прит=Prov +Прит.=Prov +Притчи=Prov +еккл=Eccl +еккл.=Eccl +Еккл=Eccl +Еккл.=Eccl +ЕкклеÑиаÑÑ‚=Eccl +пеÑн=Song +пеÑн.=Song +ПеÑн=Song +ПеÑн.=Song +ПеÑÐ½Ñ ÐŸÐµÑней=Song + +ПремудроÑÑ‚ÑŒ Соломона=Wis +ПремудроÑти=Wis +ПремудроÑÑ‚ÑŒ=Wis +Прем.=Wis +Прем. Сол.=Wis +Прем Сол=Wis +прем.=Wis +прем=Wis + +Сирахова=Sir +Сираха=Sir +Сирах=Sir +Сир.=Sir +Сир=Sir +Ñир=Sir +Ñирах=Sir +ПремудроÑÑ‚ÑŒ ИиÑуÑа, Ñына Сирахова=Sir + +иÑ=Isa +иÑ.=Isa +ИÑ=Isa +ИÑ.=Isa +ИÑаиÑ=Isa +иер=Jer +иер.=Jer +Иер=Jer +Иер.=Jer +ИеремиÑ=Jer +плач=Lam +плач.=Lam +Плач=Lam +Плач.=Lam +Плач Иеремии=Lam + +ПоÑлание Иеремии=EpJer +ПоÑл. Иер.=EpJer +ПоÑл Иер=EpJer + +Варуха=Bar +Варух=Bar +Вар.=Bar +Вар=Bar + +иез=Ezek +иез.=Ezek +Иез=Ezek +Иез.=Ezek +Иезекииль=Ezek +дан=Dan +дан.=Dan +Дан=Dan +Дан.=Dan +Даниил=Dan +оÑ=Hos +оÑ.=Hos +ОÑ=Hos +ОÑ.=Hos +ОÑиÑ=Hos +иоил=Joel +иоил.=Joel +Иоил=Joel +Иоил.=Joel +Иоиль=Joel +ам=Amos +ам.=Amos +Ðм=Amos +Ðм.=Amos +амоÑ=Amos +ÐмоÑ=Amos +авд.=Obad +Ðвдий=Obad +авд=Obad +ион=Jonah +ион.=Jonah +Ион=Jonah +Ион.=Jonah +Иона=Jonah +мих=Mic +мих.=Mic +Мих=Mic +Мих.=Mic +Михей=Mic +наум=Nah +наум.=Nah +Ðаум=Nah +авв=Hab +авв.=Hab +Ðвв=Hab +Ðвв.=Hab +Ðввакум=Hab +Ñоф=Zeph +Ñоф.=Zeph +Соф=Zeph +Соф.=Zeph +СофониÑ=Zeph +агг=Hag +агг.=Hag +Ðгг=Hag +Ðгг.=Hag +Ðггей=Hag +зах=Zech +зах.=Zech +Зах=Zech +Зах.=Zech +ЗахариÑ=Zech +мал=Mal +мал.=Mal +Мал=Mal +Мал.=Mal +МалахиÑ=Mal + +1. МаккавейÑкаÑ=1Macc +1 МаккавейÑкаÑ=1Macc +1МаккавейÑкаÑ=1Macc +1. Мак=1Macc +1 Мак=1Macc +1Мак=1Macc +1 мак.=1Macc +1 мак=1Macc +1мак=1Macc + +2. МаккавейÑкаÑ=2Macc +2 МаккавейÑкаÑ=2Macc +2МаккавейÑкаÑ=2Macc +2. Мак=2Macc +2 Мак=2Macc +2Мак=2Macc +2 мак.=1Macc +2 мак=1Macc +2мак=1Macc + +3. МаккавейÑкаÑ=3Macc +3 МаккавейÑкаÑ=3Macc +3МаккавейÑкаÑ=3Macc +3. Мак=3Macc +3 Мак=3Macc +3Мак=3Macc +3 мак.=1Macc +3 мак=1Macc +3мак=1Macc + +3. Ездры=2Esd +3 Ездры=2Esd +3Ездры=2Esd +3. Езд=2Esd +3 Езд=2Esd +3Езд=2Esd +3езд=2Esd +3ездр=2Esd +3 езд=2Esd +3 ездр=2Esd +3. езд=2Esd +3. ездр=2Esd + + +матф=Matt +матф.=Matt +мф=Matt +мф.=Matt +Мф=Matt +Мф.=Matt +От МатфеÑ=Matt +мар=Mark +мар.=Mark +мк=Mark +мк.=Mark +Мк=Mark +Мк.=Mark +От Марка=Mark +лук=Luke +лук.=Luke +лк=Luke +лк.=Luke +Лк=Luke +Лк.=Luke +От Луки=Luke +иоан=John +иоан.=John +ин=John +ин.=John +Ин=John +Ин.=John +От Иоанна=John +деÑн=Acts +деÑн.=Acts +ДеÑн=Acts +ДеÑн.=Acts +ДеÑниÑ=Acts +рим=Rom +рим.=Rom +Рим=Rom +Рим.=Rom +К РимлÑнам=Rom + +1. КоринфÑнам=1Cor +1 КоринфÑнам=1Cor +1КоринфÑнам=1Cor +1кор=1Cor +1кор.=1Cor +1 кор=1Cor +1 кор.=1Cor +1Кор=1Cor +1Кор.=1Cor +1 Кор=1Cor +1 Кор.=1Cor + +2. КоринфÑнам=2Cor +2 КоринфÑнам=2Cor +2КоринфÑнам=2Cor +2кор=2Cor +2кор.=2Cor +2 кор=2Cor +2 кор.=2Cor +2Кор=2Cor +2Кор.=2Cor +2 Кор=2Cor +2 Кор.=2Cor + +гал=Gal +гал.=Gal +Гал=Gal +Гал.=Gal +К Галатам=Gal +еф=Eph +еф.=Eph +Еф=Eph +Еф.=Eph +К ЕфеÑÑнам=Eph +фил=Phil +фил.=Phil +Фил=Phil +Фил.=Phil +флп=Phil +флп.=Phil +Флп=Phil +Флп.=Phil +К Филиппийцам=Phil +К КолоÑÑÑнам=Col +кол=Col +кол.=Col +Кол=Col +Кол.=Col + +1. ФеÑÑалоникийцам=1Thess +1 ФеÑÑалоникийцам=1Thess +1ФеÑÑалоникийцам=1Thess +1феÑ=1Thess +1феÑ.=1Thess +1 феÑ=1Thess +1 феÑ.=1Thess +1 ФеÑ=1Thess +1 ФеÑ.=1Thess + +2. ФеÑÑалоникийцам=2Thess +2 ФеÑÑалоникийцам=2Thess +2ФеÑÑалоникийцам=2Thess +2феÑ=2Thess +2феÑ.=2Thess +2 феÑ=2Thess +2 феÑ.=2Thess +2ФеÑ=2Thess +2ФеÑ.=2Thess +2 ФеÑ=2Thess +2 ФеÑ.=2Thess + +1. Тимофею=1Tim +1 Тимофею=1Tim +1Тимофею=1Tim +1тим=1Tim +1тим.=1Tim +1 тим=1Tim +1 тим.=1Tim +1Тим=1Tim +1Тим.=1Tim +1 Тим=1Tim +1 Тим.=1Tim + +2. Тимофею=2Tim +2 Тимофею=2Tim +2Тимофею=2Tim +2тим=2Tim +2тим.=2Tim +2 тим=2Tim +2 тим.=2Tim +2Тим=2Tim +2Тим.=2Tim +2 Тим=2Tim +2 Тим.=2Tim + +К Титу=Titus +тит=Titus +тит.=Titus +Тит=Titus +Тит.=Titus +флм=Phlm +флм.=Phlm +Флм=Phlm +Флм.=Phlm +К Филимону=Phlm +евр.=Heb +евр=Heb +Евр=Heb +Евр.=Heb +К ЕвреÑм=Heb +иак=Jas +иак.=Jas +Иак=Jas +Иак.=Jas +иакова=Jas +Иакова=Jas + +1. Петра=1Pet +1 Петра=1Pet +1Петра=1Pet +1пет=1Pet +1пет.=1Pet +1 пет=1Pet +1 пет.=1Pet +1Пет=1Pet +1Пет.=1Pet +1 Пет=1Pet +1 Пет.=1Pet + +2. Петра=2Pet +2 Петра=2Pet +2Петра=2Pet +2пет=2Pet +2пет.=2Pet +2 пет=2Pet +2 пет.=2Pet +2Пет=2Pet +2Пет.=2Pet +2 Пет=2Pet +2 Пет.=2Pet + +1. Иоанна=1John +1 Иоанна=1John +1Иоанна=1John +1иоан=1John +1иоан.=1John +1ин=1John +1ин.=1John +1 ин=1John +1 ин.=1John +1Ин=1John +1Ин.=1John +1 Ин=1John +1 Ин.=1John + +2. Иоанна=2John +2 Иоанна=2John +2Иоанна=2John +2иоан=2John +2иоан.=2John +2ин=2John +2ин.=2John +2 ин=2John +2 ин.=2John +2Ин=2John +2Ин.=2John +2 Ин=2John +2 Ин.=2John + +3. Иоанна=3John +3 Иоанна=3John +3Иоанна=3John +3иоан=3John +3иоан.=3John +3ин=3John +3ин.=3John +3 ин=3John +3 ин.=3John +3Ин=3John +3Ин.=3John + +иуд=Jude +иуд.=Jude +Иуды=Jude +откр=Rev +откр.=Rev +Откр=Rev +Откр.=Rev +Откровение=Rev diff --git a/locales.d/ru_RU-utf8.conf b/locales.d/ru_RU-utf8.conf index 6077c9f..ce11c7d 100644 --- a/locales.d/ru_RU-utf8.conf +++ b/locales.d/ru_RU-utf8.conf @@ -25,17 +25,25 @@ I Kings=3. ЦарÑтв II Kings=4. ЦарÑтв I Chronicles=1. Паралипоменон II Chronicles=2. Паралипоменон +Prayer of Manasses=Молитва МанаÑÑии Ezra=Ездра Nehemiah=ÐÐµÐµÐ¼Ð¸Ñ +I Esdras=2. Ездры +Tobit=Товита +Judith=Иудифь Esther=ЕÑфирь Job=Иов Psalms=ПÑалтирь Proverbs=Притчи Ecclesiastes=ЕкклеÑиаÑÑ‚ Song of Solomon=ПеÑÐ½Ñ ÐŸÐµÑней +Wisdom=ПремудроÑÑ‚ÑŒ Соломона +Sirach=Сирах Isaiah=ИÑÐ°Ð¸Ñ Jeremiah=Ð˜ÐµÑ€ÐµÐ¼Ð¸Ñ Lamentations=Плач Иеремии +Epistle of Jeremiah=ПоÑлание Иеремии +Baruch=Варуха Ezekiel=Иезекииль Daniel=Даниил Hosea=ОÑÐ¸Ñ @@ -50,6 +58,10 @@ Zephaniah=Ð¡Ð¾Ñ„Ð¾Ð½Ð¸Ñ Haggai=Ðггей Zechariah=Ð—Ð°Ñ…Ð°Ñ€Ð¸Ñ Malachi=ÐœÐ°Ð»Ð°Ñ…Ð¸Ñ +I Maccabees=1. МаккавейÑÐºÐ°Ñ +II Maccabees=2. МаккавейÑÐºÐ°Ñ +III Maccabees=3. МаккавейÑÐºÐ°Ñ +II Esdras=3. Ездры Matthew=От ÐœÐ°Ñ‚Ñ„ÐµÑ Mark=От Марка Luke=От Луки @@ -205,6 +217,13 @@ Revelation of John=Откровение 2 Пар=2Chr 2 Пар.=2Chr +Молитва МанаÑÑии=PrMan +МанаÑÑии=PrMan +Ман.=PrMan +ман.=PrMan +Ман=PrMan +ман=PrMan + ездр=Ezra ездр.=Ezra Ездр=Ezra @@ -219,6 +238,35 @@ Revelation of John=Откровение Ðеем=Neh Ðеем.=Neh ÐеемиÑ=Neh + +2. Ездры=1Esd +2 Ездры=1Esd +2Ездры=1Esd +2Езд.=1Esd +2Езд=1Esd +2-Ñ Ð•Ð·Ð´Ñ€Ñ‹=1Esd +2-Ñ Ð•Ð·Ð´.=1Esd +2-Ñ Ð•Ð·Ð´=1Esd +2 Ездры=1Esd +2 Езд.=1Esd +2 Езд=1Esd +2 езд=1Esd +2 ездр=1Esd +2езд=1Esd +2ездр=1Esd +2. езд=1Esd +2. ездр=1Esd + +Товита=Tob +Товит=Tob +Тов.=Tob +Тов=Tob + +Юдифь=Jdt +Иудифь=Jdt +юдифь=Jdt +иудифь=Jdt + еÑÑ„=Esth еÑÑ„.=Esth ЕÑÑ„=Esth @@ -247,6 +295,25 @@ Revelation of John=Откровение ПеÑн=Song ПеÑн.=Song ПеÑÐ½Ñ ÐŸÐµÑней=Song + +ПремудроÑÑ‚ÑŒ Соломона=Wis +ПремудроÑти=Wis +ПремудроÑÑ‚ÑŒ=Wis +Прем.=Wis +Прем. Сол.=Wis +Прем Сол=Wis +прем.=Wis +прем=Wis + +Сирахова=Sir +Сираха=Sir +Сирах=Sir +Сир.=Sir +Сир=Sir +Ñир=Sir +Ñирах=Sir +ПремудроÑÑ‚ÑŒ ИиÑуÑа, Ñына Сирахова=Sir + иÑ=Isa иÑ.=Isa ИÑ=Isa @@ -262,6 +329,16 @@ Revelation of John=Откровение Плач=Lam Плач.=Lam Плач Иеремии=Lam + +ПоÑлание Иеремии=EpJer +ПоÑл. Иер.=EpJer +ПоÑл Иер=EpJer + +Варуха=Bar +Варух=Bar +Вар.=Bar +Вар=Bar + иез=Ezek иез.=Ezek Иез=Ezek @@ -329,6 +406,51 @@ Revelation of John=Откровение Мал=Mal Мал.=Mal МалахиÑ=Mal + +1. МаккавейÑкаÑ=1Macc +1 МаккавейÑкаÑ=1Macc +1МаккавейÑкаÑ=1Macc +1. Мак=1Macc +1 Мак=1Macc +1Мак=1Macc +1 мак.=1Macc +1 мак=1Macc +1мак=1Macc + +2. МаккавейÑкаÑ=2Macc +2 МаккавейÑкаÑ=2Macc +2МаккавейÑкаÑ=2Macc +2. Мак=2Macc +2 Мак=2Macc +2Мак=2Macc +2 мак.=1Macc +2 мак=1Macc +2мак=1Macc + +3. МаккавейÑкаÑ=3Macc +3 МаккавейÑкаÑ=3Macc +3МаккавейÑкаÑ=3Macc +3. Мак=3Macc +3 Мак=3Macc +3Мак=3Macc +3 мак.=1Macc +3 мак=1Macc +3мак=1Macc + +3. Ездры=2Esd +3 Ездры=2Esd +3Ездры=2Esd +3. Езд=2Esd +3 Езд=2Esd +3Езд=2Esd +3езд=2Esd +3ездр=2Esd +3 езд=2Esd +3 ездр=2Esd +3. езд=2Esd +3. ездр=2Esd + + матф=Matt матф.=Matt мф=Matt diff --git a/locales.d/uk-utf8.conf b/locales.d/uk-utf8.conf new file mode 100644 index 0000000..4397581 --- /dev/null +++ b/locales.d/uk-utf8.conf @@ -0,0 +1,555 @@ +# Ukrainian BIBLE +# БІБЛІЯ або КÐИГИ СВЯТОГО ПИСЬМРСТÐРОГО Й ÐОВОГО ЗÐПОВІТУ +# Працює під Linux Ñ– Windows верÑÑ–Ñ— проекту SWORD +# Pavlo Bohmat bohm@ukr.net + +[Meta] +Name=uk +Description=Ukrainian (Unicode) +Encoding=UTF-8 + +[Text] +Genesis=Ð‘ÑƒÑ‚Ñ‚Ñ +Exodus=Вихід +Leviticus=Левит +Numbers=ЧиÑла +Deuteronomy=ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€ÐµÐ½Ð½Ñ Ð—Ð°ÐºÐ¾Ð½Ñƒ +Joshua=ІÑÑƒÑ Ðавин +Judges=Суддів +Ruth=Рут +I Samuel=1. Самуїла +II Samuel=2. Самуїла +I Kings=1. Царів +II Kings=2. Царів +I Chronicles=1. Хроніки +II Chronicles=2. Хроніки +Ezra=Ездри +Nehemiah=Ðеемії +Esther=EÑтер +Job=Йова +Psalms=ПÑалмів +Proverbs=ПриповіÑтей +Ecclesiastes=ЕкклезіÑÑÑ‚ +Song of Solomon=ПіÑÐ½Ñ Ð½Ð°Ð´ піÑнÑми +Isaiah=ІÑаї +Jeremiah=Єремії +Lamentations=Плач Єремії +Ezekiel=Ð„Ð·ÐµÐºÑ–Ñ—Ð»Ñ +Daniel=Даниїла +Hosea=ОÑÑ–Ñ— +Joel=Йоіла +Amos=AмоÑа +Obadiah=ÐžÐ²Ð´Ñ–Ñ +Jonah=Йони +Micah=MÐ¸Ñ…ÐµÑ +Nahum=Ðаума +Habakkuk=Ðвакума +Zephaniah=Софонії +Haggai=ÐžÐ³Ñ–Ñ +Zechariah=Ð—Ð°Ñ…Ð°Ñ€Ñ–Ñ +Malachi=Малахії +Matthew=ÐœÐ°Ñ‚Ð²Ñ–Ñ +Mark=Марка +Luke=Луки +John=Івана +Acts=Дії +Romans=РимлÑн +I Corinthians=1. КоринтÑн +II Corinthians=2. КоринтÑн +Galatians=Галатів +Ephesians=ЕфеÑÑн +Philippians=Филип'Ñн +Colossians=КолоÑÑн +I Thessalonians=1. СолунÑн +II Thessalonians=2. СолунÑн +I Timothy=1. Ð¢Ð¸Ð¼Ð¾Ñ„Ñ–Ñ +II Timothy=2. Ð¢Ð¸Ð¼Ð¾Ñ„Ñ–Ñ +Titus=Тита +Philemon=Филимона +Hebrews=Євреїв +James=Якова +I Peter=1. Петра +II Peter=2. Петра +I John=1. Івана +II John=2. Івана +III John=3. Івана +Jude=Юди +Revelation of John=Об'ÑÐ²Ð»ÐµÐ½Ð½Ñ + +[Book Abbrevs] + +БуттÑ=Gen +Вихід=Exod +Левит=Lev +ЧиÑла=Num +ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€ÐµÐ½Ð½Ñ Ð—Ð°ÐºÐ¾Ð½Ñƒ=Deut +ІÑÑƒÑ Ðавин=Josh +Суддів=Judg +Рут=Ruth + +1. Самуїла=1Sam +1 Самуїла=1Sam +1Самуїла=1Sam + +2. Самуїла=2Sam +2 Самуїла=2Sam +2Самуїла=2Sam + +1. Царів=1Kgs +1 Царів=1Kgs +1Царів=1Kgs + +2. Царів=2Kgs +2 Царів=2Kgs +2Царів=2Kgs + +1. Хроніки=1Chr +1 Хроніки=1Chr +1Хроніки=1Chr + +2. Хроніки=2Chr +2 Хроніки=2Chr +2Хроніки=2Chr + +Ездри=Ezra +Ðеемії=Neh +EÑтер=Esth +Йова=Job +ПÑалмів=Ps +ПриповіÑтей=Prov +ЕкклезіÑÑÑ‚=Eccl +ПіÑÐ½Ñ Ð½Ð°Ð´ піÑнÑми=Song +ІÑаї=Isa +Єремії=Jer +Плач Єремії=Lam +ЄзекіїлÑ=Ezek +Даниїла=Dan +ОÑÑ–Ñ—=Hos +Йоіла=Joel +AмоÑа=Amos +ОвдіÑ=Obad +Йони=Jonah +MихеÑ=Mic +Ðаума=Nah +Ðвакума=Hab +Софонії=Zeph +ОгіÑ=Hag +ЗахаріÑ=Zech +Малахії=Mal +МатвіÑ=Matt +Марка=Mark +Луки=Luke +Івана=John +Дії=Acts +РимлÑн=Rom + +1. КоринтÑн=1Cor +1 КоринтÑн=1Cor +1КоринтÑн=1Cor + +2. КоринтÑн=2Cor +2 КоринтÑн=2Cor +2КоринтÑн=2Cor + +Галатів=Gal +ЕфеÑÑн=Eph +Филип'Ñн=Phil +КолоÑÑн=Col + +1. СолунÑн=1Thess +1 СолунÑн=1Thess +1СолунÑн=1Thess + +2. СолунÑн=2Thess +2 СолунÑн=2Thess +2СолунÑн=2Thess + +1. ТимофіÑ=1Tim +1 ТимофіÑ=1Tim +1ТимофіÑ=1Tim + +2. ТимофіÑ=2Tim +2 ТимофіÑ=2Tim +2ТимофіÑ=2Tim + +Тита=Titus +Филимона=Phlm +Євреїв=Heb +Якова=Jas + +1. Петра=1Pet +1 Петра=1Pet +1Петра=1Pet + +2. Петра=2Pet +2 Петра=2Pet +2Петра=2Pet + +1. Івана=1John +1 Івана=1John +1Івана=1John + +2. Івана=2John +2 Івана=2John +2Івана=2John + +3. Івана=3John +3 Івана=3John +3Івана=3John + +Юди=Jude +Об'ÑвленнÑ=Rev + +бут=Gen +бут.=Gen +Бут=Gen +Бут.=Gen +1Ðœ=Gen +1Ðœ.=Gen +1 Ðœ=Gen +1 Ðœ.=Gen +вих=Exod +вих.=Exod +Вих=Exod +Вих.=Exod +2Ðœ=Exod +2Ðœ.=Exod +2 Ðœ=Exod +2 Ðœ.=Exod +лев=Lev +лев.=Lev +Лев=Lev +Лев.=Lev +3Ðœ=Lev +3Ðœ.=Lev +3 Ðœ=Lev +3 Ðœ.=Lev +чиÑ=Num +чиÑ.=Num +ЧиÑ=Num +ЧиÑ.=Num +4Ðœ=Num +4Ðœ.=Num +4 Ðœ=Num +4 Ðœ.=Num +повт. зак.=Deut +повт зак=Deut +Повт Зак=Deut +Повт. Зак.=Deut +5Ðœ=Deut +5Ðœ.=Deut +5 Ðœ=Deut +5 Ðœ.=Deut +Ñ–ÑÑƒÑ Ð½Ð°Ð²Ð¸Ð½=Josh +Ðавин=Josh +навин=Josh +єгошуї=Josh +Єгошуї=Josh +єг=Josh +єг.=Josh +Єг=Josh +Єг.=Josh +Ñуд=Judg +Ñуд.=Judg +Суд=Judg +Суд.=Judg +рут=Ruth +Рут=Ruth +1Ñам=1Sam +1Ñам.=1Sam +1 Ñам=1Sam +1 Ñам.=1Sam +1Сам=1Sam +1Сам.=1Sam +1 Сам=1Sam +1 Сам.=1Sam +2Ñам=2Sam +2Ñам.=2Sam +2 Ñам=2Sam +2 Ñам.=2Sam +2Сам=2Sam +2Сам.=2Sam +2 Сам=2Sam +2 Сам.=2Sam +1цар=1Kgs +1цар.=1Kgs +1 цар=1Kgs +1 цар.=1Kgs +1Цар=1Kgs +1Цар.=1Kgs +1 Цар=1Kgs +1 Цар.=1Kgs +2цар=2Kgs +2цар.=2Kgs +2 цар=2Kgs +2 цар.=2Kgs +2Цар=2Kgs +2Цар.=2Kgs +2 Цар=2Kgs +2 Цар.=2Kgs +1Ñ…Ñ€=1Chr +1Ñ…Ñ€.=1Chr +1 Ñ…Ñ€=1Chr +1 Ñ…Ñ€.=1Chr +1Хр=1Chr +1Хр.=1Chr +1 Хр=1Chr +1 Хр.=1Chr +2Ñ…Ñ€=2Chr +2Ñ…Ñ€.=2Chr +2 Ñ…Ñ€=2Chr +2 Ñ…Ñ€.=2Chr +2Хр=2Chr +2Хр.=2Chr +2 Хр=2Chr +2 Хр.=2Chr +езд=Ezra +езд.=Ezra +Езд=Ezra +Езд.=Ezra +неем=Neh +неем.=Neh +Ðеем=Neh +Ðеем.=Neh +еÑÑ‚=Esth +еÑÑ‚.=Esth +ЕÑÑ‚=Esth +ЕÑÑ‚.=Esth +йов=Job +Йов=Job +пÑ=Ps +пÑ.=Ps +ПÑ=Ps +ПÑ.=Ps +пр=Prov +пр.20 +Пр=Prov +Пр.=Prov +прип=Prov +прип.=Prov +Прип=Prov +Прип.=Prov +екл=Eccl +екл.=Eccl +еккл=Eccl +еклл.=Eccl +Еккл=Eccl +Еккл.=Eccl +Екл=Eccl +Екл.=Eccl +піÑн=Song +піÑн.=Song +ПіÑн=Song +ПіÑн.=Song +Ñ–Ñ=Isa +Ñ–Ñ.=Isa +ІÑ=Isa +ІÑ.=Isa +єр=Jer +єр.=Jer +Єр=Jer +Єр.=Jer +плач=Lam +плач.=Lam +Плач=Lam +Плач.=Lam +єз=Ezek +єз.=Ezek +Єз=Ezek +Єз.=Ezek +дан=Dan +дан.=Dan +Дан=Dan +Дан.=Dan +оÑ=Hos +оÑ.=Hos +ОÑ=Hos +ОÑ.=Hos +йоіл=Joel +Йоіл=Joel +ам=Amos +ам.=Amos +Ðм=Amos +Ðм.=Amos +овд=Obad +овд.=Obad +Овд=Obad +Овд.=Obad +йона=Jonah +Йона=Jonah +мих=Mic +мих.=Mic +Мих=Mic +Мих.=Mic +наум=Nah +Ðаум=Nah +ав=Hab +ав.=Hab +Ðв=Hab +Ðв.=Hab +Ñоф=Zeph +Ñоф.=Zeph +Соф=Zeph +Соф.=Zeph +ог=Hag +ог.=Hag +Ог=Hag +Ог.=Hag +зах=Zech +зах.=Zech +Зах=Zech +Зах.=Zech +мал=Mal +мал.=Mal +Мал=Mal +Мал.=Mal +мт=Matt +мт.=Matt +Мт=Matt +Мт.=Matt +мр=Mark +мр.=Mark +Мр=Mark +Мр.=Mark +лк=Luke +лк.=Luke +Лк=Luke +Лк.=Luke +ів=John +ів.=John +Ів=John +Ів.=John +дії=Acts +Дії=Acts +рим=Rom +рим.=Rom +Рим=Rom +Рим.=Rom +1кор=1Cor +1кор.=1Cor +1 кор=1Cor +1 кор.=1Cor +1Кор=1Cor +1Кор.=1Cor +1 Кор=1Cor +1 Кор.=1Cor +2кор=2Cor +2кор.=2Cor +2 кор=2Cor +2 кор.=2Cor +2Кор=2Cor +2Кор.=2Cor +2 Кор=2Cor +2 Кор.=2Cor +гал=Gal +гал.=Gal +Гал=Gal +Гал.=Gal +еф=Eph +еф.=Eph +Еф=Eph +Еф.=Eph +фил=Phil +фил.=Phil +Фил=Phil +Фил.=Phil +кол=Col +кол.=Col +Кол=Col +Кол.=Col +1Ñол=1Thess +1Ñол.=1Thess +1 Ñол=1Thess +1 Ñол.=1Thess +1Сол=1Thess +1Сол.=1Thess +1 Сол=1Thess +1 Сол.=1Thess +2Ñол=2Thess +2Ñол.=2Thess +2 Ñол=2Thess +2 Ñол.=2Thess +2Сол=2Thess +2Сол.=2Thess +2 Сол=2Thess +2 Сол.=2Thess +1тим=1Tim +1тим.=1Tim +1 тим=1Tim +1 тим.=1Tim +1Тим=1Tim +1Тим.=1Tim +1 Тим=1Tim +1 Тим.=1Tim +2тим=2Tim +2тим.=2Tim +2 тим=2Tim +2 тим.=2Tim +2Тим=2Tim +2Тим.=2Tim +2 Тим=2Tim +2 Тим.=2Tim +тит=Titus +тит.=Titus +Тит=Titus +Тит.=Titus +филим=Phlm +филим.=Phlm +Филим=Phlm +Филим.=Phlm +євр=Heb +євр.=Heb +Євр=Heb +Євр.=Heb +Ñк=Jas +Ñк.=Jas +Як=Jas +Як.=Jas +1петр=1Pet +1петр.=1Pet +1 петр=1Pet +1 петр.=1Pet +1Петр=1Pet +1Петр.=1Pet +1 Петр=1Pet +1 Петр.=1Pet +2петр=2Pet +2петр.=2Pet +2 петр=2Pet +2 петр.=2Pet +2Петр=2Pet +2Петр.=2Pet +2 Петр=2Pet +2 Петр.=2Pet +1ів=1John +1ів.=1John +1 ів=1John +1 ів.=1John +1Ів=1John +1Ів.=1John +1 Ів=1John +1 Ів.=1John +2ів=2John +2ів.=2John +2 ів=2John +2 ів.=2John +2Ів=2John +2Ів.=2John +2 Ів=2John +2 Ів.=2John +3ів=3John +3ів.=3John +3 ів=3John +3 ів.=3John +3Ів=3John +3Ів.=3John +3 Ів=3John +3 Ів.=3John +юд=Jude +юд.=Jude +Юд=Jude +Юд.=Jude +об=Rev +об.=Rev +Об=Rev +Об.=Rev diff --git a/locales.d/uk_UA-utf8.conf b/locales.d/uk_UA-utf8.conf deleted file mode 100644 index 4397581..0000000 --- a/locales.d/uk_UA-utf8.conf +++ /dev/null @@ -1,555 +0,0 @@ -# Ukrainian BIBLE -# БІБЛІЯ або КÐИГИ СВЯТОГО ПИСЬМРСТÐРОГО Й ÐОВОГО ЗÐПОВІТУ -# Працює під Linux Ñ– Windows верÑÑ–Ñ— проекту SWORD -# Pavlo Bohmat bohm@ukr.net - -[Meta] -Name=uk -Description=Ukrainian (Unicode) -Encoding=UTF-8 - -[Text] -Genesis=Ð‘ÑƒÑ‚Ñ‚Ñ -Exodus=Вихід -Leviticus=Левит -Numbers=ЧиÑла -Deuteronomy=ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€ÐµÐ½Ð½Ñ Ð—Ð°ÐºÐ¾Ð½Ñƒ -Joshua=ІÑÑƒÑ Ðавин -Judges=Суддів -Ruth=Рут -I Samuel=1. Самуїла -II Samuel=2. Самуїла -I Kings=1. Царів -II Kings=2. Царів -I Chronicles=1. Хроніки -II Chronicles=2. Хроніки -Ezra=Ездри -Nehemiah=Ðеемії -Esther=EÑтер -Job=Йова -Psalms=ПÑалмів -Proverbs=ПриповіÑтей -Ecclesiastes=ЕкклезіÑÑÑ‚ -Song of Solomon=ПіÑÐ½Ñ Ð½Ð°Ð´ піÑнÑми -Isaiah=ІÑаї -Jeremiah=Єремії -Lamentations=Плач Єремії -Ezekiel=Ð„Ð·ÐµÐºÑ–Ñ—Ð»Ñ -Daniel=Даниїла -Hosea=ОÑÑ–Ñ— -Joel=Йоіла -Amos=AмоÑа -Obadiah=ÐžÐ²Ð´Ñ–Ñ -Jonah=Йони -Micah=MÐ¸Ñ…ÐµÑ -Nahum=Ðаума -Habakkuk=Ðвакума -Zephaniah=Софонії -Haggai=ÐžÐ³Ñ–Ñ -Zechariah=Ð—Ð°Ñ…Ð°Ñ€Ñ–Ñ -Malachi=Малахії -Matthew=ÐœÐ°Ñ‚Ð²Ñ–Ñ -Mark=Марка -Luke=Луки -John=Івана -Acts=Дії -Romans=РимлÑн -I Corinthians=1. КоринтÑн -II Corinthians=2. КоринтÑн -Galatians=Галатів -Ephesians=ЕфеÑÑн -Philippians=Филип'Ñн -Colossians=КолоÑÑн -I Thessalonians=1. СолунÑн -II Thessalonians=2. СолунÑн -I Timothy=1. Ð¢Ð¸Ð¼Ð¾Ñ„Ñ–Ñ -II Timothy=2. Ð¢Ð¸Ð¼Ð¾Ñ„Ñ–Ñ -Titus=Тита -Philemon=Филимона -Hebrews=Євреїв -James=Якова -I Peter=1. Петра -II Peter=2. Петра -I John=1. Івана -II John=2. Івана -III John=3. Івана -Jude=Юди -Revelation of John=Об'ÑÐ²Ð»ÐµÐ½Ð½Ñ - -[Book Abbrevs] - -БуттÑ=Gen -Вихід=Exod -Левит=Lev -ЧиÑла=Num -ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€ÐµÐ½Ð½Ñ Ð—Ð°ÐºÐ¾Ð½Ñƒ=Deut -ІÑÑƒÑ Ðавин=Josh -Суддів=Judg -Рут=Ruth - -1. Самуїла=1Sam -1 Самуїла=1Sam -1Самуїла=1Sam - -2. Самуїла=2Sam -2 Самуїла=2Sam -2Самуїла=2Sam - -1. Царів=1Kgs -1 Царів=1Kgs -1Царів=1Kgs - -2. Царів=2Kgs -2 Царів=2Kgs -2Царів=2Kgs - -1. Хроніки=1Chr -1 Хроніки=1Chr -1Хроніки=1Chr - -2. Хроніки=2Chr -2 Хроніки=2Chr -2Хроніки=2Chr - -Ездри=Ezra -Ðеемії=Neh -EÑтер=Esth -Йова=Job -ПÑалмів=Ps -ПриповіÑтей=Prov -ЕкклезіÑÑÑ‚=Eccl -ПіÑÐ½Ñ Ð½Ð°Ð´ піÑнÑми=Song -ІÑаї=Isa -Єремії=Jer -Плач Єремії=Lam -ЄзекіїлÑ=Ezek -Даниїла=Dan -ОÑÑ–Ñ—=Hos -Йоіла=Joel -AмоÑа=Amos -ОвдіÑ=Obad -Йони=Jonah -MихеÑ=Mic -Ðаума=Nah -Ðвакума=Hab -Софонії=Zeph -ОгіÑ=Hag -ЗахаріÑ=Zech -Малахії=Mal -МатвіÑ=Matt -Марка=Mark -Луки=Luke -Івана=John -Дії=Acts -РимлÑн=Rom - -1. КоринтÑн=1Cor -1 КоринтÑн=1Cor -1КоринтÑн=1Cor - -2. КоринтÑн=2Cor -2 КоринтÑн=2Cor -2КоринтÑн=2Cor - -Галатів=Gal -ЕфеÑÑн=Eph -Филип'Ñн=Phil -КолоÑÑн=Col - -1. СолунÑн=1Thess -1 СолунÑн=1Thess -1СолунÑн=1Thess - -2. СолунÑн=2Thess -2 СолунÑн=2Thess -2СолунÑн=2Thess - -1. ТимофіÑ=1Tim -1 ТимофіÑ=1Tim -1ТимофіÑ=1Tim - -2. ТимофіÑ=2Tim -2 ТимофіÑ=2Tim -2ТимофіÑ=2Tim - -Тита=Titus -Филимона=Phlm -Євреїв=Heb -Якова=Jas - -1. Петра=1Pet -1 Петра=1Pet -1Петра=1Pet - -2. Петра=2Pet -2 Петра=2Pet -2Петра=2Pet - -1. Івана=1John -1 Івана=1John -1Івана=1John - -2. Івана=2John -2 Івана=2John -2Івана=2John - -3. Івана=3John -3 Івана=3John -3Івана=3John - -Юди=Jude -Об'ÑвленнÑ=Rev - -бут=Gen -бут.=Gen -Бут=Gen -Бут.=Gen -1Ðœ=Gen -1Ðœ.=Gen -1 Ðœ=Gen -1 Ðœ.=Gen -вих=Exod -вих.=Exod -Вих=Exod -Вих.=Exod -2Ðœ=Exod -2Ðœ.=Exod -2 Ðœ=Exod -2 Ðœ.=Exod -лев=Lev -лев.=Lev -Лев=Lev -Лев.=Lev -3Ðœ=Lev -3Ðœ.=Lev -3 Ðœ=Lev -3 Ðœ.=Lev -чиÑ=Num -чиÑ.=Num -ЧиÑ=Num -ЧиÑ.=Num -4Ðœ=Num -4Ðœ.=Num -4 Ðœ=Num -4 Ðœ.=Num -повт. зак.=Deut -повт зак=Deut -Повт Зак=Deut -Повт. Зак.=Deut -5Ðœ=Deut -5Ðœ.=Deut -5 Ðœ=Deut -5 Ðœ.=Deut -Ñ–ÑÑƒÑ Ð½Ð°Ð²Ð¸Ð½=Josh -Ðавин=Josh -навин=Josh -єгошуї=Josh -Єгошуї=Josh -єг=Josh -єг.=Josh -Єг=Josh -Єг.=Josh -Ñуд=Judg -Ñуд.=Judg -Суд=Judg -Суд.=Judg -рут=Ruth -Рут=Ruth -1Ñам=1Sam -1Ñам.=1Sam -1 Ñам=1Sam -1 Ñам.=1Sam -1Сам=1Sam -1Сам.=1Sam -1 Сам=1Sam -1 Сам.=1Sam -2Ñам=2Sam -2Ñам.=2Sam -2 Ñам=2Sam -2 Ñам.=2Sam -2Сам=2Sam -2Сам.=2Sam -2 Сам=2Sam -2 Сам.=2Sam -1цар=1Kgs -1цар.=1Kgs -1 цар=1Kgs -1 цар.=1Kgs -1Цар=1Kgs -1Цар.=1Kgs -1 Цар=1Kgs -1 Цар.=1Kgs -2цар=2Kgs -2цар.=2Kgs -2 цар=2Kgs -2 цар.=2Kgs -2Цар=2Kgs -2Цар.=2Kgs -2 Цар=2Kgs -2 Цар.=2Kgs -1Ñ…Ñ€=1Chr -1Ñ…Ñ€.=1Chr -1 Ñ…Ñ€=1Chr -1 Ñ…Ñ€.=1Chr -1Хр=1Chr -1Хр.=1Chr -1 Хр=1Chr -1 Хр.=1Chr -2Ñ…Ñ€=2Chr -2Ñ…Ñ€.=2Chr -2 Ñ…Ñ€=2Chr -2 Ñ…Ñ€.=2Chr -2Хр=2Chr -2Хр.=2Chr -2 Хр=2Chr -2 Хр.=2Chr -езд=Ezra -езд.=Ezra -Езд=Ezra -Езд.=Ezra -неем=Neh -неем.=Neh -Ðеем=Neh -Ðеем.=Neh -еÑÑ‚=Esth -еÑÑ‚.=Esth -ЕÑÑ‚=Esth -ЕÑÑ‚.=Esth -йов=Job -Йов=Job -пÑ=Ps -пÑ.=Ps -ПÑ=Ps -ПÑ.=Ps -пр=Prov -пр.20 -Пр=Prov -Пр.=Prov -прип=Prov -прип.=Prov -Прип=Prov -Прип.=Prov -екл=Eccl -екл.=Eccl -еккл=Eccl -еклл.=Eccl -Еккл=Eccl -Еккл.=Eccl -Екл=Eccl -Екл.=Eccl -піÑн=Song -піÑн.=Song -ПіÑн=Song -ПіÑн.=Song -Ñ–Ñ=Isa -Ñ–Ñ.=Isa -ІÑ=Isa -ІÑ.=Isa -єр=Jer -єр.=Jer -Єр=Jer -Єр.=Jer -плач=Lam -плач.=Lam -Плач=Lam -Плач.=Lam -єз=Ezek -єз.=Ezek -Єз=Ezek -Єз.=Ezek -дан=Dan -дан.=Dan -Дан=Dan -Дан.=Dan -оÑ=Hos -оÑ.=Hos -ОÑ=Hos -ОÑ.=Hos -йоіл=Joel -Йоіл=Joel -ам=Amos -ам.=Amos -Ðм=Amos -Ðм.=Amos -овд=Obad -овд.=Obad -Овд=Obad -Овд.=Obad -йона=Jonah -Йона=Jonah -мих=Mic -мих.=Mic -Мих=Mic -Мих.=Mic -наум=Nah -Ðаум=Nah -ав=Hab -ав.=Hab -Ðв=Hab -Ðв.=Hab -Ñоф=Zeph -Ñоф.=Zeph -Соф=Zeph -Соф.=Zeph -ог=Hag -ог.=Hag -Ог=Hag -Ог.=Hag -зах=Zech -зах.=Zech -Зах=Zech -Зах.=Zech -мал=Mal -мал.=Mal -Мал=Mal -Мал.=Mal -мт=Matt -мт.=Matt -Мт=Matt -Мт.=Matt -мр=Mark -мр.=Mark -Мр=Mark -Мр.=Mark -лк=Luke -лк.=Luke -Лк=Luke -Лк.=Luke -ів=John -ів.=John -Ів=John -Ів.=John -дії=Acts -Дії=Acts -рим=Rom -рим.=Rom -Рим=Rom -Рим.=Rom -1кор=1Cor -1кор.=1Cor -1 кор=1Cor -1 кор.=1Cor -1Кор=1Cor -1Кор.=1Cor -1 Кор=1Cor -1 Кор.=1Cor -2кор=2Cor -2кор.=2Cor -2 кор=2Cor -2 кор.=2Cor -2Кор=2Cor -2Кор.=2Cor -2 Кор=2Cor -2 Кор.=2Cor -гал=Gal -гал.=Gal -Гал=Gal -Гал.=Gal -еф=Eph -еф.=Eph -Еф=Eph -Еф.=Eph -фил=Phil -фил.=Phil -Фил=Phil -Фил.=Phil -кол=Col -кол.=Col -Кол=Col -Кол.=Col -1Ñол=1Thess -1Ñол.=1Thess -1 Ñол=1Thess -1 Ñол.=1Thess -1Сол=1Thess -1Сол.=1Thess -1 Сол=1Thess -1 Сол.=1Thess -2Ñол=2Thess -2Ñол.=2Thess -2 Ñол=2Thess -2 Ñол.=2Thess -2Сол=2Thess -2Сол.=2Thess -2 Сол=2Thess -2 Сол.=2Thess -1тим=1Tim -1тим.=1Tim -1 тим=1Tim -1 тим.=1Tim -1Тим=1Tim -1Тим.=1Tim -1 Тим=1Tim -1 Тим.=1Tim -2тим=2Tim -2тим.=2Tim -2 тим=2Tim -2 тим.=2Tim -2Тим=2Tim -2Тим.=2Tim -2 Тим=2Tim -2 Тим.=2Tim -тит=Titus -тит.=Titus -Тит=Titus -Тит.=Titus -филим=Phlm -филим.=Phlm -Филим=Phlm -Филим.=Phlm -євр=Heb -євр.=Heb -Євр=Heb -Євр.=Heb -Ñк=Jas -Ñк.=Jas -Як=Jas -Як.=Jas -1петр=1Pet -1петр.=1Pet -1 петр=1Pet -1 петр.=1Pet -1Петр=1Pet -1Петр.=1Pet -1 Петр=1Pet -1 Петр.=1Pet -2петр=2Pet -2петр.=2Pet -2 петр=2Pet -2 петр.=2Pet -2Петр=2Pet -2Петр.=2Pet -2 Петр=2Pet -2 Петр.=2Pet -1ів=1John -1ів.=1John -1 ів=1John -1 ів.=1John -1Ів=1John -1Ів.=1John -1 Ів=1John -1 Ів.=1John -2ів=2John -2ів.=2John -2 ів=2John -2 ів.=2John -2Ів=2John -2Ів.=2John -2 Ів=2John -2 Ів.=2John -3ів=3John -3ів.=3John -3 ів=3John -3 ів.=3John -3Ів=3John -3Ів.=3John -3 Ів=3John -3 Ів.=3John -юд=Jude -юд.=Jude -Юд=Jude -Юд.=Jude -об=Rev -об.=Rev -Об=Rev -Об.=Rev diff --git a/ltmain.sh b/ltmain.sh old mode 100755 new mode 100644 index a72f2fd..63ae69d --- a/ltmain.sh +++ b/ltmain.sh @@ -1,9 +1,9 @@ -# Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6b +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -32,50 +32,57 @@ # # Provide generalized library-building support services. # -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print informational messages (default) -# --version print version information -# -h, --help print short or long help message +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --no-warn don't display warning messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message # # MODE must be one of the following: # -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory # -# MODE-ARGS vary depending on the MODE. +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.4.2 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . -PROGRAM=ltmain.sh +PROGRAM=libtool PACKAGE=libtool -VERSION=2.2.6b +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3017 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -91,10 +98,15 @@ fi BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + # NLS nuisances: We save the old values to restore during execute mode. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -107,24 +119,28 @@ do lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL $lt_unset CDPATH +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" : ${CP="cp -f"} -: ${ECHO="echo"} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -144,6 +160,27 @@ IFS=" $lt_nl" dirname="s,/[^/]*$,," basename="s,^.*/,," +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -158,33 +195,183 @@ basename="s,^.*/,," # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation + + +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result } -# Generated shell functions inserted here. +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} # The name of this program: -# In the unlikely event $progname began with a '-', it would play havoc with -# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result -case $progname in - -*) progname=./$progname ;; -esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -196,7 +383,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -215,6 +402,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -243,7 +439,7 @@ opt_warning=: # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: $*" + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } # func_verbose arg... @@ -258,18 +454,25 @@ func_verbose () : } +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + # func_error arg... # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -326,9 +529,9 @@ func_mkdir_p () case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` done - my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -378,7 +581,7 @@ func_mktempdir () func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "X$my_tmpdir" | $Xsed + $ECHO "$my_tmpdir" } @@ -392,7 +595,7 @@ func_quote_for_eval () { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -419,7 +622,7 @@ func_quote_for_expand () { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "X$1" | $Xsed \ + my_arg=`$ECHO "$1" | $SED \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -488,15 +691,39 @@ func_show_eval_locale () fi } - - +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} # func_version # Echo version message to standard output and exit. func_version () { - $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + $opt_debug + + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -509,22 +736,28 @@ func_version () # Echo short help message to standard output and exit. func_usage () { - $SED -n '/^# Usage:/,/# -h/ { + $opt_debug + + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - $ECHO + echo $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help -# Echo long help message to standard output and exit. +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. func_help () { + $opt_debug + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -534,11 +767,18 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p - }' < "$progpath" - exit $? + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret + fi } # func_missing_arg argname @@ -546,63 +786,106 @@ func_help () # exit_cmd. func_missing_arg () { - func_error "missing argument for $1" + $opt_debug + + func_error "missing argument for $1." exit_cmd=exit } -exit_cmd=: +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation + +exit_cmd=: -# Check that we have a working $ECHO. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell, and then maybe $ECHO will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -636,16 +919,16 @@ func_config () # Display the features supported by this script. func_features () { - $ECHO "host: $host" + echo "host: $host" if test "$build_libtool_libs" = yes; then - $ECHO "enable shared libraries" + echo "enable shared libraries" else - $ECHO "disable shared libraries" + echo "disable shared libraries" fi if test "$build_old_libs" = yes; then - $ECHO "enable static libraries" + echo "enable static libraries" else - $ECHO "disable static libraries" + echo "disable static libraries" fi exit $? @@ -692,117 +975,209 @@ func_enable_tag () esac } -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () { + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac + + + +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_warning=: +opt_verbose=: +opt_silent=false +opt_verbose=false - # Shorthand for --mode=foo, only valid as the first argument - case $1 in - clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; - compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; - execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; - finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; - install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; - link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac - # Parse non-mode specific arguments: - while test "$#" -gt 0; do +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do opt="$1" shift - case $opt in - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" + --debug|-x) opt_debug='set -x' func_echo "enabling shell trace mode" - opt_debug='set -x' $opt_debug ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift + --dry-run|--dryrun|-n) + opt_dry_run=: ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - case $1 in - # Valid mode arguments: - clean) ;; - compile) ;; - execute) ;; - finish) ;; - install) ;; - link) ;; - relink) ;; - uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; - esac - - mode="$1" + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" shift ;; - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: + opt_preserve_dup_deps=: ;; - - --verbose| -v) preserve_args="$preserve_args $opt" + --features) + opt_features=: +func_features + ;; + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) opt_silent=false +func_append preserve_args " $opt" ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; + --no-verbose) + opt_verbose=false +func_append preserve_args " $opt" + ;; + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" shift ;; + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + # Separate optargs to long options: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} shift ;; - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; esac done + # Validate options: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi + + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -810,82 +1185,44 @@ func_enable_tag () opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps ;; esac - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} + $opt_help || { + # Sanity checks first: + func_check_version_match -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi - exit $EXIT_MISMATCH - fi -} - - -## ----------- ## -## Main. ## -## ----------- ## - -$opt_help || { - # Sanity checks first: - func_check_version_match + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi - test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$mode' for more information." -} +## ----------- ## +## Main. ## +## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -950,12 +1287,9 @@ func_ltwrapper_executable_p () # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" } # func_ltwrapper_p file @@ -1001,6 +1335,37 @@ func_source () } +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1013,13 +1378,15 @@ func_infer_tag () if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1030,11 +1397,13 @@ func_infer_tag () CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1097,6 +1466,486 @@ EOF } } + +################################################## +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # +################################################## + +# func_convert_core_file_wine_to_w32 ARG +# Helper function used by file name conversion functions when $build is *nix, +# and $host is mingw, cygwin, or some other w32 environment. Relies on a +# correctly configured wine environment available, with the winepath program +# in $build's $PATH. +# +# ARG is the $build file name to be converted to w32 format. +# Result is available in $func_convert_core_file_wine_to_w32_result, and will +# be empty on error (or when ARG is empty) +func_convert_core_file_wine_to_w32 () +{ + $opt_debug + func_convert_core_file_wine_to_w32_result="$1" + if test -n "$1"; then + # Unfortunately, winepath does not exit with a non-zero error code, so we + # are forced to check the contents of stdout. On the other hand, if the + # command is not found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both error code of + # zero AND non-empty stdout, which explains the odd construction: + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_nix_to_cygwin + + # func_mode_compile arg... func_mode_compile () { @@ -1137,12 +1986,12 @@ func_mode_compile () ;; -pie | -fpie | -fPIE) - pie_flag="$pie_flag $arg" + func_append pie_flag " $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" + func_append later " $arg" continue ;; @@ -1163,15 +2012,14 @@ func_mode_compile () save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" - func_quote_for_eval "$arg" - lastarg="$lastarg $func_quote_for_eval_result" + func_append_quoted lastarg "$arg" done IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" + func_append base_compile " $lastarg" continue ;; @@ -1187,8 +2035,7 @@ func_mode_compile () esac # case $arg_mode # Aesthetically quote the previous argument. - func_quote_for_eval "$lastarg" - base_compile="$base_compile $func_quote_for_eval_result" + func_append_quoted base_compile "$lastarg" done # for arg case $arg_mode in @@ -1213,7 +2060,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -1288,7 +2135,7 @@ func_mode_compile () # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" else output_obj= @@ -1319,17 +2166,16 @@ compiler." $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - removelist="$removelist $output_obj" + func_append removelist " $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" + func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -1349,7 +2195,7 @@ compiler." if test -z "$output_obj"; then # Place PIC objects in $objdir - command="$command -o $lobj" + func_append command " -o $lobj" fi func_show_eval_locale "$command" \ @@ -1396,11 +2242,11 @@ compiler." command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - command="$command -o $obj" + func_append command " -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" + func_append command "$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -1445,13 +2291,13 @@ compiler." } $opt_help || { -test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $mode in + case $opt_mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -1482,10 +2328,11 @@ This mode accepts the following additional options: -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -1538,7 +2385,7 @@ either the \`install' or \`cp' program. The following components of INSTALL-COMMAND are treated specially: - -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -1558,6 +2405,8 @@ The following components of LINK-COMMAND are treated specially: -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) @@ -1586,6 +2435,11 @@ The following components of LINK-COMMAND are treated specially: -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -1619,18 +2473,44 @@ Otherwise, only FILE itself is deleted using RM." ;; *) - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac - $ECHO + echo $ECHO "Try \`$progname --help' for more information about other modes." - - exit $? } - # Now that we've collected a possible --mode arg, show help if necessary - $opt_help && func_mode_help +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test "$opt_help" = :; then + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi # func_mode_execute arg... @@ -1643,13 +2523,16 @@ func_mode_execute () func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do + for file in $opt_dlopen; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -1671,7 +2554,7 @@ func_mode_execute () dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" + func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -1712,7 +2595,7 @@ func_mode_execute () for file do case $file in - -*) ;; + -* | *.la | *.lo ) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -1728,8 +2611,7 @@ func_mode_execute () ;; esac # Quote arguments (to preserve shell metacharacters). - func_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" + func_append_quoted args "$file" done if test "X$opt_dry_run" = Xfalse; then @@ -1754,29 +2636,66 @@ func_mode_execute () # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - $ECHO "export $shlibpath_var" + echo "export $shlibpath_var" fi $ECHO "$cmd$args" exit $EXIT_SUCCESS fi } -test "$mode" = execute && func_mode_execute ${1+"$@"} +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libdirs="$nonopt" + libs= + libdirs= admincmds= - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -1786,7 +2705,7 @@ func_mode_finish () if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $opt_dry_run || eval "$cmds" || func_append admincmds " $cmds" fi done @@ -1795,53 +2714,55 @@ func_mode_finish () # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - $ECHO "X----------------------------------------------------------------------" | $Xsed - $ECHO "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - $ECHO - $ECHO "If you ever happen to want to link against installed libraries" - $ECHO "in a given directory, LIBDIR, you must either use libtool, and" - $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" - $ECHO "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" - $ECHO " during execution" - fi - if test -n "$runpath_var"; then - $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" - $ECHO " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $ECHO + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo - $ECHO "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" - $ECHO "pages." - ;; - *) - $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - $ECHO "X----------------------------------------------------------------------" | $Xsed + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi exit $EXIT_SUCCESS } -test "$mode" = finish && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -1852,7 +2773,7 @@ func_mode_install () # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - $ECHO "X$nonopt" | $GREP shtool >/dev/null; then + case $nonopt in *shtool*) :;; *) false;; esac; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -1866,7 +2787,12 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - install_prog="$install_prog$func_quote_for_eval_result" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac # We need to accept at least all the BSD install flags. dest= @@ -1876,10 +2802,12 @@ func_mode_install () install_type= isdir=no stripme= + no_mode=: for arg do + arg2= if test -n "$dest"; then - files="$files $dest" + func_append files " $dest" dest=$arg continue fi @@ -1887,10 +2815,9 @@ func_mode_install () case $arg in -d) isdir=yes ;; -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac + if $install_cp; then :; else + prev=$arg + fi ;; -g | -m | -o) prev=$arg @@ -1904,6 +2831,10 @@ func_mode_install () *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi prev= else dest=$arg @@ -1914,7 +2845,11 @@ func_mode_install () # Aesthetically quote the argument. func_quote_for_eval "$arg" - install_prog="$install_prog $func_quote_for_eval_result" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -1923,6 +2858,13 @@ func_mode_install () test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -1977,10 +2919,13 @@ func_mode_install () case $file in *.$libext) # Do the static libraries later. - staticlibs="$staticlibs $file" + func_append staticlibs " $file" ;; *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -1994,23 +2939,23 @@ func_mode_install () if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + *) func_append current_libdirs " $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + *) func_append future_libdirs " $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - dir="$dir$objdir" + func_append dir "$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2023,9 +2968,9 @@ func_mode_install () if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2043,7 +2988,7 @@ func_mode_install () test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -2083,7 +3028,7 @@ func_mode_install () func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + test -n "$old_library" && func_append staticlibs " $dir/$old_library" ;; *.lo) @@ -2183,7 +3128,7 @@ func_mode_install () if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -2202,7 +3147,7 @@ func_mode_install () file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -2221,7 +3166,7 @@ func_mode_install () } else # Install the binary that we compiled earlier. - file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -2257,11 +3202,13 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -2280,7 +3227,7 @@ func_mode_install () fi } -test "$mode" = install && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -2323,6 +3270,22 @@ func_generate_dlsyms () extern \"C\" { #endif +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + /* External symbol declarations for the compiler. */\ " @@ -2332,10 +3295,11 @@ extern \"C\" { $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -2371,7 +3335,7 @@ extern \"C\" { eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin | *mingw* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -2384,10 +3348,52 @@ extern \"C\" { func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac done $opt_dry_run || { @@ -2415,36 +3421,19 @@ extern \"C\" { if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { const char *name; void *address; } lt_dlsymlist; -" - case $host in - *cygwin* | *mingw* | *cegcc* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - $ECHO >> "$output_objdir/$my_dlsyms" "\ -extern $lt_dlsym_const lt_dlsymlist +extern LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -$lt_dlsym_const lt_dlsymlist +LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -2457,7 +3446,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] = eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -2484,7 +3473,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -2500,7 +3489,7 @@ static const void *lt_preloaded_setup() { for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -2515,16 +3504,16 @@ static const void *lt_preloaded_setup() { case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -2538,8 +3527,8 @@ static const void *lt_preloaded_setup() { # really was required. # Nullify the symbol file. - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` fi } @@ -2549,6 +3538,7 @@ static const void *lt_preloaded_setup() { # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -2559,9 +3549,11 @@ func_win32_libid () win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | $SED -n -e ' 1,100{ / I /{ @@ -2590,6 +3582,131 @@ func_win32_libid () $ECHO "$win32_libid_type" } +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} # func_extract_an_archive dir oldlib @@ -2598,7 +3715,18 @@ func_extract_an_archive () $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' + if test "$lock_old_archive_extraction" = yes; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -2669,7 +3797,7 @@ func_extract_archives () darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -2684,25 +3812,30 @@ func_extract_archives () func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done func_extract_archives_result="$my_oldobjs" } - -# func_emit_wrapper_part1 [arg=no] +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. # -# Emit the first part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part1 () +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () { - func_emit_wrapper_part1_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part1_arg1=$1 - fi + func_emit_wrapper_arg1=${1-no} $ECHO "\ #! $SHELL @@ -2718,7 +3851,6 @@ func_emit_wrapper_part1 () # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # Be Bourne compatible @@ -2749,31 +3881,135 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then else # When we are sourced in execute mode, \$file and \$ECHO are already set. if test \"\$libtool_execute_magic\" != \"$magic\"; then - ECHO=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$ECHO works! - : - else - # Restart under the correct shell, and then maybe \$ECHO will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ " - $ECHO "\ + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} # Find the directory that this script lives in. - thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -2783,30 +4019,13 @@ else esac fi - file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` done -" -} -# end: func_emit_wrapper_part1 - -# func_emit_wrapper_part2 [arg=no] -# -# Emit the second part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part2 () -{ - func_emit_wrapper_part2_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part2_arg1=$1 - fi - - $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -2814,7 +4033,7 @@ func_emit_wrapper_part2 () fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -2869,6 +4088,18 @@ func_emit_wrapper_part2 () if test -f \"\$progdir/\$program\"; then" + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -2877,253 +4108,28 @@ func_emit_wrapper_part2 () # Some systems cannot cope with colon-terminated $shlibpath_var # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` export $shlibpath_var " fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 + func_exec_program \${1+\"\$@\"} fi else # The program doesn't exist. \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ " } -# end: func_emit_wrapper_part2 - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=no - if test -n "$1" ; then - func_emit_wrapper_arg1=$1 - fi - - # split this up so that func_emit_cwrapperexe_src - # can call each part independently. - func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" - func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" -} - - -# func_to_host_path arg -# -# Convert paths to host format when used with build tools. -# Intended for use with "native" mingw (where libtool itself -# is running under the msys shell), or in the following cross- -# build environments: -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# where wine is equipped with the `winepath' executable. -# In the native mingw case, the (msys) shell automatically -# converts paths for any non-msys applications it launches, -# but that facility isn't available from inside the cwrapper. -# Similar accommodations are necessary for $host mingw and -# $build cygwin. Calling this function does no harm for other -# $host/$build combinations not listed above. -# -# ARG is the path (on $build) that should be converted to -# the proper representation for $host. The result is stored -# in $func_to_host_path_result. -func_to_host_path () -{ - func_to_host_path_result="$1" - if test -n "$1" ; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in - *mingw* ) # actually, msys - # awkward: cmd appends spaces to result - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_path_tmp1=`( cmd //c echo "$1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_path_tmp1=`cygpath -w "$1"` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # Unfortunately, winepath does not exit with a non-zero - # error code, so we are forced to check the contents of - # stdout. On the other hand, if the command is not - # found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both - # error code of zero AND non-empty stdout, which explains - # the odd construction: - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - else - # Allow warning below. - func_to_host_path_result="" - fi - ;; - esac - if test -z "$func_to_host_path_result" ; then - func_error "Could not determine host path corresponding to" - func_error " '$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_path_result="$1" - fi - ;; - esac - fi -} -# end: func_to_host_path -# func_to_host_pathlist arg -# -# Convert pathlists to host format when used with build tools. -# See func_to_host_path(), above. This function supports the -# following $build/$host combinations (but does no harm for -# combinations not listed here): -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# -# Path separators are also converted from $build format to -# $host format. If ARG begins or ends with a path separator -# character, it is preserved (but converted to $host format) -# on output. -# -# ARG is a pathlist (on $build) that should be converted to -# the proper representation on $host. The result is stored -# in $func_to_host_pathlist_result. -func_to_host_pathlist () -{ - func_to_host_pathlist_result="$1" - if test -n "$1" ; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_to_host_pathlist_tmp2="$1" - # Once set for this call, this variable should not be - # reassigned. It is used in tha fallback case. - func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e 's|^:*||' -e 's|:*$||'` - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # unfortunately, winepath doesn't convert pathlists - func_to_host_pathlist_result="" - func_to_host_pathlist_oldIFS=$IFS - IFS=: - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do - IFS=$func_to_host_pathlist_oldIFS - if test -n "$func_to_host_pathlist_f" ; then - func_to_host_path "$func_to_host_pathlist_f" - if test -n "$func_to_host_path_result" ; then - if test -z "$func_to_host_pathlist_result" ; then - func_to_host_pathlist_result="$func_to_host_path_result" - else - func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" - fi - fi - fi - IFS=: - done - IFS=$func_to_host_pathlist_oldIFS - ;; - esac - if test -z "$func_to_host_pathlist_result" ; then - func_error "Could not determine the host path(s) corresponding to" - func_error " '$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This may break if $1 contains DOS-style drive - # specifications. The fix is not to complicate the expression - # below, but for the user to provide a working wine installation - # with winepath so that path translation in the cross-to-mingw - # case works properly. - lt_replace_pathsep_nix_to_dos="s|:|;|g" - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_replace_pathsep_nix_to_dos"` - fi - # Now, add the leading and trailing path separators back - case "$1" in - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" - ;; - esac - case "$1" in - *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" - ;; - esac - ;; - esac - fi -} -# end: func_to_host_pathlist # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout @@ -3141,31 +4147,23 @@ func_emit_cwrapperexe_src () This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. - - Currently, it simply execs the wrapper *script* "$SHELL $output", - but could eventually absorb all of the scripts functionality and - exec $objdir/$outputname directly. */ EOF cat <<"EOF" +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE 1 +#endif #include #include #ifdef _MSC_VER # include # include # include -# define setmode _setmode #else # include # include # ifdef __CYGWIN__ # include -# define HAVE_SETENV -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif # endif #endif #include @@ -3177,6 +4175,44 @@ int setenv (const char *, const char *, int); #include #include +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined (other platforms) ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ +#endif + #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX #elif defined(MAXPATHLEN) @@ -3192,14 +4228,7 @@ int setenv (const char *, const char *, int); # define S_IXGRP 0 #endif -#ifdef _MSC_VER -# define S_IXUSR _S_IEXEC -# define stat _stat -# ifndef _INTPTR_T_DEFINED -# define intptr_t int -# endif -#endif - +/* path handling portability macros */ #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -3230,10 +4259,6 @@ int setenv (const char *, const char *, int); # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ -#ifdef __CYGWIN__ -# define FOPEN_WB "wb" -#endif - #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -3246,22 +4271,13 @@ int setenv (const char *, const char *, int); if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#undef LTWRAPPER_DEBUGPRINTF -#if defined DEBUGWRAPPER -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args -static void -ltwrapper_debugprintf (const char *fmt, ...) -{ - va_list args; - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); -} +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; #else -# define LTWRAPPER_DEBUGPRINTF(args) +static int lt_debug = 0; #endif -const char *program_name = NULL; +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -3271,41 +4287,27 @@ char *chase_symlinks (const char *pathspec); int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_fatal (const char *message, ...); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); void lt_setenv (const char *name, const char *value); char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_opt_process_env_set (const char *arg); -void lt_opt_process_env_prepend (const char *arg); -void lt_opt_process_env_append (const char *arg); -int lt_split_name_value (const char *arg, char** name, char** value); void lt_update_exe_path (const char *name, const char *value); void lt_update_lib_path (const char *name, const char *value); - -static const char *script_text_part1 = -EOF - - func_emit_wrapper_part1 yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ "/' -e 's/$/\\n"/' - echo ";" - cat <"))); + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", + nonnull (lt_argv_zero)); for (i = 0; i < newargc; i++) { - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", + i, nonnull (newargz[i])); } EOF @@ -3560,11 +4523,14 @@ EOF mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ + newargz = prepare_spawn (newargz); rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); + lt_debugprintf (__FILE__, __LINE__, + "(main) failed to launch target \"%s\": %s\n", + lt_argv_zero, nonnull (strerror (errno))); return 127; } return rval; @@ -3586,7 +4552,7 @@ xmalloc (size_t num) { void *p = (void *) malloc (num); if (!p) - lt_fatal ("Memory exhausted"); + lt_fatal (__FILE__, __LINE__, "memory exhausted"); return p; } @@ -3620,8 +4586,8 @@ check_executable (const char *path) { struct stat st; - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3638,8 +4604,8 @@ make_executable (const char *path) int rval = 0; struct stat st; - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3665,8 +4631,8 @@ find_executable (const char *wrapper) int tmp_len; char *concat_name; - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -3719,7 +4685,8 @@ find_executable (const char *wrapper) { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -3744,7 +4711,8 @@ find_executable (const char *wrapper) } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -3770,8 +4738,9 @@ chase_symlinks (const char *pathspec) int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", - tmp_pathspec)); + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); if (lstat (tmp_pathspec, &s) == 0) { if (S_ISLNK (s.st_mode) != 0) @@ -3793,8 +4762,9 @@ chase_symlinks (const char *pathspec) } else { - char *errstr = strerror (errno); - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); } } XFREE (tmp_pathspec); @@ -3807,7 +4777,8 @@ chase_symlinks (const char *pathspec) tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal ("Could not follow symlinks for %s", pathspec); + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -3833,11 +4804,25 @@ strendzap (char *str, const char *pat) return str; } +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + static void -lt_error_core (int exit_status, const char *mode, +lt_error_core (int exit_status, const char *file, + int line, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s: %s: ", program_name, mode); + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -3846,20 +4831,32 @@ lt_error_core (int exit_status, const char *mode, } void -lt_fatal (const char *message, ...) +lt_fatal (const char *file, int line, const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); va_end (ap); } +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + void lt_setenv (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ @@ -3904,95 +4901,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) return new_value; } -int -lt_split_name_value (const char *arg, char** name, char** value) -{ - const char *p; - int len; - if (!arg || !*arg) - return 1; - - p = strchr (arg, (int)'='); - - if (!p) - return 1; - - *value = xstrdup (++p); - - len = strlen (arg) - strlen (*value); - *name = XMALLOC (char, len); - strncpy (*name, arg, len-1); - (*name)[len - 1] = '\0'; - - return 0; -} - -void -lt_opt_process_env_set (const char *arg) -{ - char *name = NULL; - char *value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); - } - - lt_setenv (name, value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_prepend (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_append (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 1); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - void lt_update_exe_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4011,9 +4925,9 @@ lt_update_exe_path (const char *name, const char *value) void lt_update_lib_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4023,11 +4937,158 @@ lt_update_lib_path (const char *name, const char *value) } } +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' + cat <<"EOF" +} EOF } # end: func_emit_cwrapperexe_src +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + # func_mode_link arg... func_mode_link () { @@ -4072,6 +5133,7 @@ func_mode_link () new_inherited_linker_flags= avoid_version=no + bindir= dlfiles= dlprefiles= dlself=no @@ -4164,6 +5226,11 @@ func_mode_link () esac case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -4195,9 +5262,9 @@ func_mode_link () ;; *) if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" + func_append dlfiles " $arg" else - dlprefiles="$dlprefiles $arg" + func_append dlprefiles " $arg" fi prev= continue @@ -4221,7 +5288,7 @@ func_mode_link () *-*-darwin*) case "$deplibs " in *" $qarg.ltframework "*) ;; - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later + *) func_append deplibs " $qarg.ltframework" # this is fixed later ;; esac ;; @@ -4240,7 +5307,7 @@ func_mode_link () moreargs= for fil in `cat "$save_arg"` do -# moreargs="$moreargs $fil" +# func_append moreargs " $fil" arg=$fil # A libtool-controlled object. @@ -4269,7 +5336,7 @@ func_mode_link () if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -4281,7 +5348,7 @@ func_mode_link () # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" + func_append dlprefiles " $pic_object" prev= fi @@ -4351,12 +5418,12 @@ func_mode_link () if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; - *) rpath="$rpath $arg" ;; + *) func_append rpath " $arg" ;; esac else case "$xrpath " in *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; + *) func_append xrpath " $arg" ;; esac fi prev= @@ -4368,28 +5435,28 @@ func_mode_link () continue ;; weak) - weak_libs="$weak_libs $arg" + func_append weak_libs " $arg" prev= continue ;; xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xcompiler) - compiler_flags="$compiler_flags $qarg" + func_append compiler_flags " $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" prev= func_append compile_command " $wl$qarg" func_append finalize_command " $wl$qarg" @@ -4425,6 +5492,11 @@ func_mode_link () continue ;; + -bindir) + prev=bindir + continue + ;; + -dlopen) prev=dlfiles continue @@ -4475,15 +5547,16 @@ func_mode_link () ;; -L*) - func_stripname '-L' '' "$arg" - dir=$func_stripname_result - if test -z "$dir"; then + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then if test "$#" -gt 0; then func_fatal_error "require no space between \`-L' and \`$1'" else func_fatal_error "need path for \`-L' option" fi fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -4495,24 +5568,30 @@ func_mode_link () ;; esac case "$deplibs " in - *" -L$dir "*) ;; + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" ;; esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; - *) dllsearchpath="$dllsearchpath:$dir";; + *) func_append dllsearchpath ":$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -4522,7 +5601,7 @@ func_mode_link () -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; @@ -4536,7 +5615,7 @@ func_mode_link () ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs System.ltframework" + func_append deplibs " System.ltframework" continue ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -4556,7 +5635,7 @@ func_mode_link () ;; esac fi - deplibs="$deplibs $arg" + func_append deplibs " $arg" continue ;; @@ -4568,21 +5647,22 @@ func_mode_link () # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot) - compiler_flags="$compiler_flags $arg" + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" prev=xcompiler continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" case "$new_inherited_linker_flags " in *" $arg "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; + * ) func_append new_inherited_linker_flags " $arg" ;; esac continue ;; @@ -4649,13 +5729,17 @@ func_mode_link () # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; *) func_fatal_error "only absolute run-paths are allowed" ;; esac case "$xrpath " in *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; + *) func_append xrpath " $dir" ;; esac continue ;; @@ -4708,8 +5792,8 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $func_quote_for_eval_result" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -4724,9 +5808,9 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" - linker_flags="$linker_flags $func_quote_for_eval_result" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -4754,23 +5838,27 @@ func_mode_link () arg="$func_quote_for_eval_result" ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" func_append finalize_command " $arg" - compiler_flags="$compiler_flags $arg" + func_append compiler_flags " $arg" continue ;; @@ -4782,7 +5870,7 @@ func_mode_link () *.$objext) # A standard object. - objs="$objs $arg" + func_append objs " $arg" ;; *.lo) @@ -4813,7 +5901,7 @@ func_mode_link () if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -4825,7 +5913,7 @@ func_mode_link () # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" + func_append dlprefiles " $pic_object" prev= fi @@ -4870,24 +5958,25 @@ func_mode_link () *.$libext) # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" + func_append deplibs " $arg" + func_append old_deplibs " $arg" continue ;; *.la) # A libtool-controlled library. + func_resolve_sysroot "$arg" if test "$prev" = dlfiles; then # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" + func_append dlfiles " $func_resolve_sysroot_result" prev= elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" + func_append dlprefiles " $func_resolve_sysroot_result" prev= else - deplibs="$deplibs $arg" + func_append deplibs " $func_resolve_sysroot_result" fi continue ;; @@ -4925,7 +6014,7 @@ func_mode_link () if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi @@ -4934,6 +6023,8 @@ func_mode_link () func_dirname "$output" "/" "" output_objdir="$func_dirname_result$objdir" + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result # Create the object directory. func_mkdir_p "$output_objdir" @@ -4954,12 +6045,12 @@ func_mode_link () # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - libs="$libs $deplib" + func_append libs " $deplib" done if test "$linkmode" = lib; then @@ -4972,9 +6063,9 @@ func_mode_link () if $opt_duplicate_compiler_generated_deps; then for pre_post_dep in $predeps $postdeps; do case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; esac - pre_post_deps="$pre_post_deps $pre_post_dep" + func_append pre_post_deps " $pre_post_dep" done fi pre_post_deps= @@ -5041,17 +6132,19 @@ func_mode_link () for lib in $dlprefiles; do # Ignore non-libtool-libs dependency_libs= + func_resolve_sysroot "$lib" case $lib in - *.la) func_source "$lib" ;; + *.la) func_source "$func_resolve_sysroot_result" ;; esac # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` + func_basename "$deplib" + deplib_base=$func_basename_result case " $weak_libs " in *" $deplib_base "*) ;; - *) deplibs="$deplibs $deplib" ;; + *) func_append deplibs " $deplib" ;; esac done done @@ -5067,16 +6160,17 @@ func_mode_link () lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - compiler_flags="$compiler_flags $deplib" + func_append compiler_flags " $deplib" if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -5161,7 +6255,7 @@ func_mode_link () if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -5174,7 +6268,8 @@ func_mode_link () test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) if test "$pass" = conv; then @@ -5188,7 +6283,8 @@ func_mode_link () finalize_deplibs="$deplib $finalize_deplibs" fi func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) func_warning "\`-L' is ignored for archives/objects" @@ -5199,17 +6295,21 @@ func_mode_link () -R*) if test "$pass" = link; then func_stripname '-R' '' "$deplib" - dir=$func_stripname_result + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; + *) func_append xrpath " $dir" ;; esac fi deplibs="$deplib $deplibs" continue ;; - *.la) lib="$deplib" ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" @@ -5227,7 +6327,7 @@ func_mode_link () match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -5237,15 +6337,15 @@ func_mode_link () ;; esac if test "$valid_a_lib" != yes; then - $ECHO + echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because the file extensions .$libext of this argument makes me believe" - $ECHO "*** that it is just a static archive that I should not use here." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -5272,11 +6372,11 @@ func_mode_link () if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. - newdlprefiles="$newdlprefiles $deplib" + func_append newdlprefiles " $deplib" compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - newdlfiles="$newdlfiles $deplib" + func_append newdlfiles " $deplib" fi fi continue @@ -5318,20 +6418,20 @@ func_mode_link () # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; esac done fi - dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi if test "$pass" = conv; then @@ -5342,20 +6442,20 @@ func_mode_link () func_fatal_error "cannot find name of link library for \`$lib'" fi # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $deplib" done continue fi # $pass = conv @@ -5363,9 +6463,15 @@ func_mode_link () # Get the name of the library we link against. linklib= - for l in $old_library $library_names; do - linklib="$l" - done + if test -n "$old_library" && + { test "$prefer_static_libs" = yes || + test "$prefer_static_libs,$installed" = "built,no"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do + linklib="$l" + done + fi if test -z "$linklib"; then func_fatal_error "cannot find name of link library for \`$lib'" fi @@ -5382,9 +6488,9 @@ func_mode_link () # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" + func_append dlprefiles " $lib $dependency_libs" else - newdlfiles="$newdlfiles $lib" + func_append newdlfiles " $lib" fi continue fi # $pass = dlopen @@ -5406,14 +6512,14 @@ func_mode_link () # Find the relevant object directory and library name. if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then func_warning "library \`$lib' was moved." dir="$ladir" absdir="$abs_ladir" libdir="$abs_ladir" else - dir="$libdir" - absdir="$libdir" + dir="$lt_sysroot$libdir" + absdir="$lt_sysroot$libdir" fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -5421,12 +6527,12 @@ func_mode_link () dir="$ladir" absdir="$abs_ladir" # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + func_append notinst_path " $abs_ladir" else dir="$ladir/$objdir" absdir="$abs_ladir/$objdir" # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + func_append notinst_path " $abs_ladir" fi fi # $installed = yes func_stripname 'lib' '.la' "$laname" @@ -5437,20 +6543,46 @@ func_mode_link () if test -z "$libdir" && test "$linkmode" = prog; then func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi + case "$host" in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac fi # $pass = dlpreopen if test -z "$libdir"; then @@ -5468,7 +6600,7 @@ func_mode_link () if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" + func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" linkalldeplibs=no @@ -5481,7 +6613,8 @@ func_mode_link () for deplib in $dependency_libs; do case $deplib in -L*) func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; esac # Need to link against all dependency_libs? @@ -5492,12 +6625,12 @@ func_mode_link () # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $deplib" done # for deplib continue fi # $linkmode = prog... @@ -5512,7 +6645,7 @@ func_mode_link () # Make sure the rpath contains only unique directories. case "$temp_rpath:" in *"$absdir:"*) ;; - *) temp_rpath="$temp_rpath$absdir:" ;; + *) func_append temp_rpath "$absdir:" ;; esac fi @@ -5524,7 +6657,7 @@ func_mode_link () *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -5533,7 +6666,7 @@ func_mode_link () *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -5558,12 +6691,12 @@ func_mode_link () case $host in *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=no ;; *) if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=yes fi ;; @@ -5580,7 +6713,7 @@ func_mode_link () fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - $ECHO + echo if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -5598,7 +6731,7 @@ func_mode_link () *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -5607,7 +6740,7 @@ func_mode_link () *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -5661,7 +6794,7 @@ func_mode_link () linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$mode" != relink; then + if test "$linkmode" = prog || test "$opt_mode" != relink; then add_shlibpath= add_dir= add= @@ -5683,9 +6816,9 @@ func_mode_link () if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" if test -z "$old_library" ; then - $ECHO - $ECHO "*** And there doesn't seem to be a static archive available" - $ECHO "*** The link will probably fail, sorry" + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" else add="$dir/$old_library" fi @@ -5712,12 +6845,12 @@ func_mode_link () test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -5739,7 +6872,7 @@ func_mode_link () if test -n "$add_shlibpath"; then case :$compile_shlibpath: in *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi if test "$linkmode" = prog; then @@ -5753,13 +6886,13 @@ func_mode_link () test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac fi fi fi - if test "$linkmode" = prog || test "$mode" = relink; then + if test "$linkmode" = prog || test "$opt_mode" = relink; then add_shlibpath= add_dir= add= @@ -5773,7 +6906,7 @@ func_mode_link () elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -5790,7 +6923,7 @@ func_mode_link () if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -5825,21 +6958,21 @@ func_mode_link () # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - $ECHO + echo $ECHO "*** Warning: This system can not link to static lib archive $lib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - $ECHO "*** But as you try to build a module library, libtool will still create " - $ECHO "*** a static module, that should work as long as the dlopening application" - $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -5867,37 +7000,46 @@ func_mode_link () temp_xrpath=$func_stripname_result case " $xrpath " in *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; + *) func_append xrpath " $temp_xrpath";; esac;; - *) temp_deplibs="$temp_deplibs $libdir";; + *) func_append temp_deplibs " $libdir";; esac done dependency_libs="$temp_deplibs" fi - newlib_search_path="$newlib_search_path $absdir" + func_append newlib_search_path " $absdir" # Link against this library test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" - if $opt_duplicate_deps ; then + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $func_resolve_sysroot_result" done if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result func_dirname "$deplib" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; @@ -5924,8 +7066,8 @@ func_mode_link () if test -z "$darwin_install_name"; then darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi @@ -5958,7 +7100,7 @@ func_mode_link () compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -5975,7 +7117,7 @@ func_mode_link () for dir in $newlib_search_path; do case "$lib_search_path " in *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; + *) func_append lib_search_path " $dir" ;; esac done newlib_search_path= @@ -6033,10 +7175,10 @@ func_mode_link () -L*) case " $tmp_libs " in *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac ;; - *) tmp_libs="$tmp_libs $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac done eval $var=\"$tmp_libs\" @@ -6052,7 +7194,7 @@ func_mode_link () ;; esac if test -n "$i" ; then - tmp_libs="$tmp_libs $i" + func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs @@ -6093,7 +7235,7 @@ func_mode_link () # Now set the variables for building old libraries. build_libtool_libs=no oldlibs="$output" - objs="$objs$old_deplibs" + func_append objs "$old_deplibs" ;; lib) @@ -6126,10 +7268,10 @@ func_mode_link () if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" - libobjs="$libobjs $objs" + func_append libobjs " $objs" fi fi @@ -6188,13 +7330,14 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + freebsd-aout|freebsd-elf|qnx|sunos) current="$number_major" revision="$number_minor" age="0" @@ -6304,7 +7447,7 @@ func_mode_link () versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -6327,7 +7470,7 @@ func_mode_link () done # Make executables depend on our current version. - verstring="$verstring:${current}.0" + func_append verstring ":${current}.0" ;; qnx) @@ -6395,10 +7538,10 @@ func_mode_link () fi func_generate_dlsyms "$libname" "$libname" "yes" - libobjs="$libobjs $symfileobj" + func_append libobjs " $symfileobj" test "X$libobjs" = "X " && libobjs= - if test "$mode" != relink; then + if test "$opt_mode" != relink; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -6414,7 +7557,7 @@ func_mode_link () continue fi fi - removelist="$removelist $p" + func_append removelist " $p" ;; *) ;; esac @@ -6425,27 +7568,28 @@ func_mode_link () # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" + func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` - # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` - # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. temp_xrpath= for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -6459,7 +7603,7 @@ func_mode_link () for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; + *) func_append dlfiles " $lib" ;; esac done @@ -6469,19 +7613,19 @@ func_mode_link () for lib in $old_dlprefiles; do case "$dlprefiles " in *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; + *) func_append dlprefiles " $lib" ;; esac done if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework - deplibs="$deplibs System.ltframework" + func_append deplibs " System.ltframework" ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. @@ -6498,7 +7642,7 @@ func_mode_link () *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" + func_append deplibs " -lc" fi ;; esac @@ -6547,7 +7691,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" i="" ;; esac @@ -6558,21 +7702,21 @@ EOF set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which I believe you do not have" - $ECHO "*** because a test_compile did reveal that the linker did not use it for" - $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which I believe you do not have" + echo "*** because a test_compile did reveal that the linker did not use it for" + echo "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; *) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" ;; esac done @@ -6590,7 +7734,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" i="" ;; esac @@ -6601,29 +7745,29 @@ EOF set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because a test_compile did reveal that the linker did not use this one" - $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because a test_compile did reveal that the linker did not use this one" + echo "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning! Library $i is needed by this library but I was not able to" - $ECHO "*** make it link in! You will probably need to install it or some" - $ECHO "*** library that it depends on before this library will be fully" - $ECHO "*** functional. Installing it before continuing would be even better." + echo "*** make it link in! You will probably need to install it or some" + echo "*** library that it depends on before this library will be fully" + echo "*** functional. Installing it before continuing would be even better." fi ;; *) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" ;; esac done @@ -6640,15 +7784,27 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac fi if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` + if test -n "$file_magic_glob"; then + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` + else + libnameglob=$libname + fi + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + if test "$want_nocaseglob" = yes; then + shopt -s nocaseglob + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -6665,13 +7821,13 @@ EOF potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -6680,12 +7836,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else @@ -6696,7 +7852,7 @@ EOF ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -6712,7 +7868,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -6723,9 +7879,9 @@ EOF potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -6734,12 +7890,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else @@ -6750,32 +7906,32 @@ EOF ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ - -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` done fi - if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | - $GREP . >/dev/null; then - $ECHO + case $tmp_deplibs in + *[!\ \ ]*) + echo if test "X$deplibs_check_method" = "Xnone"; then - $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + echo "*** Warning: inter-library dependencies are not supported in this platform." else - $ECHO "*** Warning: inter-library dependencies are not known to be supported." + echo "*** Warning: inter-library dependencies are not known to be supported." fi - $ECHO "*** All declared inter-library dependencies are being dropped." + echo "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - fi + ;; + esac ;; esac versuffix=$versuffix_save @@ -6787,23 +7943,23 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - $ECHO - $ECHO "*** Warning: libtool could not satisfy all declared inter-library" + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - $ECHO "*** a static module, that should work as long as the dlopening" - $ECHO "*** application is linked with the -dlopen flag." + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -6813,16 +7969,16 @@ EOF build_libtool_libs=no fi else - $ECHO "*** The inter-library dependencies that have been dropped here will be" - $ECHO "*** automatically added whenever a program is linked with this library" - $ECHO "*** or is declared to -dlopen it." + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." if test "$allow_undefined" = no; then - $ECHO - $ECHO "*** Since this library must not contain undefined symbols," - $ECHO "*** because either the platform does not support them or" - $ECHO "*** it was explicitly requested with -no-undefined," - $ECHO "*** libtool will only create a static version of it." + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -6839,9 +7995,9 @@ EOF # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -6854,7 +8010,7 @@ EOF *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -6864,10 +8020,10 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done deplibs="$new_libs" @@ -6879,15 +8035,22 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -6896,18 +8059,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" + func_append dep_rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -6915,17 +8078,13 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -6933,7 +8092,7 @@ EOF fi shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -6959,18 +8118,18 @@ EOF linknames= for link do - linknames="$linknames $link" + func_append linknames " $link" done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - delfiles="$delfiles $export_symbols" + func_append delfiles " $export_symbols" fi orig_export_symbols= @@ -7001,13 +8160,45 @@ EOF $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do + for cmd1 in $cmds; do IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -7029,7 +8220,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -7041,7 +8232,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7051,7 +8242,7 @@ EOF case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -7071,21 +8262,21 @@ EOF test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" + func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -7130,7 +8321,8 @@ EOF save_libobjs=$libobjs fi save_output=$output - output_la=`$ECHO "X$output" | $Xsed -e "$basename"` + func_basename "$output" + output_la=$func_basename_result # Clear the reloadable object creation command queue and # initialize k to one. @@ -7143,13 +8335,16 @@ EOF if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - $ECHO 'INPUT (' > $output + echo 'INPUT (' > $output for obj in $save_libobjs do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - $ECHO ')' >> $output - delfiles="$delfiles $output" + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -7163,10 +8358,12 @@ EOF fi for obj do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -7190,17 +8387,19 @@ EOF # command to the queue. if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" else # All subsequent reloadable object files will link in # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=$obj + objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -7210,11 +8409,12 @@ EOF # reloadable object file. All subsequent reloadable object # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles="$delfiles $output" + func_append delfiles " $output" else output= @@ -7248,7 +8448,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7269,7 +8469,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -7281,7 +8481,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7322,10 +8522,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -7341,7 +8541,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7353,7 +8553,7 @@ EOF IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -7434,18 +8634,21 @@ EOF if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -7505,8 +8708,8 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac @@ -7517,14 +8720,14 @@ EOF if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -7538,7 +8741,7 @@ EOF *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7548,17 +8751,17 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done compile_deplibs="$new_libs" - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -7566,7 +8769,7 @@ EOF # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done fi @@ -7585,18 +8788,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi case $host in @@ -7605,12 +8808,12 @@ EOF case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) dllsearchpath="$dllsearchpath:$libdir";; + *) func_append dllsearchpath ":$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -7636,18 +8839,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + *) func_append finalize_perm_rpath " $libdir" ;; esac fi done @@ -7661,8 +8864,8 @@ EOF if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. - compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -7674,15 +8877,15 @@ EOF wrappers_required=yes case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi ;; - *cegcc) - # Disable wrappers for cegcc, we are cross compiling anyway. - wrappers_required=no - ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -7691,13 +8894,19 @@ EOF esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. exit_status=0 func_show_eval "$link_command" 'exit_status=$?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -7720,7 +8929,7 @@ EOF # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -7728,7 +8937,7 @@ EOF # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -7738,11 +8947,18 @@ EOF # We don't need to create a wrapper script. link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + exit $EXIT_SUCCESS fi @@ -7757,7 +8973,7 @@ EOF if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -7769,13 +8985,19 @@ EOF fi # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname func_show_eval "$link_command" 'exit $?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Now create the wrapper script. func_verbose "creating $output" @@ -7793,18 +9015,7 @@ EOF fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $ECHO for shipping. - if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -7884,7 +9095,7 @@ EOF else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs="$oldobjs $symfileobj" + func_append oldobjs " $symfileobj" fi fi addlibs="$old_convenience" @@ -7892,10 +9103,10 @@ EOF if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # Do each command in the archive commands. @@ -7906,10 +9117,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -7925,9 +9136,9 @@ EOF done | sort | sort -uc >/dev/null 2>&1); then : else - $ECHO "copying selected object files to avoid basename conflicts..." + echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -7951,18 +9162,30 @@ EOF esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" ;; - *) oldobjs="$oldobjs $obj" ;; + *) func_append oldobjs " $obj" ;; esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -8036,7 +9259,7 @@ EOF done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -8056,12 +9279,23 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs="$newdependency_libs $libdir/$name" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -8075,9 +9309,9 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles="$newdlfiles $libdir/$name" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; - *) newdlfiles="$newdlfiles $lib" ;; + *) func_append newdlfiles " $lib" ;; esac done dlfiles="$newdlfiles" @@ -8094,7 +9328,7 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles="$newdlprefiles $libdir/$name" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done @@ -8106,7 +9340,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles="$newdlfiles $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -8115,15 +9349,33 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles="$newdlprefiles $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi $RM $output # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; esac $ECHO > $output "\ # $outputname - a libtool library file @@ -8182,7 +9434,7 @@ relink_command=\"$relink_command\"" exit $EXIT_SUCCESS } -{ test "$mode" = link || test "$mode" = relink; } && +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && func_mode_link ${1+"$@"} @@ -8202,9 +9454,9 @@ func_mode_uninstall () for arg do case $arg in - -f) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done @@ -8213,24 +9465,23 @@ func_mode_uninstall () rmdirs= - origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - objdir="$origobjdir" + odir="$objdir" else - objdir="$dir/$origobjdir" + odir="$dir/$objdir" fi func_basename "$file" name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" + test "$opt_mode" = uninstall && odir="$dir" - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; esac fi @@ -8256,18 +9507,17 @@ func_mode_uninstall () # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$mode" in + case "$opt_mode" in clean) - case " $library_names " in - # " " in the beginning catches empty $dlname + case " $library_names " in *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -8295,19 +9545,19 @@ func_mode_uninstall () # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" + func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" + func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$mode" = clean ; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) @@ -8317,7 +9567,7 @@ func_mode_uninstall () noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles="$rmfiles $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. @@ -8326,7 +9576,7 @@ func_mode_uninstall () func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + func_append rmfiles " $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -8334,12 +9584,12 @@ func_mode_uninstall () # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -8347,7 +9597,6 @@ func_mode_uninstall () esac func_show_eval "$RM $rmfiles" 'exit_status=1' done - objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -8359,16 +9608,16 @@ func_mode_uninstall () exit $exit_status } -{ test "$mode" = uninstall || test "$mode" = clean; } && +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$mode" && { +test -z "$opt_mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff --git a/m4/acx_clucene.m4 b/m4/acx_clucene.m4 index 04bf2c0..136143c 100644 --- a/m4/acx_clucene.m4 +++ b/m4/acx_clucene.m4 @@ -9,7 +9,7 @@ AC_ARG_WITH(clucene, AC_HELP_STRING([ --with-clucene=], [prefix of CLucene-Core installation. e.g. /usr/local or /usr]),,) -AC_MSG_CHECKING([how to include clucene]) +AC_MSG_CHECKING([how to include clucene 0.x]) if test "x$with_clucene" = "xno"; then AC_MSG_RESULT(excluding support) else diff --git a/m4/colored-echo.m4 b/m4/colored-echo.m4 deleted file mode 100644 index 0a7ae06..0000000 --- a/m4/colored-echo.m4 +++ /dev/null @@ -1,75 +0,0 @@ -dnl -dnl Macro to output bold and colored text. -dnl - -dnl COLORED_ECHO_INIT -dnl This macro must be called first to initialize a context. -AC_DEFUN([COLORED_ECHO_INIT], -[ - dnl Prepare fancy console output, taken from GNU shtools. - colored_echo_bold='' - colored_echo_norm='' - - AC_PROG_AWK - if test x"$AWK" = x"not found"; then - return - fi - - case $TERM in - xterm|xterm*|vt220|vt220*) - dnl For the most important terminal types we directly know the - dnl sequences. - colored_echo_bold=`$AWK 'BEGIN { printf("%c%c%c%c", 27, 91, 49, 109); }' /dev/null` - colored_echo_norm=`$AWK 'BEGIN { printf("%c%c%c", 27, 91, 109); }' /dev/null` - ;; - - vt100|vt100*|cygwin) - colored_echo_bold=`$AWK 'BEGIN { printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }' /dev/null` - colored_echo_norm=`$AWK 'BEGIN { printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }' /dev/null` - ;; - - *) - dnl For all others, we try to use a possibly existing `tput' or - dnl `tcout' utility. - paths=`$ECHO $PATH | sed -e 's/:/ /g'` - for tool in tput tcout; do - for dir in $paths; do - if test -r "$dir/$tool" ; then - for seq in bold md smso; do - bold="`$dir/$tool $seq 2>/dev/null`" - if test ".$bold" != . ; then - colored_echo_bold="$bold" - break - fi - done - if test ".$colored_echo_bold" != . ; then - for seq in sgr0 me rmso init reset; do - norm="`$dir/$tool $seq 2>/dev/null`" - if test ".$norm" != . ; then - colored_echo_norm="$norm" - break - fi - done - fi - break - fi - done - if test x"$colored_echo_bold" != "x" -a x"$colored_echo_norm" != "x"; then - break; - fi - done - ;; - esac -]) - -dnl COLORED_ECHO(TEXT) -dnl Output text with: -dnl o everything between %B and %b displayed bold. -AC_DEFUN([COLORED_ECHO], -[ - text=`$ECHO $seo "$1" | sed -e "s/%B/${colored_echo_bold}/g" -e "s/%b/${colored_echo_norm}/g" 2>/dev/null` - $ECHO $seo "$text" - - text=`$ECHO $sec "$1" | sed -e "s/%B//g" -e "s/%b//g" 2>/dev/null` - _AS_ECHO_LOG($text) -]) diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 671cde1..126202f 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,7 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,7 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 56 LT_INIT +# serial 57 LT_INIT # LT_PREREQ(VERSION) @@ -66,6 +68,7 @@ esac # ------------------ AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl AC_BEFORE([$0], [LTDL_INIT])dnl @@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) @@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME], *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ]) @@ -138,6 +143,11 @@ m4_defun([_LT_FILEUTILS_DEFAULTS], m4_defun([_LT_SETUP], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -160,10 +170,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@ -179,7 +192,6 @@ fi _LT_CHECK_OBJDIR m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -193,23 +205,6 @@ aix3*) ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -250,6 +245,28 @@ _LT_CONFIG_COMMANDS ])# _LT_SETUP +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + # _LT_PROG_LTMAIN # --------------- # Note that this code is called both from `configure', and `config.status' @@ -408,7 +425,7 @@ m4_define([_lt_decl_all_varnames], # declaration there will have the same value as in `configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) # _LT_CONFIG_STATUS_DECLARATIONS @@ -418,7 +435,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE], # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # -# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@ -517,12 +534,20 @@ LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + # Quote evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -533,9 +558,9 @@ done # Double-quote double-evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -543,16 +568,38 @@ for var in lt_decl_all_varnames([[ \ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - _LT_OUTPUT_LIBTOOL_INIT ]) +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test $lt_write_fail = 0 && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT # --------- @@ -562,20 +609,11 @@ _LT_OUTPUT_LIBTOOL_INIT AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 +lt_cl_silent=false exec AS_MESSAGE_LOG_FD>>config.log { echo @@ -601,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -646,15 +684,13 @@ chmod +x "$CONFIG_LT" # appending to config.log, which fails on DOS, as config.log is still kept # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) ])# LT_OUTPUT @@ -717,15 +753,12 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_XSI_SHELLFNS + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) + _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" ], @@ -770,6 +803,7 @@ AC_DEFUN([LT_LANG], m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -791,6 +825,31 @@ m4_defun([_LT_LANG], ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -821,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -831,11 +894,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AC_LIBTOOL_CXX], []) dnl AC_DEFUN([AC_LIBTOOL_F77], []) dnl AC_DEFUN([AC_LIBTOOL_FC], []) dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) # _LT_TAG_COMPILER @@ -921,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -929,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -940,6 +1012,34 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) case $host_os in rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -967,7 +1067,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -977,8 +1077,8 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -987,7 +1087,13 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" case $cc_basename in @@ -995,7 +1101,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all _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}" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" _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}" @@ -1011,203 +1117,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], fi ]) -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- # Links a minimal program and checks the executable # for the system default hardcoded library path. In most cases, # this is /usr/lib:/lib, but when the MPI compilers are used # the location of the communication and MPI libs are included too. # If we don't find anything, use the default library path according # to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi ])# _LT_SYS_MODULE_PATH_AIX # _LT_SHELL_INIT(ARG) # ------------------- m4_define([_LT_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_SHELL_INIT +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + # _LT_PROG_ECHO_BACKSLASH # ----------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -[$]* -_LT_EOF - exit 0 + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) -AC_SUBST(lt_ECHO) -]) _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], - [An echo program that does not interpret backslashes]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ])# _LT_PROG_ECHO_BACKSLASH +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and in which our libraries should be installed.])]) + # _LT_ENABLE_LOCK # --------------- m4_defun([_LT_ENABLE_LOCK], @@ -1236,7 +1281,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -1267,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1281,7 +1326,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1300,7 +1348,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1329,14 +1380,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1354,14 +1418,47 @@ need_locks="$enable_libtool_lock" ])# _LT_ENABLE_LOCK +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) +[_LT_PROG_AR AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: @@ -1380,18 +1477,27 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac _LT_DECL([], [old_postinstall_cmds], [2]) _LT_DECL([], [old_postuninstall_cmds], [2]) _LT_TAGDECL([], [old_archive_cmds], [2], [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) ])# _LT_CMD_OLD_ARCHIVE @@ -1416,15 +1522,15 @@ AC_CACHE_CHECK([$1], [$2], -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1464,7 +1570,7 @@ AC_CACHE_CHECK([$1], [$2], if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1527,6 +1633,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -1552,6 +1663,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1591,8 +1707,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -1643,7 +1759,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -[#line __oline__ "configure" +[#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -1684,7 +1800,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -1693,7 +1815,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -1869,16 +1995,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes @@ -2037,6 +2163,7 @@ m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ @@ -2045,16 +2172,23 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -2067,7 +2201,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -2087,7 +2221,13 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[[lt_foo]]++; } if (lt_freq[[lt_foo]] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) @@ -2113,7 +2253,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2122,7 +2262,7 @@ aix3*) ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2175,7 +2315,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - 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' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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' ;; esac ;; @@ -2187,7 +2327,7 @@ beos*) ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2206,8 +2346,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -2228,36 +2369,83 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -2278,7 +2466,7 @@ m4_if([$1], [],[ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2286,10 +2474,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2297,7 +2481,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2315,7 +2499,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2335,12 +2519,26 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2386,12 +2584,14 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2407,7 +2607,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2444,9 +2644,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2454,16 +2654,21 @@ linux* | k*bsd*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -2475,8 +2680,9 @@ linux* | k*bsd*-gnu) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - 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' ' '` + 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;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2507,7 +2713,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2576,7 +2782,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2601,7 +2807,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2625,7 +2831,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2656,7 +2862,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2666,7 +2872,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2708,6 +2914,8 @@ _LT_DECL([], [library_names_spec], [1], The last name is the one that the linker finds with -lNAME]]) _LT_DECL([], [soname_spec], [1], [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) _LT_DECL([], [postinstall_cmds], [2], [Command to use after installation of a shared archive]) _LT_DECL([], [postuninstall_cmds], [2], @@ -2820,6 +3028,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], @@ -2941,6 +3150,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -2949,8 +3163,8 @@ case $host_os in fi ;; esac -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl -_LT_DECL([], [reload_cmds], [2])dnl +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl +_LT_TAGDECL([], [reload_cmds], [2])dnl ])# _LT_CMD_RELOAD @@ -3002,16 +3216,18 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -3041,6 +3257,10 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -3049,11 +3269,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -3074,8 +3294,8 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3153,6 +3373,21 @@ tpf*) ;; esac ]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -3160,7 +3395,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) ])# _LT_CHECK_MAGIC_METHOD @@ -3217,7 +3456,19 @@ if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -3230,13 +3481,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], [lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) cat conftest.out >&AS_MESSAGE_LOG_FD if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -3251,15 +3502,76 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' -# LT_LIB_M +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + + +# LT_LIB_M # -------- # check for math library AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@ -3287,7 +3599,12 @@ m4_defun([_LT_COMPILER_NO_RTTI], _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], lt_cv_prog_compiler_rtti_exceptions, @@ -3304,6 +3621,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], m4_defun([_LT_CMD_GLOBAL_SYMBOLS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([LT_PATH_NM])dnl AC_REQUIRE([LT_PATH_LD])dnl m4_require([_LT_DECL_SED])dnl @@ -3371,8 +3689,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3396,6 +3714,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -3408,6 +3727,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -3429,7 +3749,7 @@ _LT_EOF if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -3441,6 +3761,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -3452,7 +3784,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT@&t@_DLSYM_CONST struct { const char *name; void *address; } @@ -3478,15 +3810,15 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi @@ -3519,6 +3851,13 @@ else AC_MSG_RESULT(ok) fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], @@ -3529,6 +3868,8 @@ _LT_DECL([global_symbol_to_c_name_address], _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3540,7 +3881,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= -AC_MSG_CHECKING([for $compiler option to produce PIC]) m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -3591,6 +3931,11 @@ m4_if([$1], [CXX], [ # DJGPP does not support shared libraries at all _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -3640,6 +3985,12 @@ m4_if([$1], [CXX], [ ;; esac ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; dgux*) case $cc_basename in ec++*) @@ -3696,7 +4047,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -3729,8 +4080,8 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' @@ -3792,7 +4143,7 @@ m4_if([$1], [CXX], [ ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -3896,6 +4247,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -3938,6 +4295,15 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -3980,7 +4346,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4001,7 +4367,13 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4013,25 +4385,40 @@ m4_if([$1], [CXX], [ # All Alpha code is PIC. _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; esac ;; @@ -4063,7 +4450,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; @@ -4120,9 +4507,11 @@ case $host_os in _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) # # Check to make sure the PIC flag actually works. @@ -4141,6 +4530,8 @@ fi _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) # # Check to make sure the static flag actually works. # @@ -4161,6 +4552,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl @@ -4169,27 +4561,37 @@ m4_require([_LT_TAG_COMPILER])dnl AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= @@ -4204,7 +4606,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4252,7 +4653,33 @@ dnl Note also adjust exclude_expsyms for C++ above. esac _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -4270,6 +4697,7 @@ dnl Note also adjust exclude_expsyms for C++ above. fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4285,11 +4713,12 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -4325,10 +4754,12 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -4346,6 +4777,11 @@ _LT_EOF fi ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4361,7 +4797,7 @@ _LT_EOF _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -4371,15 +4807,16 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4390,13 +4827,17 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -4412,17 +4853,16 @@ _LT_EOF fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4436,8 +4876,8 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4455,8 +4895,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4502,8 +4942,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4543,8 +4983,10 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -4631,9 +5073,9 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -4642,14 +5084,19 @@ _LT_EOF else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -4681,20 +5128,64 @@ _LT_EOF # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac ;; darwin* | rhapsody*) @@ -4707,10 +5198,6 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -4723,7 +5210,7 @@ _LT_EOF ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -4732,7 +5219,7 @@ _LT_EOF # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4740,7 +5227,7 @@ _LT_EOF hpux9*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -4755,14 +5242,13 @@ _LT_EOF ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -4774,16 +5260,16 @@ _LT_EOF ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -4795,7 +5281,14 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi @@ -4823,19 +5316,34 @@ _LT_EOF irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -4897,17 +5405,17 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -4917,13 +5425,13 @@ _LT_EOF osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -4936,9 +5444,9 @@ _LT_EOF _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -5114,36 +5622,38 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) ;; esac fi @@ -5180,9 +5690,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1], _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5208,8 +5715,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], @@ -5220,6 +5725,8 @@ _LT_TAGDECL([], [include_expsyms], [1], [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented @@ -5313,37 +5820,22 @@ CC="$lt_save_CC" ])# _LT_LANG_C_CONFIG -# _LT_PROG_CXX -# ------------ -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -# compiler, we have our own version here. -m4_defun([_LT_PROG_CXX], -[ -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -AC_PROG_CXX -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_CXX - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_CXX], []) - - # _LT_LANG_CXX_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write # the compiler configuration to `libtool'. m4_defun([_LT_LANG_CXX_CONFIG], -[AC_REQUIRE([_LT_PROG_CXX])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi AC_LANG_PUSH(C++) _LT_TAGVAR(archive_cmds_need_lc, $1)=no @@ -5355,7 +5847,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5365,6 +5856,8 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -5396,6 +5889,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -5413,6 +5907,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -5434,8 +5929,8 @@ if test "$_lt_caught_CXX_error" != yes; then # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5467,7 +5962,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -5576,10 +6071,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -5588,14 +6083,19 @@ if test "$_lt_caught_CXX_error" != yes; then else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -5625,28 +6125,75 @@ if test "$_lt_caught_CXX_error" != yes; then ;; cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; @@ -5669,7 +6216,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -5688,6 +6235,11 @@ if test "$_lt_caught_CXX_error" != yes; then gnu*) ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + hpux9*) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: @@ -5712,11 +6264,11 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -5777,7 +6329,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -5787,10 +6339,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -5820,7 +6372,7 @@ if test "$_lt_caught_CXX_error" != yes; then case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -5831,9 +6383,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -5844,7 +6396,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -5862,7 +6414,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5899,26 +6451,26 @@ if test "$_lt_caught_CXX_error" != yes; then pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -5926,7 +6478,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -5945,9 +6497,9 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5967,13 +6519,13 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6042,7 +6594,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6077,15 +6629,15 @@ if test "$_lt_caught_CXX_error" != yes; then case $host in osf3*) _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; @@ -6101,17 +6653,17 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -6121,7 +6673,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -6157,7 +6709,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -6178,7 +6730,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac _LT_TAGVAR(link_all_deplibs, $1)=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6198,14 +6750,14 @@ if test "$_lt_caught_CXX_error" != yes; then if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -6216,7 +6768,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' @@ -6270,6 +6822,10 @@ if test "$_lt_caught_CXX_error" != yes; then CC*) _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -6325,6 +6881,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -6339,6 +6896,29 @@ AC_LANG_POP ])# _LT_LANG_CXX_CONFIG +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6347,6 +6927,7 @@ AC_LANG_POP # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= @@ -6396,7 +6977,20 @@ public class foo { } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then @@ -6408,7 +7002,7 @@ if AC_TRY_EVAL(ac_compile); then pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -6417,13 +7011,22 @@ if AC_TRY_EVAL(ac_compile); then test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + case ${prev} in + -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -6443,8 +7046,10 @@ if AC_TRY_EVAL(ac_compile); then _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -6480,6 +7085,7 @@ else fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], @@ -6516,7 +7122,7 @@ linux*) solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -6560,32 +7166,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1], ])# _LT_SYS_HIDDEN_LIBDEPS -# _LT_PROG_F77 -# ------------ -# Since AC_PROG_F77 is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_F77], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -AC_PROG_F77 -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_F77 - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_F77], []) - - # _LT_LANG_F77_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_F77_CONFIG], -[AC_REQUIRE([_LT_PROG_F77])dnl -AC_LANG_PUSH(Fortran 77) +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6595,7 +7185,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -6604,6 +7193,8 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6643,7 +7234,9 @@ if test "$_lt_disable_F77" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} + CFLAGS=$FFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -6697,38 +7290,24 @@ if test "$_lt_disable_F77" != yes; then GCC=$lt_save_GCC CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" fi # test "$_lt_disable_F77" != yes AC_LANG_POP ])# _LT_LANG_F77_CONFIG -# _LT_PROG_FC -# ----------- -# Since AC_PROG_FC is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_FC], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -AC_PROG_FC -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_FC - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_FC], []) - - # _LT_LANG_FC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_FC_CONFIG], -[AC_REQUIRE([_LT_PROG_FC])dnl -AC_LANG_PUSH(Fortran) +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6738,7 +7317,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -6747,6 +7325,8 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6786,7 +7366,9 @@ if test "$_lt_disable_FC" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} + CFLAGS=$FCFLAGS compiler=$CC GCC=$ac_cv_fc_compiler_gnu @@ -6842,7 +7424,8 @@ if test "$_lt_disable_FC" != yes; then fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS fi # test "$_lt_disable_FC" != yes AC_LANG_POP @@ -6879,10 +7462,12 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC=yes CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" @@ -6892,6 +7477,8 @@ _LT_CC_BASENAME([$compiler]) _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6911,10 +7498,82 @@ fi AC_LANG_RESTORE GCC=$lt_save_GCC -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -6946,9 +7605,11 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= CC=${RC-"windres"} +CFLAGS= compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -6961,7 +7622,8 @@ fi GCC=$lt_save_GCC AC_LANG_RESTORE -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_RC_CONFIG @@ -6981,6 +7643,13 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -7020,6 +7689,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) AC_SUBST([OBJDUMP]) ]) +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) # _LT_DECL_SED # ------------ @@ -7113,8 +7791,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -7153,208 +7831,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` -} + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -_LT_EOF -esac + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac ;; - esac + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac ]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 34151a3..5d9acd8 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,13 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 6 ltoptions.m4 +# serial 7 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -133,13 +134,13 @@ case $host in esac test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl +_LT_DECL([], [AS], [1], [Assembler program])dnl test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], @@ -325,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index f3c5309..07a8602 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -7,17 +7,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# Generated from ltversion.in. +# @configure_input@ -# serial 3017 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6b' -macro_revision='1.3017' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index 637bb20..c573da9 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,13 +1,13 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 4 lt~obsolete.m4 +# serial 5 lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # @@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) @@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/missing b/missing index 28055d2..cdea514 100755 --- a/missing +++ b/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,272 +70,141 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/olb/Convert.bpr b/olb/Convert.bpr deleted file mode 100644 index 6c10406..0000000 --- a/olb/Convert.bpr +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=2 -Item0=..\src\utilfuns;..\src\keys;$(BCB)\include;$(BCB)\include\vcl;../include -Item1=$(BCB)\include;$(BCB)\include\vcl;../include - -[HistoryLists\hlLibraryPath] -Count=2 -Item0=..\src\utilfuns;..\src\keys;$(BCB)\lib\obj;$(BCB)\lib -Item1=$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=1 -Item0=_RTLDLL;USEPACKAGES - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams= -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - - \ No newline at end of file diff --git a/olb/Convert.cpp b/olb/Convert.cpp deleted file mode 100644 index c752f56..0000000 --- a/olb/Convert.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -//--------------------------------------------------------------------------- -#include -#pragma hdrstop -USERES("Convert.res"); -USEFORM("Mainfrm.cpp", Form1); -USEUNIT("all.c"); -USEUNIT("..\src\keys\versekey.cpp"); -USEUNIT("..\src\keys\strkey.cpp"); -USEUNIT("..\src\keys\swkey.cpp"); -USEUNIT("..\src\keys\listkey.cpp"); -USEUNIT("..\src\utilfuns\utilstr.cpp"); -//--------------------------------------------------------------------------- -WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) -{ - try - { - Application->Initialize(); - Application->CreateForm(__classid(TForm1), &Form1); - Application->Run(); - } - catch (Exception &exception) - { - Application->ShowException(&exception); - } - return 0; -} -//--------------------------------------------------------------------------- diff --git a/olb/Doinit.c b/olb/Doinit.c deleted file mode 100644 index 15c65f2..0000000 --- a/olb/Doinit.c +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include -struct zonline online; -struct zversion version; -struct zref ref; -struct zstdindex stdindex; -struct ztrace trace; -/* - Initialises the System - - Inputs: - pointer to path for files - e.g. c:\bible\scholar -*/ -void DOINIT(CHAR *olbpath) -{ - static CHAR *titles[10] = - {"\\id.dat", "\\text.dat", "\\textndx.dat", "\\tokens.dat", - "\\version.dat", "\\xref.dat", "\\xrefndx.dat", "\\xrefndxs.dat", - "\\cxref\\cxref.dat", "\\cxref\\cxrefndx.dat"}; - - CHAR path[64]; - static long int zero ={0}; - - struct - { - CHAR key; - CHAR size[2]; - INT indexsize; - int token_blksize; - } record; - - int i; - int j; - - /* - Open Files - */ - - trace.level = -1; - X("Doinit"); - for (i = 0; i < 8; i++) - { - STRCPY(path, olbpath, 64, "Doinit-1"); - STRCAT(path, titles[i], 64,"Doinit-2"); - call OPEN(i, path); - online.lrecl[i] = 0; - } - - /* - Initialise Version Structure - */ - call READ(fp_version, sizeof(version), &version.version_id); - call CLOSE(fp_version); - call DUMPLINE("VERSION.DAT", 16, &version.version_id); - /* convert PLI strings to C-Weed format */ -/* - for (i = 0; i < 128; i++) - call PLITOC(&(version.hot_words[i][0]), 9); -*/ - for (i = 0; i < 66; i++) - call PLITOC(&(version.books[i][0]), 15); - - /* - setup access to TEXT.DAT file - */ - call DREAD(fp_textndx, 3, &record.key, zero); - call DUMPLINE("TEXTNDX.DAT", 3, &record.key); - - online.textndxsz = record.size[0]; - if (record.key == 0) then - online.lrecl[fp_textndx] = 3; - else - online.lrecl[fp_textndx] = record.size[0]; - - /* - setup access to XREF.DAT file - */ - call DREAD(fp_xrefndx, 7, &record.key, zero); - call DUMPLINE("XREFNDX.DAT", 7, &record.key); - online.lrecl[fp_xrefndx] = record.size[0] + record.size[1]; - online.xrefndxsz[0] = record.size[0]; - online.xrefndxsz[1] = record.size[1]; - if (record.key == 2) then - { - online.indexsize = record.indexsize; - online.tokenblksize = record.token_blksize * 2; - online.tokenarea = &online.tokenwork[0]; - } - else - online.tokenblksize = 0; - /* - setup access to XREFNDXS.DAT file - */ - call DREAD(fp_xrefndxs, 3, &record.key, zero); - call DUMPLINE("XREFNDXS.DAT", 3, &record.key); - if (record.key == 0) then - online.lrecl[fp_xrefndxs] = 3; - else - online.lrecl[fp_xrefndxs] = record.size[0]; - - online.version_mark = 3; - /* - Setup Version ID for multiple versions - */ - call VERINIT(); - - /* - Setup Cross Reference Files - */ - for (i = 8; i < 10; i++) - { - STRCPY(path, olbpath, 64, "Doinit-3"); - j = strlen(path); - while(path[j] != '\\') - j--; - path[j] = 0; - STRCAT(path, titles[i], 64, "Doinit-4"); - call OPEN(i, path); - online.lrecl[i] = 0; - } - /* - setup access to CXREF.DAT file - */ - call DREAD(fp_cxrefndx, 3, &record.key, zero); - call DUMPLINE("CXREFNDX.DAT", 3, &record.key); - if (record.key == 0) then - online.lrecl[fp_cxrefndx] = 3; - else - online.lrecl[fp_cxrefndx] = record.size[0]; - trace.traceflag = 1; - Y(); -} diff --git a/olb/Getstrng.c b/olb/Getstrng.c deleted file mode 100644 index 32430ce..0000000 --- a/olb/Getstrng.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include - -void GETSTRNG(strongs_no, verse_list, otflg) - - /* get verses for a given strongs no */ - -int strongs_no; /* strongs number to fetch verse list for */ -INT verse_list[MAX_LIST]; /* resultant verse list */ -CHAR otflg; /* Old Testament Number flag */ -{ - extern struct zversion version; - int entry_size; - long int seek_posn; - - X("Getstrng"); - if (strongs_no > 8849 || strongs_no < 0) then - ERROR("Getstrng - Invalid Strong's Number"); - - entry_size = READNDX(strongs_no, fp_xrefndxs, &seek_posn); - call LISTLOAD(fp_xref, entry_size, verse_list, seek_posn); - if (otflg == 0) then - call LISTRANG(verse_list, version.nt_ver, version.total_ver); - else - call LISTRANG(verse_list, 1, version.nt_ver - 1); - Y(); -} diff --git a/olb/Getvrsn.c b/olb/Getvrsn.c deleted file mode 100644 index 97df09a..0000000 --- a/olb/Getvrsn.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include - -/* - Get version id for display - - If triple verse A_B_C then - - Inputs: - 1 - returns "A" - 2 - returns "B" - 3 - returns "A_B" - 4 - returns "C" - 5 - returns "A_C" - 6 - returns "B_C" - 7 - returns "A_B_C" -*/ - -CHAR *GETVRSN(int version) -{ - extern struct zonline online; - static CHAR versionid[16]; - - X("Getvrsn"); - if (version < 1 || version > 7) then - call ERROR("Version Id Invalid"); - versionid[0] = 0; - if (version & 1) then - { - strcat(versionid, "_"); - STRCAT(versionid, &online.versions[0][0], 16, "Getrsn-1"); - } - if (version & 2) then - { - if (online.versions[1][0] != 0) then - { - strcat(versionid, "_"); - STRCAT(versionid, &online.versions[1][0], 16, "Getrsn-2"); - } - } - if (version & 4) then - { - if (online.versions[2][0] != 0) then - { - strcat(versionid, "_"); - STRCAT(versionid, &online.versions[2][0], 16, "Getrsn-3"); - } - } - Y(); - return(&versionid[1]); -} diff --git a/olb/Mainfrm.cpp b/olb/Mainfrm.cpp deleted file mode 100644 index 18e3382..0000000 --- a/olb/Mainfrm.cpp +++ /dev/null @@ -1,327 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -//--------------------------------------------------------------------------- -#include -#pragma hdrstop - -#include "Mainfrm.h" -//--------------------------------------------------------------------------- -#pragma package(smart_init) -#pragma resource "*.dfm" - - - extern "C" { -#include "online.h" -} - -#include -#include -#include -#include - -#ifndef __GNUC__ -#include -#include -#else -#include -#endif - -#include -#include - - - - - -TForm1 *Form1; -//--------------------------------------------------------------------------- -__fastcall TForm1::TForm1(TComponent* Owner) - : TForm(Owner) -{ - -} -//--------------------------------------------------------------------------- - -int TForm1::ProcessOLB(char *filepath) -{ - long pos, offset; - int num1, num2, rangemax, curbook = 0, curchap = 0, curverse = 0; - char buf[127]; - short size, tmp; - extern struct zonline online; - -// checkparams(argc, argv); - startflag = 0; - - inckey = key1 = key2 = key3 = "Genesis 1:1"; - olbvnum = 0; - - openfiles(); - - num1 = key1.Chapter(); - num2 = key1.Verse(); - - DOINIT(filepath); /* initialize OLB system */ - - while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) { - if (!startflag) { - startflag = 1; - } - else { - if (num2 < key2.Verse()) { // new chapter - if (num1 <= key2.Chapter()) { // new book - key2.Verse(1); - key2.Chapter(1); - key2.Book(key2.Book()+1); - } - printf("Found Chapter Break: %d ('%s')\n", num1, (const char *)key2); - chapoffset = offset; - chapsize = size; -// continue; - } - } - key2.Verse(1); - key2.Chapter(num1); - key2.Verse(num2); - - key3 = key2; -// key3 += (rangemax - key3.Verse()); - - writeidx(key1, key2, key3, offset, size); - } - close(vfp); - close(cfp); - close(bfp); - close(fp); - DOEND(); // close OLB system -} - - -/************************************************************************** - * ENT: key1 - current location of index - * key2 - minimum keyval for which this offset is valid - * key3 - maximum keyval for which this offset is valid - */ - -void TForm1::writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size) -{ - long pos; - short tmp; - - if (key1.Verse() == 1) { // new chapter - if (key1.Chapter() == 1) { // new book - pos = lseek(cfp, 0, SEEK_CUR); - write(bfp, &pos, 4); - pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */ - write(cfp, &pos, 4); - write(vfp, &chapoffset, 4); /* Book intro (vss) set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/ - write(vfp, &chapsize, 2); - } - pos = lseek(vfp, 0, SEEK_CUR); - write(cfp, &pos, 4); - write(vfp, &chapoffset, 4); /* Chapter intro */ - write(vfp, &chapsize, 2); - } - if (key1 >= key2) { - write(vfp, &offset, 4); - write(vfp, &size, 2); - } - else { - pos = 0; - tmp = 0; - write(vfp, &pos, 4); - write(vfp, &tmp, 2); - } - key1++; -} - - - -char TForm1::findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size) -{ - char buf[7]; - char buf2[20]; - char ch; - char loop; - long offset2; - int ch2, vs2, rm2; - bool flag; - long chapstart = 0; - short versedata[MAX_VERSE]; - char data[MAX_DATA]; - - - if (++olbvnum <= 31102) { - - if (olbvnum == 23146) { // "Matthew 1:1" - close(vfp); - close(cfp); - close(bfp); - close(fp); - key1 = key2 = key3 = inckey = "Matthew 1:1"; - openfiles(); - startflag = 0; - } - - - *offset = lseek(fp, 0, SEEK_CUR); - - if ((olbvnum!=1) && (olbvnum != 23146)) - inckey++; - - *num1 = inckey.Chapter(); - *num2 = inckey.Verse(); - - // output verse from olb -// printf("%s\n", (const char *)inckey); - GETEXT(olbvnum, versedata, 1, 1, 1, 1); - BLDVERSE(versedata, data); - charsetconvert(data); - write(fp, data, strlen(data)); - - *size = lseek(fp, 0, SEEK_CUR) - *offset; - write(fp, "\n", 1); - return 0; - } - return 1; -} - -void TForm1::charsetconvert(char *data) -{ - for (;*data; data++) { -// printf("%c %d", *data, *data); - switch((unsigned char)*data) { - case 129: *data = 252; break; - case 130: *data = 233; break; - case 131: *data = 226; break; - case 133: *data = 224; break; - case 135: *data = 231; break; - case 136: *data = 234; break; - case 137: *data = 235; break; - case 138: *data = 232; break; - case 139: *data = 239; break; - case 140: *data = 238; break; - case 144: *data = 201; break; - case 147: *data = 244; break; - case 150: *data = 251; break; - case 151: *data = 249; break; - case 160: *data = 225; break; - case 161: *data = 237; break; - case 162: *data = 243; break; - case 163: *data = 250; break; - case 164: *data = 241; break; - case 168: *data = 191; break; - case 173: *data = 161; break; - default: - if ((unsigned char)*data > 126) - fprintf(stderr, "Suspicious character: %c (%d); %s\n", *data, (unsigned char )*data, (const char *)inckey); - break; - } - } -} - - -void TForm1::openfiles() -{ - char buf[255]; - char fname[5]; - long pos; - short size; - - testmnt = key1.Testament(); - - strcpy(fname, (testmnt==2) ? "nt" : "ot"); - unlink(fname); - if ((fp = open(fname, O_CREAT|O_RDWR|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - sprintf(buf, "Couldn't open file: %s\n", fname); - MessageBox(this->Handle, buf, "openfiles()", MB_OK); - exit(1); - } - - sprintf(buf, "%s.vss", fname); - unlink(buf); - if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", buf); - exit(1); - } - - sprintf(buf, "%s.cps", fname); - unlink(buf); - if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", buf); - exit(1); - } - - sprintf(buf, "%s.bks", fname); - unlink(buf); - if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", buf); - exit(1); - } - - pos = 0; - write(bfp, &pos, 4); /* Book offset for testament intros */ - pos = 4; - write(cfp, &pos, 4); /* Chapter offset for testament intro */ - - -/* Right now just zero out intros until parsing correctly */ - pos = 0; - size = 0; - write(vfp, &pos, 4); /* Module intro */ - write(vfp, &size, 2); - write(vfp, &pos, 4); /* Testament intro */ - write(vfp, &size, 2); - -} - - -void TForm1::checkparams(int argc, char **argv) -{ - if (argc < 2) { - fprintf(stderr, "usage: %s \n", argv[0]); - exit(1); - } -} -void __fastcall TForm1::FSButtonClick(TObject *Sender) -{ - FSDialog->FileName = "Text.dat"; - char *fname; - - if (FSDialog->Execute()) { - fname = new char [ strlen(FSDialog->FileName.c_str()) + 1 ]; - strcpy(fname, FSDialog->FileName.c_str()); - for (int i = strlen(fname) - 1; i; i--) { - if ((fname[i] != '\\') && (fname[i] != '/')) - fname[i] = 0; - else break; - } - FilePathEdit->Text = fname; - delete [] fname; - try { - RichEdit1->Lines->LoadFromFile(FilePathEdit->Text + "Copyrite.dat"); - } - catch (...) {} - } -} -//--------------------------------------------------------------------------- -void __fastcall TForm1::Button1Click(TObject *Sender) -{ - ProcessOLB(FilePathEdit->Text.c_str()); -} -//--------------------------------------------------------------------------- diff --git a/olb/Mainfrm.dfm b/olb/Mainfrm.dfm deleted file mode 100644 index a92c4b8..0000000 Binary files a/olb/Mainfrm.dfm and /dev/null differ diff --git a/olb/Mainfrm.h b/olb/Mainfrm.h deleted file mode 100644 index 5fb85a9..0000000 --- a/olb/Mainfrm.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -//--------------------------------------------------------------------------- -#ifndef MainfrmH -#define MainfrmH -//--------------------------------------------------------------------------- -#include -#include -#include -#include -#include -#include -#include -#include -//--------------------------------------------------------------------------- -class TForm1 : public TForm -{ -__published: // IDE-managed Components - TOpenDialog *FSDialog; - TPanel *Panel1; - TPanel *Panel2; - TButton *Button1; - TLabel *Label1; - TEdit *FilePathEdit; - TButton *FSButton; - TRichEdit *RichEdit1; - void __fastcall FSButtonClick(TObject *Sender); - void __fastcall Button1Click(TObject *Sender); -private: // User declarations - -void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size); -char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size); -void openfiles(); -void checkparams(int argc, char **argv); -void charsetconvert(char *data); -int ProcessOLB(char *filepath); - - -VerseKey key1, key2, key3; -int fp, vfp, cfp, bfp; -long chapoffset; -short chapsize; -char testmnt; -char startflag; -VerseKey inckey; -int olbvnum; - -public: // User declarations - __fastcall TForm1(TComponent* Owner); -}; -//--------------------------------------------------------------------------- -extern PACKAGE TForm1 *Form1; -//--------------------------------------------------------------------------- -#endif diff --git a/olb/Online.c b/olb/Online.c deleted file mode 100644 index 54298e4..0000000 --- a/olb/Online.c +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include "online.dcl" - -/* - Online Bible Database Access Routines -*/ - -INT versedata[MAX_VERSE]; -INT verse_list[MAX_LIST]; -CHAR data[MAX_DATA]; - -void main(argc, argv) -int argc; -CHAR *argv[]; -{ - CHAR found, passage[64], *p; - int i, j; - INT word; -short verse_list[MAX_LIST]; - extern struct zonline online; - - if (argc > 1) - call DOINIT(argv[1]); /* initialise system */ - else - call DOINIT("g:\\bible\\av"); /* initialise system */ - - /* get text for Ge 1:1 & Rev 22:21 */ - - for (i = 1; i < 8; i++) - puts(GETVRSN(i)); - - verse_list[0] = 10; - for (i=1; i <= 8; i++) - verse_list[i] = i; - verse_list[9] = 31101; - verse_list[10] = 31102; - for (i = 1; i <= 10; i++) - puts(VRSTOREF(verse_list[i], 0)); - call DUMPVRS(verse_list, versedata, data); - - word = MAPWORD("Aaron", &found); /* map a word into an absolute number */ - call PUTLIST("Aaron=", word); - if (found == 0) then - puts("*Not Found"); - else - puts("*Found"); - call GETWORD(word, verse_list); /* get list of verses for a word */ - call DUMPVRS(verse_list, versedata, (CHAR *) data); - - /* first word in index */ - word = MAPWORD("a", &found); /* map a word into an absolute number */ - call PUTLIST("a=", word); - if (found == 0) then - puts("*Not Found"); - else - puts("*Found"); - call GETWORD(word, verse_list); /* get list of verses for a word */ - call DUMPVRS(verse_list, versedata, (CHAR *) data); - call GETSTRNG(1, verse_list, 0); /* get list of verses for Strong's */ - call DUMPVRS(verse_list, versedata, (CHAR *) data); - - /* last word in index */ - word = MAPWORD("Zuzims", &found); /* map a word into an absolute number */ - call PUTLIST("Zuzims=", word); - if (found == 0) then - puts("*Not Found"); - else - puts("*Found"); - - call GETWORD(word, verse_list); /* get list of verses for a word */ - call DUMPVRS(verse_list, versedata, (CHAR *) data); - - printf("\nCross References for Ge 1:1\n"); - call GETCXREF(1, verse_list); /* get cross-references for a verse */ - verse_list[1] = verse_list[66]; - verse_list[2] = verse_list[67]; - call DUMPVRS(verse_list, versedata, (CHAR *) data); - - for (i = 1; i <= 31102; i++) /* verify conversion routines work */ - { - if ((i % 1000) == 0) then - puts(DECIMAL(i)); - p = VRSTOREF(i, 0); - if (*p < '9' && *(p+1) == ' ') then - { /* fix book names like 1 Timothy -> 1Timothy */ - *(p+1) = *p; - *p = ' '; - } - j = REFTOVRS(p); - if (j != i) then - { - printf("i=%d, j=%d, ref=%s\n", i, j, p); - call ERROR("VRSTOREF - Error"); - } - } - - DOEND(); -} diff --git a/olb/addstrongs.cpp b/olb/addstrongs.cpp deleted file mode 100644 index 910eca3..0000000 --- a/olb/addstrongs.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include "online.dcl" -#include -#include -#include - -/* - Online Bible Database Access Routines -*/ - -INT versedata[MAX_VERSE]; -CHAR data[MAX_DATA]; - -void main(argc, argv) -int argc; -CHAR *argv[]; -{ - int fd; - CHAR found, passage[64], *p; - int i, j; - INT word; -short verse_list[MAX_LIST]; - extern struct zonline online; - - if (argc > 1) - call DOINIT(argv[1]); /* initialise system */ - else - call DOINIT("g:\\bible\\av"); /* initialise system */ - fd = open("../modules/texts/rawtext/kjv/ot", O_RDONLY, S_IREAD|S_IWRITE); - - /* get text for Ge 1:1 & Rev 22:21 */ - - for (i = 1; i < 8; i++) - puts(GETVRSN(i)); - - verse_list[0] = 10; - for (i=1; i <= 8; i++) - verse_list[i] = i; - verse_list[9] = 31101; - verse_list[10] = 31102; - for (i = 1; i <= 10; i++) - puts(VRSTOREF(verse_list[i], 0)); - call DUMPVRS(verse_list, versedata, data); - - word = MAPWORD("Aaron", &found); /* map a word into an absolute number */ - call PUTLIST("Aaron=", word); - if (found == 0) then - puts("*Not Found"); - else - puts("*Found"); - call GETWORD(word, verse_list); /* get list of verses for a word */ - call DUMPVRS(verse_list, versedata, (CHAR *) data); - - /* first word in index */ - word = MAPWORD("a", &found); /* map a word into an absolute number */ - call PUTLIST("a=", word); - if (found == 0) then - puts("*Not Found"); - else - puts("*Found"); - call GETWORD(word, verse_list); /* get list of verses for a word */ - call DUMPVRS(verse_list, versedata, (CHAR *) data); - call GETSTRNG(1, verse_list, 0); /* get list of verses for Strong's */ - call DUMPVRS(verse_list, versedata, (CHAR *) data); - - /* last word in index */ - word = MAPWORD("Zuzims", &found); /* map a word into an absolute number */ - call PUTLIST("Zuzims=", word); - if (found == 0) then - puts("*Not Found"); - else - puts("*Found"); - - call GETWORD(word, verse_list); /* get list of verses for a word */ - call DUMPVRS(verse_list, versedata, (CHAR *) data); - - printf("\nCross References for Ge 1:1\n"); - call GETCXREF(1, verse_list); /* get cross-references for a verse */ - verse_list[1] = verse_list[66]; - verse_list[2] = verse_list[67]; - call DUMPVRS(verse_list, versedata, (CHAR *) data); - - for (i = 1; i <= 31102; i++) /* verify conversion routines work */ - { - if ((i % 1000) == 0) then - puts(DECIMAL(i)); - p = VRSTOREF(i, 0); - if (*p < '9' && *(p+1) == ' ') then - { /* fix book names like 1 Timothy -> 1Timothy */ - *(p+1) = *p; - *p = ' '; - } - j = REFTOVRS(p); - if (j != i) then - { - printf("i=%d, j=%d, ref=%s\n", i, j, p); - call ERROR("VRSTOREF - Error"); - } - } - - DOEND(); -} diff --git a/olb/dumpav.cpp b/olb/dumpav.cpp deleted file mode 100644 index 6bc3fcc..0000000 --- a/olb/dumpav.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -extern "C" { -#include "online.dcl" -} - -void main(int argc, char **argv) -{ - CHAR found, passage[64], *p; - int i, j; - INT word; - short verse_list[MAX_LIST]; - short versedata[MAX_VERSE]; - char data[MAX_DATA]; - extern struct zonline online; - int versenum = 0; - - - if (argc > 1) - call DOINIT(argv[1]); /* initialise system */ - else call DOINIT("g:\\bible\\av"); /* initialise system */ - - for (versenum = 23146; versenum <= 23147 /*31102*/; versenum++) { - call GETEXT(versenum, versedata, 1, 1, 1, 1); - call BLDVERSE(versedata, data); - printf("%s\n", VRSTOREF(versenum, 1)); -// printf("%s\n", data); - } - - DOEND(); -} diff --git a/olb/olb.bpg b/olb/olb.bpg deleted file mode 100644 index d51af88..0000000 --- a/olb/olb.bpg +++ /dev/null @@ -1,26 +0,0 @@ -#------------------------------------------------------------------------------ -VERSION = BWS.01 -#------------------------------------------------------------------------------ -!ifndef ROOT -ROOT = $(MAKEDIR)\.. -!endif -#------------------------------------------------------------------------------ -MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** -DCC = $(ROOT)\bin\dcc32.exe $** -BRCC = $(ROOT)\bin\brcc32.exe $** -#------------------------------------------------------------------------------ -PROJECTS = Convert.exe olb2sword.exe prn2sword.exe -#------------------------------------------------------------------------------ -default: $(PROJECTS) -#------------------------------------------------------------------------------ - -Convert.exe: Convert.bpr - $(MAKE) - -olb2sword.exe: olb2sword.bpr - $(MAKE) - -prn2sword.exe: prn2sword.bpr - $(MAKE) - - diff --git a/olb/olb2sword.bpr b/olb/olb2sword.bpr deleted file mode 100644 index e05b277..0000000 --- a/olb/olb2sword.bpr +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription=Executable (Console) -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=2 -Item0=..\src\utilfuns;..\src\keys;$(BCB)\include;..\include -Item1=$(BCB)\include;../include - -[HistoryLists\hlLibraryPath] -Count=2 -Item0=..\src\utilfuns;..\src\keys;$(BCB)\lib -Item1=$(BCB)\lib - -[HistoryLists\hlRunParameters] -Count=2 -Item0=c:\bible\weyItem1=c:\bible\wey[Debugging] -Item1= - -[Debugging] -DebugSourceDirs= - -[Parameters] -RunParams=c:\bible\weyHostApplication= -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=1 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - - \ No newline at end of file diff --git a/olb/olb2sword.cpp b/olb/olb2sword.cpp deleted file mode 100644 index 2f6da6d..0000000 --- a/olb/olb2sword.cpp +++ /dev/null @@ -1,312 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - - -#pragma hdrstop -#include - - -//--------------------------------------------------------------------------- -#pragma argsused -/***************************************************************************** - * - */ - - extern "C" { -#include "online.h" -} - -#include -#include -#include -#include - -#ifndef __GNUC__ -#include -#else -#include -#endif - -#include -#include - - -USEUNIT("..\src\keys\listkey.cpp"); -USEUNIT("..\src\keys\strkey.cpp"); -USEUNIT("..\src\keys\swkey.cpp"); -USEUNIT("..\src\keys\versekey.cpp"); -USEUNIT("..\src\utilfuns\utilstr.cpp"); -USEUNIT("all.c"); -//--------------------------------------------------------------------------- -void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size); -char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size); -void openfiles(); -void checkparams(int argc, char **argv); -void charsetconvert(char *data); - - -VerseKey key1, key2, key3; -int fp, vfp, cfp, bfp; -long chapoffset; -short chapsize; -char testmnt; -char startflag = 0; -VerseKey inckey; - - -main(int argc, char **argv) -{ - long pos, offset; - int num1, num2, rangemax, curbook = 0, curchap = 0, curverse = 0; - char buf[127]; - short size, tmp; - extern struct zonline online; - - checkparams(argc, argv); - - inckey = key1 = key2 = key3 = "Genesis 1:1"; - - openfiles(); - - num1 = key1.Chapter(); - num2 = key1.Verse(); - - DOINIT(argv[1]); /* initialize OLB system */ - - while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) { - if (!startflag) { - startflag = 1; - } - else { - if (num2 < key2.Verse()) { // new chapter - if (num1 <= key2.Chapter()) { // new book - key2.Verse(1); - key2.Chapter(1); - key2.Book(key2.Book()+1); - } - printf("Found Chapter Break: %d ('%s')\n", num1, (const char *)key2); - chapoffset = offset; - chapsize = size; -// continue; - } - } - key2.Verse(1); - key2.Chapter(num1); - key2.Verse(num2); - - key3 = key2; -// key3 += (rangemax - key3.Verse()); - - writeidx(key1, key2, key3, offset, size); - } - close(vfp); - close(cfp); - close(bfp); - close(fp); - DOEND(); // close OLB system -} - - -/************************************************************************** - * ENT: key1 - current location of index - * key2 - minimum keyval for which this offset is valid - * key3 - maximum keyval for which this offset is valid - */ - -void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size) -{ - long pos; - short tmp; - - if (key1.Verse() == 1) { // new chapter - if (key1.Chapter() == 1) { // new book - pos = lseek(cfp, 0, SEEK_CUR); - write(bfp, &pos, 4); - pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */ - write(cfp, &pos, 4); - write(vfp, &chapoffset, 4); /* Book intro (vss) set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/ - write(vfp, &chapsize, 2); - } - pos = lseek(vfp, 0, SEEK_CUR); - write(cfp, &pos, 4); - write(vfp, &chapoffset, 4); /* Chapter intro */ - write(vfp, &chapsize, 2); - } - if (key1 >= key2) { - write(vfp, &offset, 4); - write(vfp, &size, 2); - } - else { - pos = 0; - tmp = 0; - write(vfp, &pos, 4); - write(vfp, &tmp, 2); - } - key1++; -} - - - -char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size) -{ - char buf[7]; - char buf2[20]; - char ch; - char loop; - long offset2; - int ch2, vs2, rm2; - bool flag; - long chapstart = 0; - static int olbvnum = 0; - short versedata[MAX_VERSE]; - char data[MAX_DATA]; - int len; - - - if (++olbvnum <= 31102) { - - if (olbvnum == 23146) { // "Matthew 1:1" - close(vfp); - close(cfp); - close(bfp); - close(fp); - key1 = key2 = key3 = inckey = "Matthew 1:1"; - openfiles(); - startflag = 0; - } - - - *offset = lseek(fp, 0, SEEK_CUR); - - if ((olbvnum!=1) && (olbvnum != 23146)) - inckey++; - - *num1 = inckey.Chapter(); - *num2 = inckey.Verse(); - - // output verse from olb -// printf("%s\n", (const char *)inckey); - GETEXT(olbvnum, versedata, 1, 1, 1, 1); - BLDVERSE(versedata, data); - charsetconvert(data); - len = strlen(data); - if (len) - write(fp, data, strlen(data)); - - *size = lseek(fp, 0, SEEK_CUR) - *offset; - write(fp, "\n", 1); - return 0; - } - return 1; -} - -void charsetconvert(char *data) -{ - for (;*data; data++) { -// printf("%c %d", *data, *data); - switch((unsigned char)*data) { - case 129: *data = 252; break; - case 130: *data = 233; break; - case 131: *data = 226; break; - case 133: *data = 224; break; - case 135: *data = 231; break; - case 136: *data = 234; break; - case 137: *data = 235; break; - case 138: *data = 232; break; - case 139: *data = 239; break; - case 140: *data = 238; break; - case 144: *data = 201; break; - case 147: *data = 244; break; - case 150: *data = 251; break; - case 151: *data = 249; break; - case 160: *data = 225; break; - case 161: *data = 237; break; - case 162: *data = 243; break; - case 163: *data = 250; break; - case 164: *data = 241; break; - case 168: *data = 191; break; - case 173: *data = 161; break; - default: - if ((unsigned char)*data > 126) - fprintf(stderr, "Suspicious character: %c (%d); %s\n", *data, (unsigned char )*data, (const char *)inckey); - break; - } - } -} - - -void openfiles() -{ - char buf[255]; - char fname[5]; - long pos; - short size; - - testmnt = key1.Testament(); - - strcpy(fname, (testmnt==2) ? "nt" : "ot"); - unlink(fname); - if ((fp = open(fname, O_CREAT|O_RDWR|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", fname); - exit(1); - } - - sprintf(buf, "%s.vss", fname); - unlink(buf); - if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", buf); - exit(1); - } - - sprintf(buf, "%s.cps", fname); - unlink(buf); - if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", buf); - exit(1); - } - - sprintf(buf, "%s.bks", fname); - unlink(buf); - if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", buf); - exit(1); - } - - pos = 0; - write(bfp, &pos, 4); /* Book offset for testament intros */ - pos = 4; - write(cfp, &pos, 4); /* Chapter offset for testament intro */ - - -/* Right now just zero out intros until parsing correctly */ - pos = 0; - size = 0; - write(vfp, &pos, 4); /* Module intro */ - write(vfp, &size, 2); - write(vfp, &pos, 4); /* Testament intro */ - write(vfp, &size, 2); - -} - - -void checkparams(int argc, char **argv) -{ - if (argc < 2) { - fprintf(stderr, "usage: %s \n", argv[0]); - exit(1); - } -} diff --git a/olb/online.ide b/olb/online.ide deleted file mode 100644 index efc10f0..0000000 Binary files a/olb/online.ide and /dev/null differ diff --git a/olb/online.prj b/olb/online.prj deleted file mode 100644 index 17be6ae..0000000 --- a/olb/online.prj +++ /dev/null @@ -1 +0,0 @@ -Turbo C Project File \ No newline at end of file diff --git a/olb/prn2sword.bpr b/olb/prn2sword.bpr deleted file mode 100644 index 9051810..0000000 --- a/olb/prn2sword.bpr +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1033 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[HistoryLists\hlIncludePath] -Count=3 -Item0=..\src\mgr;..\src\utilfuns;..\src\keys;$(BCB)\include;$(BCB)\include\vcl;..\include -Item1=..\src\utilfuns;..\src\keys;$(BCB)\include;$(BCB)\include\vcl;..\include -Item2=$(BCB)\include;$(BCB)\include\vcl;../include - -[HistoryLists\hlLibraryPath] -Count=3 -Item0=..\src\mgr;..\src\utilfuns;..\src\keys;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib -Item1=..\src\utilfuns;..\src\keys;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib -Item2=$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=1 -Item0=$(BCB)\source\vcl - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams= -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[CORBA] -AddServerUnit=1 -AddClientUnit=1 -PrecompiledHeaders=1 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - - \ No newline at end of file diff --git a/olb/prn2sword.cpp b/olb/prn2sword.cpp deleted file mode 100644 index e271f73..0000000 --- a/olb/prn2sword.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -//--------------------------------------------------------------------------- -#include -#pragma hdrstop -USERES("prn2sword.res"); -USEFORM("prn2swordfrm.cpp", Form2); -USEUNIT("..\src\keys\versekey.cpp"); -USEUNIT("..\src\keys\strkey.cpp"); -USEUNIT("..\src\keys\swkey.cpp"); -USEUNIT("..\src\keys\listkey.cpp"); -USEUNIT("..\src\utilfuns\utilstr.cpp"); -USEUNIT("..\src\mgr\localemgr.cpp"); -USEUNIT("..\src\mgr\swlocale.cpp"); -USEUNIT("..\src\mgr\swconfig.cpp"); -USEUNIT("..\src\mgr\swmgr.cpp"); -USEUNIT("..\src\mgr\filemgr.cpp"); -USEUNIT("..\src\utilfuns\roman.c"); -//--------------------------------------------------------------------------- -WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) -{ - try - { - Application->Initialize(); - Application->CreateForm(__classid(TForm2), &Form2); - Application->Run(); - } - catch (Exception &exception) - { - Application->ShowException(&exception); - } - return 0; -} -//--------------------------------------------------------------------------- diff --git a/olb/prn2swordfrm.cpp b/olb/prn2swordfrm.cpp deleted file mode 100644 index 0b4fc34..0000000 --- a/olb/prn2swordfrm.cpp +++ /dev/null @@ -1,501 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -//--------------------------------------------------------------------------- -#include -#pragma hdrstop - -#include "prn2swordfrm.h" -#include -#include -#include -#include -#include - -//--------------------------------------------------------------------------- -#pragma package(smart_init) -#pragma resource "*.dfm" -TForm2 *Form2; -const MAXVLEN = 8192; -//--------------------------------------------------------------------------- -__fastcall TForm2::TForm2(TComponent* Owner) - : TForm(Owner) -{ -} -//--------------------------------------------------------------------------- -void __fastcall TForm2::FSButtonClick(TObject *Sender) -{ - FSDialog->FileName = "*.rtf"; - char *fname; - - if (FSDialog->Execute()) { - FilePathEdit->Text = FSDialog->FileName; - } -} -//--------------------------------------------------------------------------- - - -void TForm2::ProcessFile(char *fileName) -{ - unsigned long pos = 0L; - unsigned short size = 0, tmp; - int verseNum, curbook = 0, curchap = 0, curverse = 0, curTestament = 1; - char buf[127]; - VerseKey mykey; - char verseBuf[MAXVLEN]; - bool fail = false; - char end = 0; - - - if ((fp = open(fileName, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - sprintf(buf, "Couldn't open file: %s\n", fileName); - MessageBox(this->Handle, buf, "ProcessFile", MB_OK); - return; - } - - openFiles("ot"); - - mykey = "Genesis 1:1"; - - getVerse(fp, &verseNum, verseBuf, 1); - do { - end = getVerse(fp, &verseNum, verseBuf, mykey.Testament()); - if (mykey.Verse() == 1) { /* if we're at a new chapter */ - if (mykey.Chapter() == 1) { /* if we're at a new book */ - if (mykey.Testament() != curTestament) { // we've made it to new testament - curTestament = mykey.Testament(); - close(vfp); // verse - close(cfp); // chapter - close(bfp); // book - close(dfp); // data - openFiles("nt"); - } - Memo1->Text = ""; - pos = lseek(cfp, 0, SEEK_CUR); - write(bfp, &pos, 4); - pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */ - write(cfp, &pos, 4); - pos = 0L; - tmp = 0; - write(vfp, &pos, 4); /* Book intro (vss) */ - write(vfp, &tmp, 2); - curbook++; - curchap = 0; - } - pos = lseek(vfp, 0, SEEK_CUR); - write(cfp, &pos, 4); - curverse = 1; - pos = 0L; - tmp = 0; - write(vfp, &pos, 4); /* Chapter intro */ - write(vfp, &tmp, 2); - curchap++; - } - else curverse++; - - if (mykey.Chapter() != curchap) { - sprintf(buf, "Error: Found chaptures out of sequence"); - Memo1->Lines->Append(buf); - fail = true; - break; - } - if ((mykey.Verse() != curverse) || (curverse != verseNum)) { - Memo1->Lines->Append("Error: Found verses out of sequence"); - sprintf(buf, "Expected %d (%s), but got %d\n\n", curverse, (const char *)mykey, verseNum); - Memo1->Lines->Append(buf); - Memo1->Lines->Append(" Currently SWORD only supports KJV verse numbering and book ordering."); - Memo1->Lines->Append(" Try combining extra verses with the last valid verse just before, including it in footnote markers (eg. (24) verse text. (25) verse text)"); - Memo1->Lines->Append(" This way, even though they will display in SWORD along with the previous verse, all data will be displayed."); - Memo1->Lines->Append(" Where verses are missing, add a blank entry."); - Memo1->Lines->Append(" Then try rerunning"); - fail = true; - break; - } - - pos = lseek(dfp, 0, SEEK_CUR); - write(vfp, &pos, 4); - size = strlen(verseBuf); - write(vfp, &size, 2); - sprintf(buf, "%2d:%3d:%3d (%s) found at offset: %7ld; size: %d", curbook, mykey.Chapter(), mykey.Verse(), (const char *)mykey, pos, size); - Memo1->Lines->Append(buf); - if ((size < 0) || (size > 1000)) { - Memo1->Lines->Append("WARNING: Strange Size."); - } - write(dfp, verseBuf, size); - mykey++; - } while (!end); - - close(vfp); // verse - close(cfp); // chapter - close(bfp); // book - close(dfp); // data - close(fp); // source - if (!fail) - Memo1->Lines->Append("SUCCESS!!!!!!!"); -} - - -char TForm2::getVerse(int fp, int *verseNum, char *verseBuf, char testament) -{ - char buf[21]; - char retVal = 0; - *verseNum=-1; - char *finalBuf = verseBuf; - int paridx; - const char *parchar = "\\par"; - - memset(buf, 0, 21); - - while (1) { - - if (!memcmp(buf, "\\f1 \\b0 \\fs22 \\f", 17)) { - if (isdigit(buf[18])) { - lseek(fp, -1, SEEK_CUR); - break; - } - else if (isdigit(buf[17])) { - lseek(fp, -2, SEEK_CUR); - break; - } - } - if (!memcmp(buf, "\\f1 \\b0 \\fs22 ", 14)) { - lseek(fp, -7, SEEK_CUR); - break; - } - if (!memcmp(buf, "\\li0\\fi0 \\par \\u", 16)) { - lseek(fp, -4, SEEK_CUR); - while(read(fp, buf, 1) == 1) { - if (*buf == 10) - break; - } - memset(buf, 0, 21); - } - memmove(buf, &buf[1], 20); - if (*buf) { - *verseBuf++ = *buf; - if (*verseNum == -1) { - if (isdigit(*buf)) { - sscanf(buf, "%d", verseNum); - } - } - } - if (read(fp, &buf[20], 1) != 1) { - retVal = 1; - for (int i = 1; i < 12; i++) - *verseBuf++ = buf[i]; - break; - } - } - *--verseBuf = 0; - paridx = 3; - // trim trailing junk - do { - verseBuf--; - if (paridx > -1) { - if (*verseBuf == parchar[paridx]) { - *verseBuf = 0; - paridx--; - continue; - } - if (paridx < 3) { - for (;paridx < 4;paridx++) - *verseBuf++ = parchar[paridx]; - break; - } - } - if ((*verseBuf != ' ') && (*verseBuf != 10) && (*verseBuf != 13) && (*verseBuf != '\\')) - break; - *verseBuf = 0; - } while (verseBuf > finalBuf); - *++verseBuf = 0; - - // check for Paragraph marker on next verse - for (int i = 7; i < 48; i++) { - if (buf[i] == '¶') { - *verseBuf++ = '<'; - *verseBuf++ = 'C'; - *verseBuf++ = 'M'; - *verseBuf++ = '>'; - *verseBuf++ = 0; - break; - } - } - - filterVerse(finalBuf, (testament == 2)?'G':'H'); - - return retVal; -} - - - - - - - -// lang - 'G' | 'H' -void TForm2::filterVerse(char *text, char lang) -{ - char *to, *from, token[MAXVLEN], tokpos = 0; - bool intoken = false; - bool intoken2 = false; - bool deref = false; - bool lastspace = false; - int len; - int maxlen = MAXVLEN - 1; - - - len = strlen(text) + 1; // shift string to right of buffer - if (len < maxlen) { - memmove(&text[maxlen - len], text, len); - from = &text[maxlen - len]; - } - else from = text; // ------------------------------- - - while (*from) { - if ((*from != ' ') && (!isdigit(*from)) && (*from != 10) && (*from !=13)) - break; - from++; - } - - for (to = text; *from; from++) { - if ((*from == '\\') && (!deref)) { - deref = true; - continue; - } - if (*from == '<') { - if (!isdigit(from[1])) { // Not a strongs number - if ((from[1] != 'C') || (from[2] != 'M') || (from[3] != '>')) { - *to++ = '<'; - *to++ = 'F'; - *to++ = 'O'; - *to++ = '>'; - continue; - } - } - } - if (*from == '>') { - if (!isdigit(from[-1])) { // Not a strongs number - if ((from[-2] != 'C') || (from[-1] != 'M') || (from[-3] != '<')) { - *to++ = '<'; - *to++ = 'F'; - *to++ = 'o'; - *to++ = '>'; - continue; - } - } - } - if (deref) { - deref = false; - if (*from == '{') { - *to++ = '<'; - *to++ = 'R'; - *to++ = 'F'; - *to++ = '>'; - continue; - } - - if (*from == '}') { - *to++ = '<'; - *to++ = 'R'; - *to++ = 'f'; - *to++ = '>'; - if (from[1] == '\\' && from[2] == 'i' && from[3] == '0') { - from += 3; - if (from[1] == ' ') { - if (lastspace) - from++; - } - } - continue; - } - if (*from == 'i') { - if (from[1] == '1') { - if (from[2] == ' ' && from[3] == '\\' && from[4] == '{') { - from++; - if (lastspace) - from++; - continue; - } - *to++ = '<'; - *to++ = 'F'; - *to++ = 'I'; - *to++ = '>'; - from++; - if (from[1] == ' ') { - if (lastspace) - from++; - } - continue; - } - if (from[1] == '0') { - *to++ = '<'; - *to++ = 'F'; - *to++ = 'i'; - *to++ = '>'; - from++; - if (from[1] == ' ') { - if (lastspace) - from++; - } - if ((from[1] == ' ') && (from[2] == ' ')){ // dorky, but OLB places 2 spaces after italics off - from++; - } - continue; - } - } - if (*from == 'f' && from[1] == 's') { - from++; - while (isdigit(from[1])) { - from++; - } - if (from[1] == ' ') { - if (lastspace) - from++; - } - continue; - } - *to++ = '\\'; - *to++ = *from; - lastspace = (*from == ' '); - continue; - } - - if (*from == '<') { - if (isdigit(from[1])) { - intoken = true; - tokpos = 0; - memset(token, 0, 20); - continue; - } - } - if (*from == '(') { - if (isdigit(from[1])) { - intoken2 = true; - tokpos = 0; - memset(token, 0, 20); - continue; - } - } - if ((*from == '>') && (intoken)) { - intoken = false; - if (*(to - 1) == ' ') - to--; - *to++ = '<'; - *to++ = 'W'; - *to++ = lang; - for (int i = 0; i < strlen(token); i++) - *to++ = token[i]; - *to++ = '>'; - continue; - } - if ((*from == ')') && (intoken2)) { - intoken2 = false; - if (*(to - 1) == ' ') - to--; - *to++ = '<'; - *to++ = 'W'; - *to++ = 'T'; - *to++ = lang; - for (int i = 0; i < strlen(token); i++) - *to++ = token[i]; - *to++ = '>'; - continue; - } - - if ((*from == 13) || (*from == 10)) { - continue; - } - - if (*from == '¶') { - if (from[1] == ' ') { - from++; - } - continue; - } - - if (intoken || intoken2) - token[tokpos++] = *from; - else - *to++ = *from; - lastspace = (*from == ' '); - } - *to-- = 0; - *++to = '\n'; - *++to = 0; -} - - -void TForm2::openFiles(char *fileName) -{ - char buf[128]; - long pos; - short size; - - unlink(fileName); - if ((dfp = open(fileName, O_CREAT|O_WRONLY, S_IREAD|S_IWRITE)) == -1) { - sprintf(buf, "Couldn't open file: %s\n", fileName); - MessageBox(this->Handle, buf, "ProcessFile", MB_OK); - return; - } - - sprintf(buf, "%s.vss", fileName); - unlink(buf); - if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - sprintf(buf, "Couldn't open file: %s\n", buf); - MessageBox(this->Handle, buf, "ProcessFile", MB_OK); - return; - } - - sprintf(buf, "%s.cps", fileName); - unlink(buf); - if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - sprintf(buf, "Couldn't open file: %s\n", buf); - MessageBox(this->Handle, buf, "ProcessFile", MB_OK); - return; - } - - sprintf(buf, "%s.bks", fileName); - unlink(buf); - if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE)) == -1) { - sprintf(buf, "Couldn't open file: %s\n", buf); - MessageBox(this->Handle, buf, "ProcessFile", MB_OK); - return; - } - pos = 0; - write(bfp, &pos, 4); /* Book offset for testament intros */ - pos = 4; - write(cfp, &pos, 4); /* Chapter offset for testament intro */ - - -/* Right now just zero out intros until parsing correctly */ - pos = 0; - size = 0; - write(vfp, &pos, 4); /* Module intro */ - write(vfp, &size, 2); - write(vfp, &pos, 4); /* Testament intro */ - write(vfp, &size, 2); - - -} - -void __fastcall TForm2::Button1Click(TObject *Sender) -{ - ProcessFile(FilePathEdit->Text.c_str()); -} -//--------------------------------------------------------------------------- - - diff --git a/olb/prn2swordfrm.dfm b/olb/prn2swordfrm.dfm deleted file mode 100644 index 0bc45fc..0000000 Binary files a/olb/prn2swordfrm.dfm and /dev/null differ diff --git a/olb/prn2swordfrm.h b/olb/prn2swordfrm.h deleted file mode 100644 index 138ba17..0000000 --- a/olb/prn2swordfrm.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -//--------------------------------------------------------------------------- -#ifndef prn2swordfrmH -#define prn2swordfrmH -//--------------------------------------------------------------------------- -#include -#include -#include -#include -#include -#include -//--------------------------------------------------------------------------- -class TForm2 : public TForm -{ -__published: // IDE-managed Components - TPanel *Panel1; - TLabel *Label1; - TEdit *FilePathEdit; - TButton *FSButton; - TPanel *Panel2; - TButton *Button1; - TMemo *Memo1; - TOpenDialog *FSDialog; - void __fastcall FSButtonClick(TObject *Sender); - void __fastcall Button1Click(TObject *Sender); -private: // User declarations - int fp, vfp, cfp, bfp, dfp; - void openFiles(char *fileName); - void filterVerse(char *finalBuf, char lang); -public: // User declarations - __fastcall TForm2(TComponent* Owner); - void ProcessFile(char *fileName); - char getVerse(int fp, int *verseNum, char *verseBuf, char testament); -}; -//--------------------------------------------------------------------------- -extern PACKAGE TForm2 *Form2; -//--------------------------------------------------------------------------- -#endif diff --git a/samples/mods.conf.large b/samples/mods.conf.large deleted file mode 100644 index 91f8fcc..0000000 --- a/samples/mods.conf.large +++ /dev/null @@ -1,466 +0,0 @@ -[Globals] -AutoInstall=./newmods/ - -[-+*Personal*+-] -DataPath=/usr/local/sword/modules/comments/rawfiles/personal/ -ModDrv=RawFiles -Description=Personal Commentary -About=This module allows you to store your own commentary. - -[SpanishRVA] -DataPath=/usr/local/sword/modules/texts/rawtext/spanishrva/ -ModDrv=RawText -SourceType=GBF -Description=The New International Version -About=\qc El texto b¡blico designado RVA es de LA SANTA BIBLIA, \par \ -VERSION REINA-VALERA ACTUALIZADA. Copyright 1982, 1986, \par \ -1987, 1989 de la Casa Bautista de Publicaciones. \par\par \ -Todos los derechos reservados. \par\par \ -El texto computarizado de la RVA para LA BIBLIA COM- \par \ -PUTARIZADA no puede ser modificado ni copiado sin per- \par \ -miso por escrito por la Casa Bautista de Publicaciones. \par\pard \ - - -[NASB] -DataPath=/usr/local/sword/modules/texts/rawtext/nasb/ -ModDrv=RawText -Description=The New American Standard Bible -About=\qc -=+* see the file errata.doc for important verse descrepencies *+=- \par\par \ -The New American Standard Bible \par \ -Copyright THE LOCKMAN FOUNDATION, 1960, 1962, 1963 \par \ -La Habra, Calif. \par \ -All rights in this book are reserved. \par \ -No part may be reproduced in any manner without \par \ -permission in writing from The Lockman Foundation, \par \ -except brief quotations used in connection with \par \ -a review in a magazine or newspaper. \par\pard - - - - -[NIV] -DataPath=/usr/local/sword/modules/texts/rawtext/niv/ -ModDrv=RawText -Description=The New International Version -About=\qc -=+* see the file errata.doc for important verse descrepencies *+=- \par\par\pard \ -Quotations designated (NIV) are from \par\par \ -THE HOLY BIBLE: NEW INTERNATIONAL VERSION®. \par \ -Copyright © 1973, 1978, 1984 by International Bible Society; \ -Zondervan Publishing House. All rights reserved. \par\par \ -The "NIV" and "New International Version" trademarks are registered in \ -the United States Patent and Trademark Office by International Bible \ -Society. \par\par \ -The NIV text may be quoted in any form (written, visual, electronic, or \ -audio), up to and inclusive of five hundred (500) verses or less without \ -written permission, providing the verses quoted do not amount to a \ -complete book of the Bible, do not comprise 25% or more of the total \ -text of the work in which they are quoted, and the verses are not being \ -quoted in a commentary or other Biblical reference work. This \ -permission is contingent upon an appropriate copyright acknowledgment. \par\par \ -The NIV database is not a shareware program and may not be \ -duplicated. \par\par\pard - - -[JFB] -DataPath=/usr/local/sword/modules/comments/hrefcom/jfb/ -ModDrv=HREFCom -Prefix=http://ccel.wheaton.edu/j/jfb/jfb/ -;External=0 -;Prefix=file:////usr/local/sword/modules/comments/hrefcom/jfb/ -External=1 -Description=Jamison Faucett Brown Bible Commentary -About=\qc Jamison Faucett Brown Commentary - - -[Naves] -DataPath=/usr/local/sword/modules/lexdict/rawld/naves/naves -ModDrv=RawLD -Description=Nave's Topical Bible -About= -=+* see the file 'naves.doc' for more details *+=-\par\par \ -\qc Nave's Topical Bible \par\par \ -Public Domain -- Copy Freely \par\par\pard \ - Nave's Topics were originaly produced by Orville J. Nave, A.M., D.D., \ -LL.D. while serving as a Chaplin in the United States Army. He referred \ -to this work as "the result of fourteen years of delightful and untiring \ -study of the Word of God." Nave's topics were originally published in \ -the early 1900's, and a photo-offset reproduction is currently published \ -by Hendrickson, ISBN 0-917006-02-X. The title page states that this \ -work consists of 20,000+ topics and subtopics, and 100,000 references to \ -the Scriptures. \par\par \ - The most current and correct copies of these files can be obtained from the \ -following. If any errors are located, please ensure you have the latest files, and if so, \ -we would appreciate being informed of the error. \par\par \ - The Bible Foundation \par \ - http://www.bf.org \par\par \ - Or by contacting: \par\par \ - Mark Fuller \par \ - 1129 East Loyola Drive \par \ - Tempe, Arizona, 85282 \par \ - 602-829-8542 (voice) - -[BBE] -DataPath=/usr/local/sword/modules/texts/rawtext/bbe/ -ModDrv=RawText -Description=The Bible in Basic English -About= \qc -=+* see the file 'bbe.doc' for more details *+=-\par\par \ -1949/1964 Bible In Basic English \par \ -Public Domain -- Copy Freely \par\par\pard \ -The Bible In Basic English was printed in 1965 by Cambridge Press in \ -England. Published without any copyright notice and distributed in \ -America, this work fell immediatly and irretrievably into the Public \ -Domain in the United States according to the UCC convention of that \ -time. A call to Cambridge prior to placing this work in etext resulted \ -in an admission of this fact. \par\par \ -For more information about the text, see the file INTRO.BBE which \ -contains the printed introduction page. \par\par \ -The most current and correct copies of these files can be obtained from \ -the following. If any errors are located, please ensure you have the \ -latest files, and if so, we would appreciate being informed of the \ -error. \par\par \ - The Bible Foundation \par \ - http://www.bf.org \par\par \ -Or by contacting: \par \ - Mark Fuller\par \ - 1129 East Loyola Drive \par \ - Tempe, Arizona, 85282 \par \ - 602-829-8542 (voice) - -[IndTB] -DataPath=/usr/local/sword/modules/texts/rawtext/indtb/ -ModDrv=RawText -Description=Indonesian Terjemahan Baru -About=\qc Terjemahan Baru (TB) \par\par \ -Copyright Lembaga Alkitab Indonesia \par \ -(Indonesian Bible Society), 1994. \par \ -Released for non-profit scholarly and personal use. \par \ -Not to be sold for profit. \par \ -When making formal public reference to the materials, \par \ -please acknowlege The Indonesian Bible Society \par \ -(Lembaga Alkitab Indonesia) as the copyright holder. \par \pard - - - -[IndBIS] -DataPath=/usr/local/sword/modules/texts/rawtext/indbis/ -ModDrv=RawText -Description=Indonesian Bahasa Indonesia Sehari-hari (BIS) -About=\qc Bahasa Indonesia Sehari-hari (BIS) \par\par \ -Copyright Lembaga Alkitab Indonesia \par \ -(Indonesian Bible Society), 1994. \par \ -Released for non-profit scholarly and personal use. \par \ -Not to be sold for profit. \par \ -When making formal public reference to the materials, \par \ -please acknowlege The Indonesian Bible Society \par \ -(Lembaga Alkitab Indonesia) as the copyright holder. \par \pard - - - -[Websters] -DataPath=/usr/local/sword/modules/texts/rawtext/websters/ -ModDrv=RawText -Description=The Webster Bible -About= -=+* see the files 'intro.txt' and 'revision.txt' for more details *+=-\par\par \ -\qc THE \par HOLY BIBLE, \par CONTAINING THE \par OLD AND NEW TESTAMENTS, \par IN THE \par \ -COMMON VERSION. \par WITH \par AMENDMENTS OF THE LANGUAGE, \par \ -BY NOAH WEBSTER, LL. D. \par\par ------------- \par NEW HAVEN: \par \ -PUBLISHED BY DURRIE & PECK. \par \ -Sold by HEZEKIAH HOWE & CO., and A. H. MALTBY, New Haven; \par \ -and by N.&J. WHITE, New York. \par\par ------ \par 1833 \par\par \ -Webster Bible Electronic Format.\par \ -PUBLIC DOMAIN\par\par \ -February 1992\par\par\pard \ -Webster Biography:\par \ -Noah Webster: America's first grammarian and founding father of American education.\par\par \ - In 1828 Noah Webster published the 'American Dictionary of the English Language'. This \ -dictionary demonstrates the Christian values which were found in America's educational \ -and scholarly systems. It is from this early dictionary that we have todays popular \ -'Webster Dictionary'. In 1833 Noah Webster, who had mastered 20 languages including \ -Hebrew and Greek, published the King James Authorized Version 'with amendments to the \ -language'. In stating his reasons for producing this version of the Bible, Webster said:\par\par \ - 'In the present version, the language is, in general, correct and perspicuous; \ -... in many passages uniting sublimity with beautiful simplicity. In my view, the general \ -style of the version ought not to be altered. But, in the lapse of two or three centuries, \ -changes have taken place, which, in particular passages, impair the beauty; in others, \ -obscure the sense, of the original languages. ... they do not present to the reader \ -the Word of God. ... My principal aim is to remedy this evil.'\par\par \ -It was with cautious reverence that Webster corrected misused grammar, removed offensive \ -terms and expressions, and substituted commonly understood words for words that had fallen \ -into disuse, or no longer carried the same meaning.\par\par\ - In 1834, the year after completing the Webster Bible, Noah Webster wrote a \ -companion piece titled 'Value of the Bible and Excellence of the Christian Religion - For \ -the Use of Families and Schools'.\par\par\ - Webster, who was considered 'The schoolmaster to a nation' and produced the \ -earliest spellers and textbooks for America's school children, believed Christian religious \ -values and American public education to be inseparable. He believed the Webster Bible to \ -be 'the most important enterprise' of his life, and referred to the Bible as:\par\par \ - '... the chief moral cause of all that is good, and the best corrector of all that \ -is evil, in human society; the best book for regulating the temporal concerns of men, and \ -the only book that can serve as an infallible guide to future felicity.'\par\par \ -Introduction to the Electronic Format:\par \ - Beginning in July of 1991 the task of placing the Webster Bible text in electronic \ -format began. The original purpose was to provide Larry Pierce, who produces the \ -On-Line Bible program, with a more modern *public domain* text, similar in content and \ -style to the AV but with a grammar that would provide better comprehension in todays \ -English.\par\par\ - I plan on maintaining an accurate copy of the Webster text. Anyone finding an \ -error should contact me; Anyone desiring to obtain the latest, most correct text, can find \ -it on the Bible Foundation BBS, or can contact me in the following methods:\par \ - Internet acus10@waccvm.corp.mot.com\par \ - Home phone 602-829-8542\par \ - Address Mark Fuller\par \ - 1129 East Loyola Drive\par \ - Tempe Arizona, 85282\par \ - Bible Foundation http://www.bf.org\par\par \ - I would like to thank the Bible Foundation not only for scanning nearly the entire \ -Webster Bible but for encouraging me to undertake this monumental work; particularly around \ -page 20 when I realized what I had gotten myself into. Special thanks to Jerry Kingery of \ -the Bible Foundation for scanning, and Jerry Hastings for doing some preliminary scan \ -cleaning and making the texts available on the BBS. - - -[Sve] -DataPath=/usr/local/sword/modules/texts/rawtext/sve/ -ModDrv=RawText -Description=Swedish Bible 1917 New Testament -About=\qc BIBELN eller DEN HELIGA SKRIFT \par innehållande \par \ -NYA TESTAMENTETS KANONISKA BÖCKER \par i överensstämmelse med den av \par \ -KONUNGEN ÅR 1917 \par gillade och stadfästa översättningen \par\par \ -THE BIBLE or THE HOLY SCRIPT \par containing \par CANONICAL BOOKS OF NEW TESTAMENT \par \ -in conformity with that of \par THE KING YEAR 1917 \par \ -liked and confirmed translation \par\par\pard \ - Thank you to Roland Nygren for making this work available. For the latest \ -information, to report corrections, or for other correspondence: \par\par \ - Roland Nygren \par \ - qtxrony@aom.ericsson.se - -[VNT] -DataPath=/usr/local/sword/modules/texts/rawtext/vnt/ -ModDrv=RawText -Description=Valera 1858 Spanish New Testament Text -About=\qc-=+* see the file 'intro.rtf' for more details *+=- \par\par \ -El \par NUEVO TESTAMENTO \par DE \par NUESTRO SEÑOR JESU-CRISTO \par \ -QUE CONTIENE \par LOS ESCRITOS EVANGÉLICOS Y APOSTÓLICOS \par \ -ANTIGUA VERSION DE CIPRIANO DE VALERA \par REVISADA \par \ -Con arreglo al original griego. \par MADRID \par \ -SE HALLA EN EL DEPÓSITO CENTRAL DE LA SOCIEDAD BÍBLICA B. Y E. \par \ -Calle de Preciados, número 46. \par 1884 \par EL SANTO EVANGELIO \par DE \par \ -NUESTRO SEÑOR JESU-CRISTO \par SEGUN \par SAN MATEO. \par\par \pard \ - Thank you to Bill Kincaid for making this work available. \ -This New Testament text (Valera 1858) was downloaded from The Word of God in \ -Spanish: Valera 1909 web site. (http://www.west.ga.net/~ForHim/word.html) This text is not \ -copyrighted, you are free to distribute it as you wish. We only ask out of respect for the \ -work we invested in bringing you this text (Finding, scanning, and proofing.), that you \ -leave this notice and the following introduction ([see the file intro.rtf]) in any copies \ -that you might make publish on the Internet. If you have any questions or comments please \ -contact: mnj@acnet.net \par\par \ - Este texto del Nuevo Testamento (Valera 1858) fue bajado del la pagina de \ -web: La Palabra de Dios en Español: Valera 1909. (http://www.west.ga.net/~ForHim/word.html) \ - Este texto no tiene derechos reservados, puedes distribuirlo como quieres. Solamente \ -pedimos que por respeto del trabajo que invertimos en dándote este texto (Encontrando, \ -escaneando, y corrigiendo.), que dejes esta noticia y la siguiente introducción \ -(FILE: intro.rtf) en cualquier copia que publicas sobre el Internet. Si tienes cualquier \ -pregunta o comentario por favor escribe a: mnj@acnet.net. - - -[MHC] -DataPath=/usr/local/sword/modules/comments/rawcom/mhc/ -ModDrv=RawCom -Description=Matthew Henry's Commentary on the Whole Bible -About=\qc Matthew Henry's \par Concise Commentary on the Whole Bible \par\par \ -Public Domain--Copy Freely. \par\par\pard \ - This text matches the printed edition as published by Moody Press, 28th printing, \ -no Copyright displayed. ISBN: 0-8024-5190-X. This text was created from an existing \ -electronic copy, with roughly 1200 errors corrected. The current files can be \ -found at: \par\par \ - The Bible Foundation, \par \ - http://www.bf.org \par\par \ - If any errors are located, please notify me at the above BBS, or at: \par\par \ - Mark Fuller \par \ - 1129 E. Loyola Dr. \par \ - Tempe, Az. 85282 \par \ - (602) 829-8542 - - - -[RWP] -DataPath=/usr/local/sword/modules/comments/rawcom/rwp/ -ModDrv=RawCom -Description=Robertson's Word Pictures -About=\qc -=+* see the files 'about.txt', 'title.pg', 'rwp.int', 'read.me', and \ -'correct.txt' for more details *+=- \par\par \ - Robertson's \par Word Pictures in the \par New Testament \par\par \ -A.T. Robertson, A.M., D.D., LL. D., Litt.D. \par\par\pard \ -Vol 1,2,3,4 Public Domain -- Copy Freely \par\par Volume 5 (c) 1932. \par \ -Renewal 1960 Broadman Press. All rights reserved. \par Used by permission. \par \ -[Copyright expires Dec. 31, 2006.] \par\par Volume 6 (c) 1933. \par \ -Renewal 1960 Broadman Press. All rights reserved. \par Used by permission. \par \ -[Copyright expires Dec. 31, 2007.] \par\par \ -+--------------- Copy Freely --------------+ \par\par \ - The current files can be found at: \par\par \ - The Bible Foundation, \par \ - http://www.bf.org \par\par \ - If any errors are located, please notify me at the above location, or at: \par\par \ - Mark Fuller \par \ - 1129 E. Loyola Dr. \par \ - Tempe, Az. 85282 \par \ - (602) 829-8542 - - -[Eastons] -DataPath=/usr/local/sword/modules/lexdict/rawld/eastons/eastons -ModDrv=RawLD -Description=Easton's Bible Dictionary -About=\qc Easton's 1897 Bible Dictionary \par\par \ -Public Domain -- Copy Freely \par\par\pard \ - These Dictionary topics are from M.G. Easton M.A., D.D., Illustrated Bible \ -Dictionary, Third Edition, published by Thomas Nelson, 1897. Due to the nature of etext, \ -the illustrated portions of the Dictionary have not been included. \par\par \ - The most current and correct copies of these files can be obtained from the \ -following. If any errors are located, please ensure you have the latest files, and if so, \ -we would appreciate being informed of the error. \par\par \ - The Bible Foundation \par \ - http://www.bf.org \par\par \ - Or by contacting: \par\par \ - Mark Fuller \par \ - 1129 East Loyola Drive \par \ - Tempe, Arizona, 85282 \par \ - 602-829-8542 (voice) - -[Vines] -DataPath=/usr/local/sword/modules/lexdict/rawld/vines/vines -ModDrv=RawLD -Description=Vines Bible Dictionary -About=\qc Vine's Expository Dictionary \par of New Testament Words \par\par \ -Public Domain -- Copy Freely \par\par\pard \ - These Dictionary topics are from W.E. Vine's M.A., Expository Dictionary of New Testament \ -Words published in 1940 and without copyright. \par\par \ - The most current and correct copies of these files can be obtained from the \ -following. If any errors are located, please ensure you have the latest files, and if so, \ -we would appreciate being informed of the error. \par\par \ - The Bible Foundation \par \ - http://www.bf.org \par\par \ - Or by contacting: \par\par \ - Mark Fuller \par \ - 1129 East Loyola Drive \par \ - Tempe, Arizona, 85282 \par \ - 602-829-8542 (voice) - - -[Strongs Hebrew (OT)] -DataPath=/usr/local/sword/modules/lexdict/rawld/strongs/hebrew -ModDrv=RawLD -Description=Strong's / Englishman's Hebrew Bible Dictionary -About=\qc Strong's / Englishman's Bible Dictionary \par\par \pard \ -This is a lexicon of Hebrew words keyed off of Strong's numbers. - -[Strongs Greek (NT)] -DataPath=/usr/local/sword/modules/lexdict/rawld/strongs/greek -ModDrv=RawLD -Description=Strong's / Englishman's Greek Bible Dictionary -About=\qc Strong's / Englishman's Bible Dictionary \par\par \pard \ -This is a lexicon of Greek words keyed off of Strong's numbers. - - - -[WEB] -DataPath=/usr/local/sword/modules/texts/rawtext/web/ -ModDrv=RawText -Description=The World English Bible -About= -=+* see the file 'info.txt' for more details *+=-\par\par \ -\qc The World English Bible (WEB) \par\par Public Domain \par\par \pard \ - The World English Bible is a 1997 revision of the American Standard Version of the \ -Holy Bible, first published in 1901. It is in the Public Domain. Please feel free to copy \ -and distribute it freely. \par\par \ - Thank you to Michael Paul Johnson for making this work available. For the latest \ -information, to report corrections, or for other correspondence: \par\par \ - Michael Paul Johnson \par \ - http://www.ebible.org/bible \par \ - mpj@ebible.org - - -[ORTHJBC] -DataPath=/usr/local/sword/modules/texts/rawtext/orthjbc/ -ModDrv=RawText -Description=The Orthodox Jewish Brit Chadasha -About= \qc THE ORTHODOX JEWISH BRIT CHADASHA \par\par \pard \ - A translation from the original language without goyishe and non-frum \ -terminology. \par\par \ -(C)COPYRIGHT, 1996, ARTISTS FOR ISRAEL INTERNATIONAL \par \ -ALL RIGHTS RESERVED \par \ -USED BY PERMISSION \par\par \ - Thank you to Dr. Phil Goble for making this work available. This work is NOT in \ -the public domain. Please honor all applicable copyright laws. Permission to distribute \ -this text in its present electronic format for personal use has been granted by the \ -copyright holder. \par\par \ - Please direct all correspondence to: \par\par \ - Artists for Israel International \par \ - http://www.afii.org \par \ - P. O. Box 2056 \par \ - New York, NY 10163 - - - -[N27U4] -DataPath=/usr/local/sword/modules/texts/rawtext/nu/ -ModDrv=RawText -Font=Greek -Description=Nestle Aland 27th Ed./ UBS 4th Ed. Greek Text -About= \qc Thank you to Barbara Aland, Kurt Aland, Johannes Karavidopoulos, Carlo M. \ -Martini, and Bruce M. Metzger for bringing this work to us. \par\par \pard \ -GREEK.TTF Greek Regular Font (C) Peter J. Gentry & Andrew M. Fountain, 1993. All Rights \ -Reserved. Special thanks to the copyright holders for permission to use these fonts with \ -The SWORD Project for personal use. For a complete list of Greek / Hebrew Utilities or \ -inquiries for other use may be directed to: \par\par \ - Peter J. Gentry \par \ - 55 Ambercroft Blvd. \par \ - Scarborough \par \ - Ontario, Canada \par \ - M1W 2Z6 - - -[KJV] -DataPath=/usr/local/sword/modules/texts/rawtext/kjv/ -ModDrv=RawText -Description=King James Version of 1611 -About= -=+* see the file 'kjvpref.rtf' for more details *+=-\par\par \ - This is the King James Version of the Holy Bible (also known as the Authorized \ -Version) in Rich Text Format (among others, italics and red included). The preface from \ -the translators is in KJVPREF.RTF. These files are in the Public Domain. \par\par \ - May God bless you as you study His Word. \par \ - Michael Paul Johnson \par \ - Sysop, Colorado Catacombs BBS (303-772-1062) \par \ - email: mpj@csn.net \par \ - http://www.csn.net/~mpj - - - - -[KJVSTR] -DataPath=/usr/local/sword/modules/texts/rawtext/kjvstr/ -ModDrv=RawText -Description=King James Version of 1611 w/ Strongs Numbers -About= This is the King James Version of the Holy Bible (also known as the Authorized \ -Version) with embedded Strong's Numbers. This makes useful for looking up the exact \ -original language word in a lexicon that is keyed off of Strong's numbers. \par\par \ -Special thanks to Larry Pierce for extensive work encorporating the embedded \ -Strong's numbers in this module. This feature is not in the public domain. \ -Permission to use this feature for personal use has been granted by the author. \par \ -Inquiries and comments may be directed to: \par\par \ - Larry Pierce \par \ - 103526.2724@compuserve.com \par \ - http://www.online-bible.com - -[FrenchLSG] -DataPath=/usr/local/sword/modules/texts/rawtext/frenchlsg/ -ModDrv=RawText -Description=French 1910 Louis Segond Version -About=The 1910 edition of the Louis Segond Bible is keyed to Strong's numbers. \ -All this material may be freely copied and shared with your friends. \ -If you wish to use this material for other purposes, please contact: \par\par \ - Stg. Publishare \par \ - c/o Transvaalstraat 5 \par \ - 3312 EX DORDRECHT \par \ - The Netherlands \par\par \ -to obtain the latest accurate copy. The Englishman Strong's numbers are \ -not in the public domain and any commercial use requires a licence. - diff --git a/samples/mods.conf.small b/samples/mods.conf.small deleted file mode 100644 index 5b966c8..0000000 --- a/samples/mods.conf.small +++ /dev/null @@ -1,144 +0,0 @@ -[Globals] - - -[Websters] -DataPath=/usr/local/lib/sword/modules/texts/rawtext/websters/ -ModDrv=RawText -Description=The Webster Bible -About= -=+* see the files 'intro.txt' and 'revision.txt' for more details *+=-\par\par \ -\qc THE \par HOLY BIBLE, \par CONTAINING THE \par OLD AND NEW TESTAMENTS, \par IN THE \par \ -COMMON VERSION. \par WITH \par AMENDMENTS OF THE LANGUAGE, \par \ -BY NOAH WEBSTER, LL. D. \par\par ------------- \par NEW HAVEN: \par \ -PUBLISHED BY DURRIE & PECK. \par \ -Sold by HEZEKIAH HOWE & CO., and A. H. MALTBY, New Haven; \par \ -and by N.&J. WHITE, New York. \par\par ------ \par 1833 \par\par \ -Webster Bible Electronic Format.\par \ -PUBLIC DOMAIN\par\par \ -February 1992\par\par\pard \ -Webster Biography:\par \ -Noah Webster: America's first grammarian and founding father of American education.\par\par \ - In 1828 Noah Webster published the 'American Dictionary of the English Language'. This \ -dictionary demonstrates the Christian values which were found in America's educational \ -and scholarly systems. It is from this early dictionary that we have todays popular \ -'Webster Dictionary'. In 1833 Noah Webster, who had mastered 20 languages including \ -Hebrew and Greek, published the King James Authorized Version 'with amendments to the \ -language'. In stating his reasons for producing this version of the Bible, Webster said:\par\par \ - 'In the present version, the language is, in general, correct and perspicuous; \ -... in many passages uniting sublimity with beautiful simplicity. In my view, the general \ -style of the version ought not to be altered. But, in the lapse of two or three centuries, \ -changes have taken place, which, in particular passages, impair the beauty; in others, \ -obscure the sense, of the original languages. ... they do not present to the reader \ -the Word of God. ... My principal aim is to remedy this evil.'\par\par \ -It was with cautious reverence that Webster corrected misused grammar, removed offensive \ -terms and expressions, and substituted commonly understood words for words that had fallen \ -into disuse, or no longer carried the same meaning.\par\par\ - In 1834, the year after completing the Webster Bible, Noah Webster wrote a \ -companion piece titled 'Value of the Bible and Excellence of the Christian Religion - For \ -the Use of Families and Schools'.\par\par\ - Webster, who was considered 'The schoolmaster to a nation' and produced the \ -earliest spellers and textbooks for America's school children, believed Christian religious \ -values and American public education to be inseparable. He believed the Webster Bible to \ -be 'the most important enterprise' of his life, and referred to the Bible as:\par\par \ - '... the chief moral cause of all that is good, and the best corrector of all that \ -is evil, in human society; the best book for regulating the temporal concerns of men, and \ -the only book that can serve as an infallible guide to future felicity.'\par\par \ -Introduction to the Electronic Format:\par \ - Beginning in July of 1991 the task of placing the Webster Bible text in electronic \ -format began. The original purpose was to provide Larry Pierce, who produces the \ -On-Line Bible program, with a more modern *public domain* text, similar in content and \ -style to the AV but with a grammar that would provide better comprehension in todays \ -English.\par\par\ - I plan on maintaining an accurate copy of the Webster text. Anyone finding an \ -error should contact me; Anyone desiring to obtain the latest, most correct text, can find \ -it on the Bible Foundation BBS, or can contact me in the following methods:\par \ - Internet acus10@waccvm.corp.mot.com\par \ - Home phone 602-829-8542\par \ - Address Mark Fuller\par \ - 1129 East Loyola Drive\par \ - Tempe Arizona, 85282\par \ - Bible Foundation http://www.bf.org\par\par \ - I would like to thank the Bible Foundation not only for scanning nearly the entire \ -Webster Bible but for encouraging me to undertake this monumental work; particularly around \ -page 20 when I realized what I had gotten myself into. Special thanks to Jerry Kingery of \ -the Bible Foundation for scanning, and Jerry Hastings for doing some preliminary scan \ -cleaning and making the texts available on the BBS. - - - -[RWP] -DataPath=/usr/local/lib/sword/modules/comments/rawcom/rwp/ -ModDrv=RawCom -Description=Robertson's Word Pictures -About=\qc -=+* see the files 'about.txt', 'title.pg', 'rwp.int', 'read.me', and \ -'correct.txt' for more details *+=- \par\par \ - Robertson's \par Word Pictures in the \par New Testament \par\par \ -A.T. Robertson, A.M., D.D., LL. D., Litt.D. \par\par\pard \ -Vol 1,2,3,4 Public Domain -- Copy Freely \par\par Volume 5 (c) 1932. \par \ -Renewal 1960 Broadman Press. All rights reserved. \par Used by permission. \par \ -[Copyright expires Dec. 31, 2006.] \par\par Volume 6 (c) 1933. \par \ -Renewal 1960 Broadman Press. All rights reserved. \par Used by permission. \par \ -[Copyright expires Dec. 31, 2007.] \par\par \ -+--------------- Copy Freely --------------+ \par\par \ - The current files can be found at: \par\par \ - The Bible Foundation, \par \ - http://www.bf.org \par\par \ - If any errors are located, please notify me at the above location, or at: \par\par \ - Mark Fuller \par \ - 1129 E. Loyola Dr. \par \ - Tempe, Az. 85282 \par \ - (602) 829-8542 - - -[Vines] -DataPath=/usr/local/lib/sword/modules/lexdict/rawld/vines/vines -ModDrv=RawLD -Description=Vines Bible Dictionary -About=\qc Vine's Expository Dictionary \par of New Testament Words \par\par \ -Public Domain -- Copy Freely \par\par\pard \ - These Dictionary topics are from W.E. Vine's M.A., Expository Dictionary of New Testament \ -Words published in 1940 and without copyright. \par\par \ - The most current and correct copies of these files can be obtained from the \ -following. If any errors are located, please ensure you have the latest files, and if so, \ -we would appreciate being informed of the error. \par\par \ - The Bible Foundation \par \ - http://www.bf.org \par\par \ - Or by contacting: \par\par \ - Mark Fuller \par \ - 1129 East Loyola Drive \par \ - Tempe, Arizona, 85282 \par \ - 602-829-8542 (voice) - - -[Strongs Hebrew (OT)] -DataPath=/usr/local/lib/sword/modules/lexdict/rawld/strongs/hebrew -ModDrv=RawLD -Description=Strong's / Englishman's Hebrew Bible Dictionary -About=\qc Strong's / Englishman's Bible Dictionary \par\par \pard \ -This is a lexicon of Hebrew words keyed off of Strong's numbers. - -[Strongs Greek (NT)] -DataPath=/usr/local/lib/sword/modules/lexdict/rawld/strongs/greek -ModDrv=RawLD -Description=Strong's / Englishman's Greek Bible Dictionary -About=\qc Strong's / Englishman's Bible Dictionary \par\par \pard \ -This is a lexicon of Greek words keyed off of Strong's numbers. - - - -[WEB] -DataPath=/usr/local/lib/sword/modules/texts/rawtext/web/ -ModDrv=RawText -SourceType=GBF -Description=The World English Bible -About= -=+* see the file 'info.txt' for more details *+=-\par\par \ -\qc The World English Bible (WEB) \par\par Public Domain \par\par \pard \ - The World English Bible is a 1997 revision of the American Standard Version of the \ -Holy Bible, first published in 1901. It is in the Public Domain. Please feel free to copy \ -and distribute it freely. \par\par \ - Thank you to Michael Paul Johnson for making this work available. For the latest \ -information, to report corrections, or for other correspondence: \par\par \ - Michael Paul Johnson \par \ - http://www.ebible.org/bible \par \ - mpj@ebible.org - - diff --git a/samples/mods.d/rwp.conf b/samples/mods.d/rwp.conf deleted file mode 100644 index 384a5fc..0000000 --- a/samples/mods.d/rwp.conf +++ /dev/null @@ -1,23 +0,0 @@ -[RWP] -DataPath=/usr/local/lib/sword/modules/comments/rawcom/rwp/ -ModDrv=RawCom -Description=Robertson's Word Pictures -About=\qc -=+* see the files 'about.txt', 'title.pg', 'rwp.int', 'read.me', and \ -'correct.txt' for more details *+=- \par\par \ - Robertson's \par Word Pictures in the \par New Testament \par\par \ -A.T. Robertson, A.M., D.D., LL. D., Litt.D. \par\par\pard \ -Vol 1,2,3,4 Public Domain -- Copy Freely \par\par Volume 5 (c) 1932. \par \ -Renewal 1960 Broadman Press. All rights reserved. \par Used by permission. \par \ -[Copyright expires Dec. 31, 2006.] \par\par Volume 6 (c) 1933. \par \ -Renewal 1960 Broadman Press. All rights reserved. \par Used by permission. \par \ -[Copyright expires Dec. 31, 2007.] \par\par \ -+--------------- Copy Freely --------------+ \par\par \ - The current files can be found at: \par\par \ - The Bible Foundation, \par \ - http://www.bf.org \par\par \ - If any errors are located, please notify me at the above location, or at: \par\par \ - Mark Fuller \par \ - 1129 E. Loyola Dr. \par \ - Tempe, Az. 85282 \par \ - (602) 829-8542 - diff --git a/samples/mods.d/strongsnt.conf b/samples/mods.d/strongsnt.conf deleted file mode 100644 index 4f87cf5..0000000 --- a/samples/mods.d/strongsnt.conf +++ /dev/null @@ -1,6 +0,0 @@ -[Strongs Greek (NT)] -DataPath=/usr/local/lib/sword/modules/lexdict/rawld/strongs/greek -ModDrv=RawLD -Description=Strong's / Englishman's Greek Bible Dictionary -About=\qc Strong's / Englishman's Bible Dictionary \par\par \pard \ -This is a lexicon of Greek words keyed off of Strong's numbers. diff --git a/samples/mods.d/strongsot.conf b/samples/mods.d/strongsot.conf deleted file mode 100644 index 86b9699..0000000 --- a/samples/mods.d/strongsot.conf +++ /dev/null @@ -1,6 +0,0 @@ -[Strongs Hebrew (OT)] -DataPath=/usr/local/lib/sword/modules/lexdict/rawld/strongs/hebrew -ModDrv=RawLD -Description=Strong's / Englishman's Hebrew Bible Dictionary -About=\qc Strong's / Englishman's Bible Dictionary \par\par \pard \ -This is a lexicon of Hebrew words keyed off of Strong's numbers. diff --git a/samples/mods.d/vines.conf b/samples/mods.d/vines.conf deleted file mode 100644 index 8cd3a7d..0000000 --- a/samples/mods.d/vines.conf +++ /dev/null @@ -1,18 +0,0 @@ -[Vines] -DataPath=/usr/local/lib/sword/modules/lexdict/rawld/vines/vines -ModDrv=RawLD -Description=Vines Bible Dictionary -About=\qc Vine's Expository Dictionary \par of New Testament Words \par\par \ -Public Domain -- Copy Freely \par\par\pard \ - These Dictionary topics are from W.E. Vine's M.A., Expository Dictionary of New Testament \ -Words published in 1940 and without copyright. \par\par \ - The most current and correct copies of these files can be obtained from the \ -following. If any errors are located, please ensure you have the latest files, and if so, \ -we would appreciate being informed of the error. \par\par \ - The Bible Foundation \par \ - http://www.bf.org \par\par \ - Or by contacting: \par\par \ - Mark Fuller \par \ - 1129 East Loyola Drive \par \ - Tempe, Arizona, 85282 \par \ - 602-829-8542 (voice) diff --git a/samples/mods.d/web.conf b/samples/mods.d/web.conf deleted file mode 100644 index 5b77867..0000000 --- a/samples/mods.d/web.conf +++ /dev/null @@ -1,17 +0,0 @@ -[WEB] -DataPath=/usr/local/lib/sword/modules/texts/rawtext/web/ -ModDrv=RawText -SourceType=GBF -Description=The World English Bible -About= -=+* see the file 'info.txt' for more details *+=-\par\par \ -\qc The World English Bible (WEB) \par\par Public Domain \par\par \pard \ - The World English Bible is a 1997 revision of the American Standard Version of the \ -Holy Bible, first published in 1901. It is in the Public Domain. Please feel free to copy \ -and distribute it freely. \par\par \ - Thank you to Michael Paul Johnson for making this work available. For the latest \ -information, to report corrections, or for other correspondence: \par\par \ - Michael Paul Johnson \par \ - http://www.ebible.org/bible \par \ - mpj@ebible.org - - diff --git a/samples/mods.d/websters.conf b/samples/mods.d/websters.conf deleted file mode 100644 index 9499517..0000000 --- a/samples/mods.d/websters.conf +++ /dev/null @@ -1,61 +0,0 @@ -[Websters] -DataPath=/usr/local/lib/sword/modules/texts/rawtext/websters/ -ModDrv=RawText -Description=The Webster Bible -About= -=+* see the files 'intro.txt' and 'revision.txt' for more details *+=-\par\par \ -\qc THE \par HOLY BIBLE, \par CONTAINING THE \par OLD AND NEW TESTAMENTS, \par IN THE \par \ -COMMON VERSION. \par WITH \par AMENDMENTS OF THE LANGUAGE, \par \ -BY NOAH WEBSTER, LL. D. \par\par ------------- \par NEW HAVEN: \par \ -PUBLISHED BY DURRIE & PECK. \par \ -Sold by HEZEKIAH HOWE & CO., and A. H. MALTBY, New Haven; \par \ -and by N.&J. WHITE, New York. \par\par ------ \par 1833 \par\par \ -Webster Bible Electronic Format.\par \ -PUBLIC DOMAIN\par\par \ -February 1992\par\par\pard \ -Webster Biography:\par \ -Noah Webster: America's first grammarian and founding father of American education.\par\par \ - In 1828 Noah Webster published the 'American Dictionary of the English Language'. This \ -dictionary demonstrates the Christian values which were found in America's educational \ -and scholarly systems. It is from this early dictionary that we have todays popular \ -'Webster Dictionary'. In 1833 Noah Webster, who had mastered 20 languages including \ -Hebrew and Greek, published the King James Authorized Version 'with amendments to the \ -language'. In stating his reasons for producing this version of the Bible, Webster said:\par\par \ - 'In the present version, the language is, in general, correct and perspicuous; \ -... in many passages uniting sublimity with beautiful simplicity. In my view, the general \ -style of the version ought not to be altered. But, in the lapse of two or three centuries, \ -changes have taken place, which, in particular passages, impair the beauty; in others, \ -obscure the sense, of the original languages. ... they do not present to the reader \ -the Word of God. ... My principal aim is to remedy this evil.'\par\par \ -It was with cautious reverence that Webster corrected misused grammar, removed offensive \ -terms and expressions, and substituted commonly understood words for words that had fallen \ -into disuse, or no longer carried the same meaning.\par\par\ - In 1834, the year after completing the Webster Bible, Noah Webster wrote a \ -companion piece titled 'Value of the Bible and Excellence of the Christian Religion - For \ -the Use of Families and Schools'.\par\par\ - Webster, who was considered 'The schoolmaster to a nation' and produced the \ -earliest spellers and textbooks for America's school children, believed Christian religious \ -values and American public education to be inseparable. He believed the Webster Bible to \ -be 'the most important enterprise' of his life, and referred to the Bible as:\par\par \ - '... the chief moral cause of all that is good, and the best corrector of all that \ -is evil, in human society; the best book for regulating the temporal concerns of men, and \ -the only book that can serve as an infallible guide to future felicity.'\par\par \ -Introduction to the Electronic Format:\par \ - Beginning in July of 1991 the task of placing the Webster Bible text in electronic \ -format began. The original purpose was to provide Larry Pierce, who produces the \ -On-Line Bible program, with a more modern *public domain* text, similar in content and \ -style to the AV but with a grammar that would provide better comprehension in todays \ -English.\par\par\ - I plan on maintaining an accurate copy of the Webster text. Anyone finding an \ -error should contact me; Anyone desiring to obtain the latest, most correct text, can find \ -it on the Bible Foundation BBS, or can contact me in the following methods:\par \ - Internet acus10@waccvm.corp.mot.com\par \ - Home phone 602-829-8542\par \ - Address Mark Fuller\par \ - 1129 East Loyola Drive\par \ - Tempe Arizona, 85282\par \ - Bible Foundation http://www.bf.org\par\par \ - I would like to thank the Bible Foundation not only for scanning nearly the entire \ -Webster Bible but for encouraging me to undertake this monumental work; particularly around \ -page 20 when I realized what I had gotten myself into. Special thanks to Jerry Kingery of \ -the Bible Foundation for scanning, and Jerry Hastings for doing some preliminary scan \ -cleaning and making the texts available on the BBS. diff --git a/scripts/burncd b/scripts/burncd deleted file mode 100755 index bdd8b37..0000000 --- a/scripts/burncd +++ /dev/null @@ -1 +0,0 @@ -cdrecord -v speed=2 dev=0,0 /mnt/server/space/im.iso diff --git a/scripts/demotar b/scripts/demotar deleted file mode 100755 index 9093b5b..0000000 --- a/scripts/demotar +++ /dev/null @@ -1 +0,0 @@ -cd /dosc/usr/troy/src; tar -v -c -p -s -z -f ~/src/multimo4.tgz sword/examples/windoze/delphi20/multimo4/multimod.exe diff --git a/scripts/disttar b/scripts/disttar deleted file mode 100755 index 70e1a1d..0000000 --- a/scripts/disttar +++ /dev/null @@ -1,7 +0,0 @@ -REV=`cd ..;basename \`pwd ..\`|cut -d\- -f2` -cd /; tar cfvz sword-$REV.i386.tar.gz /etc/sword.conf /usr/lib/libsword.* /usr/include/sword/* /usr/bin/cheatah /usr/doc/sword/ /usr/share/sword/mods.d/globals.conf - -echo -echo Did you set legalexport := yes -echo did you set buildshare := yes -echo diff --git a/scripts/dlltar b/scripts/dlltar deleted file mode 100755 index a93fb3c..0000000 --- a/scripts/dlltar +++ /dev/null @@ -1 +0,0 @@ -cp /dosc/winnt/system32/sword32.dll ../bin; cd /dosc/usr/troy/src; tar -v -c -p -s -z -f ~/src/dlls.tgz sword/bin/sword32.dll diff --git a/scripts/eastonstar b/scripts/eastonstar deleted file mode 100755 index ac3d71a..0000000 --- a/scripts/eastonstar +++ /dev/null @@ -1 +0,0 @@ -cd /dosc/usr/troy/src/; tar -v -c -p -s -z -f ~/src/eastons.tgz sword/modules/lexdict/rawld/eastons diff --git a/scripts/mhctar b/scripts/mhctar deleted file mode 100755 index eea59c4..0000000 --- a/scripts/mhctar +++ /dev/null @@ -1 +0,0 @@ -cd /dosc/usr/troy/src/; tar -v -c -p -s -z -f ~/src/mhc.tgz sword/modules/comments/rawcom/mhc diff --git a/scripts/mkcd b/scripts/mkcd deleted file mode 100755 index 6bc7163..0000000 --- a/scripts/mkcd +++ /dev/null @@ -1,6 +0,0 @@ -REV=`cd ..;basename \`pwd ..\`|cut -d\- -f2` -chmod +x * -chmod +x ../apps/X11/cheatah/configure -chmod +x ../apps/X11/cheatah/missing -cd ../../..; mkisofs -a -J -o -l -L ./im.iso -r -v -V "SWORD_20000428" /mnt/server/space/swordiso/ - diff --git a/scripts/mkswordbase b/scripts/mkswordbase index 93f5931..699f223 100755 --- a/scripts/mkswordbase +++ b/scripts/mkswordbase @@ -1,4 +1,6 @@ #!/bin/sh +# This script was used for making loki install swordbase.tar.gz +# component. Not likely we'll use this again, but keep around for now. cd .. make distclean ./usrinst.sh diff --git a/scripts/mkswordbase2 b/scripts/mkswordbase2 index 0609181..70daef1 100755 --- a/scripts/mkswordbase2 +++ b/scripts/mkswordbase2 @@ -1,4 +1,6 @@ #!/bin/sh +# This script was used for making loki install swordbase.tar.gz +# component. Not likely we'll use this again, but keep around for now. mkdir /tmp/$$ cd /tmp/$$ mkdir etc diff --git a/scripts/mkswordtar b/scripts/mkswordtar index 4afb672..a4b3320 100755 --- a/scripts/mkswordtar +++ b/scripts/mkswordtar @@ -6,7 +6,7 @@ echo (cd ..;./autogen.sh) REV=`cd ..;basename \`pwd ..\`|cut -d\- -f2` -SWORDVER=`grep "define VERSI" ../include/config.h |cut -f2 -d"\""` +SWORDVER=`grep AC_INIT ../configure.ac|cut -f2 -d' '|cut -f1 -d,` sed -i "s/^\(PROJECT_NUMBER\).*/\1 = \"$SWORDVER\"/" ../doc/Doxyfile sed -i "s/^SET(SWORD_VERSION.*/SET(SWORD_VERSION $SWORDVER)/" ../CMakeLists.txt @@ -25,7 +25,7 @@ if [ "$REV" = "$SWORDVER" ]; then cd ..; tar -v -c -p -s -z --exclude sword-$REV/bin --exclude sword-$REV/autom4te.cache --exclude sword-$REV/bindings/swig/package/autom4te.cache -X sword-$REV/distignore -f sword-$REV.tar.gz sword-$REV/* else - echo $"Directory version is $REV, but config.h has $SWORDVER" + echo $"Directory version is $REV, but configure.ac has $SWORDVER" exit 1 fi diff --git a/scripts/svetar b/scripts/svetar deleted file mode 100755 index f6fad43..0000000 --- a/scripts/svetar +++ /dev/null @@ -1 +0,0 @@ -cd /dosc/usr/troy/src/; tar -v -c -p -s -z -f ~/src/sve.tgz sword/modules/texts/rawtext/sve sword/modules/texts/rawtext/svetxidx.c diff --git a/scripts/swordenv b/scripts/swordenv deleted file mode 100755 index 924c739..0000000 --- a/scripts/swordenv +++ /dev/null @@ -1 +0,0 @@ -export PATH=`dirname \`pwd\``/bin:$PATH diff --git a/scripts/swtxtdsp.bat b/scripts/swtxtdsp.bat deleted file mode 100755 index 5cb4bf5..0000000 --- a/scripts/swtxtdsp.bat +++ /dev/null @@ -1,2 +0,0 @@ -pkzip -r -P -a ..\tmp\swtxtdsp.zip \sword\frontend\windoze\delphi20\swtxtdsp\*.* - diff --git a/scripts/vinestar b/scripts/vinestar deleted file mode 100755 index 2783b7d..0000000 --- a/scripts/vinestar +++ /dev/null @@ -1 +0,0 @@ -cd /dosc/usr/troy/src/; tar -v -c -p -s -z -f ~/src/vines.tgz sword/modules/lexdict/rawld/vines diff --git a/scripts/webtar b/scripts/webtar deleted file mode 100755 index db263f7..0000000 --- a/scripts/webtar +++ /dev/null @@ -1 +0,0 @@ -cd /dosc/usr/troy/src/; tar -v -c -p -s -z -f ~/src/webster.tgz sword/modules/texts/rawtext/webster diff --git a/src/frontend/X11/Makefile b/src/frontend/X11/Makefile deleted file mode 100644 index 1a2d00d..0000000 --- a/src/frontend/X11/Makefile +++ /dev/null @@ -1,5 +0,0 @@ - -root := ../../.. - -all: - make -C ${root} diff --git a/src/frontend/framework/femain.cpp b/src/frontend/framework/femain.cpp index e6580cb..11bf565 100644 --- a/src/frontend/framework/femain.cpp +++ b/src/frontend/framework/femain.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * femain.cpp - FEMain class definition + * + * $Id: femain.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,7 +28,7 @@ FEMain::FEMain() { FEMain::~FEMain() { list ::iterator it; - for (it = displays.begin(); it != displays.end(); it++) + for (it = displays.begin(); it != displays.end(); ++it) delete *it; } diff --git a/src/frontend/im/hebrewmcim.cpp b/src/frontend/im/hebrewmcim.cpp index c8bb5fa..839fcd7 100644 --- a/src/frontend/im/hebrewmcim.cpp +++ b/src/frontend/im/hebrewmcim.cpp @@ -1,14 +1,15 @@ - -/** - * Title: Keyboard mapping for Michigan-Claremont Hebrew input - * Description: - * Copyright: Copyright (c) 2001 CrossWire Bible Society under the terms of the GNU GPL - * Company: - * @author Troy A. Griffitts - * @version 1.0 - */ - -/* +/****************************************************************************** + * + * hebrewmcim.cpp - HebrewMCIM: Keyboard mapping for Michigan-Claremont + * Hebrew input + * + * $Id: hebrewmcim.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation version 2. @@ -20,7 +21,6 @@ * */ - #include HebrewMCIM::HebrewMCIM() diff --git a/src/frontend/im/nullim.cpp b/src/frontend/im/nullim.cpp index bceeb23..6fd9c0e 100644 --- a/src/frontend/im/nullim.cpp +++ b/src/frontend/im/nullim.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * nullim.cpp - NullIM: Null keyboard mapping + * + * $Id: nullim.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/frontend/im/swinputmeth.cpp b/src/frontend/im/swinputmeth.cpp index 7ba60dd..49a7833 100644 --- a/src/frontend/im/swinputmeth.cpp +++ b/src/frontend/im/swinputmeth.cpp @@ -1,13 +1,14 @@ -/** - * Title: - * Description: - * Copyright: Copyright (c) 2001 CrossWire Bible Society under the terms of the GNU GPL - * Company: - * @author Troy A. Griffitts - * @version 1.0 - */ - -/* +/****************************************************************************** + * + * swinputmeth.cpp - SWInputMethod: Input method base class + * + * $Id: swinputmeth.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation version 2. diff --git a/src/frontend/swdisp.cpp b/src/frontend/swdisp.cpp index bf46ff2..268fe7d 100644 --- a/src/frontend/swdisp.cpp +++ b/src/frontend/swdisp.cpp @@ -1,8 +1,12 @@ /****************************************************************************** - * swdisp.cpp - code for base class 'swdisp'. swdisp is the basis for all - * types of displays (e.g. raw textout, curses, xwindow, etc.) * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * swdisp.cpp - code for base class 'SWDisplay'. SWDisplay is the + * basis for all types of displays (e.g. raw textout, + * curses, xwindow, etc.) + * + * $Id: swdisp.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -19,9 +23,6 @@ */ -#ifndef _WIN32_WCE -#include -#endif #include #include @@ -40,12 +41,5 @@ SWClass SWDisplay::classdef(classes); * RET: error status */ -char SWDisplay::Display(SWModule &imodule) -{ -#ifndef _WIN32_WCE - std::cout << (const char *)imodule; -#endif - return 0; -} SWORD_NAMESPACE_END diff --git a/src/frontend/swlog.cpp b/src/frontend/swlog.cpp index 74b6bd4..7c05b47 100644 --- a/src/frontend/swlog.cpp +++ b/src/frontend/swlog.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swlog.cpp - + * + * $Id: swlog.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -15,8 +20,6 @@ * */ -//--------------------------------------------------------------------------- - #include #include #include @@ -26,7 +29,7 @@ #include #endif #include "swlog.h" -//--------------------------------------------------------------------------- + SWORD_NAMESPACE_START diff --git a/src/frontend/windoze/Makefile b/src/frontend/windoze/Makefile deleted file mode 100644 index 1a2d00d..0000000 --- a/src/frontend/windoze/Makefile +++ /dev/null @@ -1,5 +0,0 @@ - -root := ../../.. - -all: - make -C ${root} diff --git a/src/keys/genarray.c b/src/keys/genarray.c deleted file mode 100644 index 112b0f6..0000000 --- a/src/keys/genarray.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include -#include -#include - -main() -{ - int fd, l1, l2, l3; - char *fnames[] = {"ot.bks", "ot.cps", "nt.bks", "nt.cps"}; - long val; - char buf[64]; - -#ifndef O_BINARY // O_BINARY is needed in Borland C++ 4.53 -#define O_BINARY 0 // If it hasn't been defined than we probably -#endif // don't need it. - - - for (l1 = 0; l1 < 2; l1++) { - for (l2 = 0; l2 < 2; l2++) { - l3 = 1; - sprintf(buf, "%s", fnames[(l1*2)+l2]); - printf(" // %s\n", fnames[(l1*2)+l2]); - fd = open(buf, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH); - while (read(fd, &val, 4) == 4) { - l3++; - printf("%ld, ", val/(4 + (l2*2))); - if (!(l3%7)) - printf("\n"); - } - close(fd); - printf("}, \n"); - } - } -} diff --git a/src/keys/listkey.cpp b/src/keys/listkey.cpp index 1b718cb..4c017d2 100644 --- a/src/keys/listkey.cpp +++ b/src/keys/listkey.cpp @@ -1,10 +1,12 @@ /****************************************************************************** - * listkey.cpp - code for base class 'ListKey'. ListKey is the basis for all - * types of keys that have lists of specified indexes - * (e.g. a list of verses, place, etc.) * + * listkey.cpp - code for base class 'ListKey'. ListKey is the basis + * for all types of keys that have lists of specified + * indexes (e.g. a list of verses, place, etc.) * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: listkey.cpp 2905 2013-07-17 12:18:15Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -40,7 +42,7 @@ SWClass ListKey::classdef(classes); ListKey::ListKey(const char *ikey): SWKey(ikey) { arraymax = 0; - ClearList(); + clear(); init(); } @@ -74,12 +76,12 @@ SWKey *ListKey::clone() const ListKey::~ListKey() { - ClearList(); + clear(); } /****************************************************************************** - * ListKey::ClearList - Clears out elements of list + * ListKey::clear - Clears out elements of list */ void ListKey::clear() @@ -106,7 +108,7 @@ void ListKey::clear() */ void ListKey::copyFrom(const ListKey &ikey) { - ClearList(); + clear(); arraymax = ikey.arraymax; arraypos = ikey.arraypos; @@ -115,7 +117,7 @@ void ListKey::copyFrom(const ListKey &ikey) { for (int i = 0; i < arraycnt; i++) array[i] = ikey.array[i]->clone(); - SetToElement(0); + setToElement(0); } @@ -129,7 +131,7 @@ void ListKey::add(const SWKey &ikey) { arraymax = arraycnt + 32; } array[arraycnt-1] = ikey.clone(); - SetToElement(arraycnt-1); + setToElement(arraycnt-1); } @@ -145,10 +147,10 @@ void ListKey::add(const SWKey &ikey) { void ListKey::setPosition(SW_POSITION p) { switch (p) { case 1: // GCC won't compile P_TOP - SetToElement(0, p); + setToElement(0, p); break; case 2: // GCC won't compile P_BOTTOM - SetToElement(arraycnt-1, p); + setToElement(arraycnt-1, p); break; } } @@ -163,13 +165,13 @@ void ListKey::increment(int step) { decrement(step*-1); return; } - Error(); // clear error - for(; step && !Error(); step--) { + popError(); // clear error + for(; step && !popError(); step--) { if (arraypos < arraycnt && arraycnt) { if (array[arraypos]->isBoundSet()) (*(array[arraypos]))++; - if ((array[arraypos]->Error()) || (!array[arraypos]->isBoundSet())) { - SetToElement(arraypos+1); + if ((array[arraypos]->popError()) || (!array[arraypos]->isBoundSet())) { + setToElement(arraypos+1); } else SWKey::setText((const char *)(*array[arraypos])); } @@ -187,13 +189,13 @@ void ListKey::decrement(int step) { increment(step*-1); return; } - Error(); // clear error - for(; step && !Error(); step--) { + popError(); // clear error + for(; step && !popError(); step--) { if (arraypos > -1 && arraycnt) { if (array[arraypos]->isBoundSet()) (*(array[arraypos]))--; - if ((array[arraypos]->Error()) || (!array[arraypos]->isBoundSet())) { - SetToElement(arraypos-1, BOTTOM); + if ((array[arraypos]->popError()) || (!array[arraypos]->isBoundSet())) { + setToElement(arraypos-1, BOTTOM); } else SWKey::setText((const char *)(*array[arraypos])); } @@ -203,23 +205,24 @@ void ListKey::decrement(int step) { /****************************************************************************** - * ListKey::Count - Returns number of elements in list + * ListKey::getCount - Returns number of elements in list */ -int ListKey::Count() { +int ListKey::getCount() const { return arraycnt; } /****************************************************************************** - * ListKey::SetToElement - Sets key to element number + * ListKey::setToElement - Sets key to element number * * ENT: ielement - element number to set to + * pos - set the subkey element to position (TOP) or BOTTOM * * RET: error status */ -char ListKey::SetToElement(int ielement, SW_POSITION pos) { +char ListKey::setToElement(int ielement, SW_POSITION pos) { arraypos = ielement; if (arraypos >= arraycnt) { arraypos = (arraycnt>0)?arraycnt - 1:0; @@ -247,14 +250,14 @@ char ListKey::SetToElement(int ielement, SW_POSITION pos) { /****************************************************************************** - * ListKey::GetElement - Gets a key element number + * ListKey::getElement - Gets a key element number * * ENT: pos - element number to get (or default current) * * RET: Key or null on error */ -SWKey *ListKey::getElement(int pos) { +const SWKey *ListKey::getElement(int pos) const { if (pos < 0) pos = arraypos; @@ -263,20 +266,26 @@ SWKey *ListKey::getElement(int pos) { return (error) ? 0:array[pos]; } + +SWKey *ListKey::getElement(int pos) { + const ListKey &self = *this; + return const_cast(self.getElement(pos)); +} + /****************************************************************************** - * ListKey::Remove - Removes current element from list + * ListKey::remove - Removes current element from list */ -void ListKey::Remove() { +void ListKey::remove() { if ((arraypos > -1) && (arraypos < arraycnt)) { delete array[arraypos]; if (arraypos < arraycnt - 1) memmove(&array[arraypos], &array[arraypos+1], (arraycnt - arraypos - 1) * sizeof(SWKey *)); arraycnt--; - SetToElement((arraypos)?arraypos-1:0); + setToElement((arraypos)?arraypos-1:0); } } @@ -327,6 +336,12 @@ const char *ListKey::getText() const { return (key) ? key->getText() : keytext; } +const char *ListKey::getShortText() const { + int pos = arraypos; + SWKey *key = (pos >= arraycnt || !arraycnt) ? 0:array[pos]; + return (key) ? key->getShortText() : keytext; +} + void ListKey::setText(const char *ikey) { // at least try to set the current element to this text @@ -335,7 +350,7 @@ void ListKey::setText(const char *ikey) { if (key) { if (key->isTraversable() && key->isBoundSet()) { key->setText(ikey); - if (!key->Error()) + if (!key->popError()) break; } else { diff --git a/src/keys/nt.bks b/src/keys/nt.bks deleted file mode 100644 index 6a3cf92..0000000 Binary files a/src/keys/nt.bks and /dev/null differ diff --git a/src/keys/nt.cps b/src/keys/nt.cps deleted file mode 100644 index fdaa6f4..0000000 Binary files a/src/keys/nt.cps and /dev/null differ diff --git a/src/keys/ot.bks b/src/keys/ot.bks deleted file mode 100644 index 512f064..0000000 Binary files a/src/keys/ot.bks and /dev/null differ diff --git a/src/keys/ot.cps b/src/keys/ot.cps deleted file mode 100644 index f4bf66b..0000000 Binary files a/src/keys/ot.cps and /dev/null differ diff --git a/src/keys/strkey.cpp b/src/keys/strkey.cpp index 4171e36..0b5a2cb 100644 --- a/src/keys/strkey.cpp +++ b/src/keys/strkey.cpp @@ -1,10 +1,12 @@ /****************************************************************************** - * StrKey.cpp - code for class 'StrKey'- a standard string key class (used - * for modules that index on single strings (eg. cities, - * names, words, etc.) * + * strkey.cpp - code for class 'StrKey'- a standard string key class + * (used for modules that index on single strings (eg. + * cities, names, words, etc.) * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: strkey.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/keys/swkey.cpp b/src/keys/swkey.cpp index 3709cdc..8e40004 100644 --- a/src/keys/swkey.cpp +++ b/src/keys/swkey.cpp @@ -1,10 +1,12 @@ /****************************************************************************** - * swkey.cpp - code for base class 'SWKey'. SWKey is the basis for all - * types of keys for indexing into modules (e.g. verse, word, + * + * swkey.cpp - code for base class 'SWKey'. SWKey is the basis for all + * types of keys for indexing into modules (e.g. verse, word, * place, etc.) * + * $Id: swkey.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -95,7 +97,7 @@ SWKey::~SWKey() { * RET: value of persist */ -char SWKey::Persist() const +bool SWKey::isPersist() const { return persist; } @@ -126,20 +128,14 @@ SWLocale *SWKey::getPrivateLocale() const { /****************************************************************************** * SWKey::Persist - Set/gets whether this object itself persists within a * module that it was used to setKey or just a copy. - * (1 - persists in module; 0 - a copy is attempted + * (true - persists in module; false - a copy is attempted * * ENT: ipersist - value which to set persist - * [-1] - only get - * - * RET: value of persist */ -char SWKey::Persist(signed char ipersist) +void SWKey::setPersist(bool ipersist) { - if (ipersist != -1) - persist = ipersist; - - return persist; + persist = ipersist; } @@ -149,7 +145,7 @@ char SWKey::Persist(signed char ipersist) * RET: error status */ -char SWKey::Error() +char SWKey::popError() { char retval = error; diff --git a/src/keys/treekey.cpp b/src/keys/treekey.cpp index ce769a1..a466da6 100644 --- a/src/keys/treekey.cpp +++ b/src/keys/treekey.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: treekey.cpp 2178 2008-06-20 15:10:47Z scribe $ + * treekey.cpp - code for class 'versekey'- a standard Biblical + * verse key * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: treekey.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/keys/treekeyidx.cpp b/src/keys/treekeyidx.cpp index cc93fc0..5164277 100644 --- a/src/keys/treekeyidx.cpp +++ b/src/keys/treekeyidx.cpp @@ -1,9 +1,10 @@ /****************************************************************************** - * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: treekeyidx.cpp 2280 2009-03-07 15:34:36Z scribe $ + * treekeyidx.cpp - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: treekeyidx.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -32,7 +33,6 @@ SWORD_NAMESPACE_START -static const char nl = '\n'; static const char *classes[] = {"TreeKeyIdx", "TreeKey", "SWKey", "SWObject", 0}; SWClass TreeKeyIdx::classdef(classes); @@ -517,7 +517,7 @@ void TreeKeyIdx::setText(const char *ikey) { SWBuf leaf = strtok(buf, "/"); leaf.trim(); root(); - while ((leaf.size()) && (!Error())) { + while ((leaf.size()) && (!popError())) { bool ok, inChild = false; error = KEYERR_OUTOFBOUNDS; for (ok = firstChild(); ok; ok = nextSibling()) { @@ -562,7 +562,7 @@ void TreeKeyIdx::setPosition(SW_POSITION p) { break; } positionChanged(); - Error(); // clear error from normalize + popError(); // clear error from normalize } diff --git a/src/keys/versekey.cpp b/src/keys/versekey.cpp index 9b75e97..6ce0858 100644 --- a/src/keys/versekey.cpp +++ b/src/keys/versekey.cpp @@ -1,8 +1,11 @@ /****************************************************************************** - * VerseKey.cpp - code for class 'VerseKey'- a standard Biblical verse key * + * versekey.cpp - code for class 'VerseKey'- a standard Biblical + * verse key * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: versekey.cpp 2893 2013-07-16 03:07:02Z scribe $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -32,7 +35,7 @@ #include #include #include -#include +#include SWORD_NAMESPACE_START @@ -55,7 +58,7 @@ void VerseKey::init(const char *v11n) { instance++; autonorm = 1; // default auto normalization to true - headings = 0; // default display headings option is false + intros = false; // default display intros option is false upperBound = 0; lowerBound = 0; boundSet = false; @@ -120,15 +123,19 @@ VerseKey::VerseKey(VerseKey const &k) : SWKey(k) void VerseKey::setFromOther(const VerseKey &ikey) { if (refSys == ikey.refSys) { - testament = ikey.Testament(); - book = ikey.Book(); - chapter = ikey.Chapter(); - verse = ikey.Verse(); + testament = ikey.getTestament(); + book = ikey.getBook(); + chapter = ikey.getChapter(); + verse = ikey.getVerse(); suffix = ikey.getSuffix(); } + // TODO: versification mapping // Here is where we will do v11n system conversions in the future - // when we have a conversion mechanism (Ben Morgan has started - // thinking about this) + // when we have a conversion mechanism + // Ben Morgan has started thinking about this + // Konstantin Maslyuk has submitted a patch) + // Asked Konstantin to try his patch out with his favorite + // SWORD frontend and report back how it goes. Need to follow up else { // For now, this is the best we can do setText(ikey.getText()); @@ -154,12 +161,12 @@ void VerseKey::positionFrom(const SWKey &ikey) { } // should we always perform bounds checks? Tried but seems to cause infinite recursion - if (_compare(UpperBound()) > 0) { - setFromOther(UpperBound()); + if (_compare(getUpperBound()) > 0) { + setFromOther(getUpperBound()); error = KEYERR_OUTOFBOUNDS; } - if (_compare(LowerBound()) < 0) { - setFromOther(LowerBound()); + if (_compare(getLowerBound()) < 0) { + setFromOther(getLowerBound()); error = KEYERR_OUTOFBOUNDS; } } @@ -171,17 +178,17 @@ void VerseKey::positionFrom(const SWKey &ikey) { void VerseKey::copyFrom(const VerseKey &ikey) { autonorm = ikey.autonorm; - headings = ikey.headings; - testament = ikey.Testament(); - book = ikey.Book(); - chapter = ikey.Chapter(); - verse = ikey.Verse(); + intros = ikey.intros; + testament = ikey.getTestament(); + book = ikey.getBook(); + chapter = ikey.getChapter(); + verse = ikey.getVerse(); suffix = ikey.getSuffix(); setLocale(ikey.getLocale()); setVersificationSystem(ikey.getVersificationSystem()); if (ikey.isBoundSet()) { - LowerBound(ikey.LowerBound()); - UpperBound(ikey.UpperBound()); + setLowerBound(ikey.getLowerBound()); + setUpperBound(ikey.getUpperBound()); } } @@ -213,15 +220,15 @@ void VerseKey::copyFrom(const SWKey &ikey) { VerseKey::VerseKey(const char *min, const char *max, const char *v11n) : SWKey() { init(v11n); - ListKey tmpListKey = ParseVerseList(min); - if (tmpListKey.Count()) { - VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.GetElement(0)); - LowerBound(*newElement); + ListKey tmpListKey = parseVerseList(min); + if (tmpListKey.getCount()) { + VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.getElement(0)); + setLowerBound(*newElement); } - tmpListKey = ParseVerseList(max, min, true); - if (tmpListKey.Count()) { - VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.GetElement(0)); - UpperBound((newElement->isBoundSet())?newElement->UpperBound():*newElement); + tmpListKey = parseVerseList(max, min, true); + if (tmpListKey.getCount()) { + VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.getElement(0)); + setUpperBound((newElement->isBoundSet())?newElement->getUpperBound():*newElement); } setPosition(TOP); } @@ -248,9 +255,9 @@ VerseKey::~VerseKey() { void VerseKey::setVersificationSystem(const char *name) { - const VerseMgr::System *newRefSys = VerseMgr::getSystemVerseMgr()->getVersificationSystem(name); + const VersificationMgr::System *newRefSys = VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(name); // TODO: cheese, but what should we do if requested v11n system isn't found? - if (!newRefSys) newRefSys = VerseMgr::getSystemVerseMgr()->getVersificationSystem("KJV"); + if (!newRefSys) newRefSys = VersificationMgr::getSystemVersificationMgr()->getVersificationSystem("KJV"); if (refSys != newRefSys) { refSys = newRefSys; BMAX[0] = refSys->getBMAX()[0]; @@ -259,7 +266,7 @@ void VerseKey::setVersificationSystem(const char *name) { // TODO: adjust bounds for versificaion system ??? // TODO: when we have mapping done, rethink this //necessary as our bounds might not mean anything in the new v11n system - ClearBounds(); + clearBounds(); } } @@ -285,14 +292,15 @@ char VerseKey::parse(bool checkAutoNormalize) int error = 0; if (keytext) { - ListKey tmpListKey = ParseVerseList(keytext); - if (tmpListKey.Count()) { + // pass our own copy of keytext as keytext memory may be freshed during parse + ListKey tmpListKey = parseVerseList(SWBuf(keytext).c_str()); + if (tmpListKey.getCount()) { this->positionFrom(*tmpListKey.getElement(0)); error = this->error; } else error = 1; } if (checkAutoNormalize) { - Normalize(1); + normalize(true); } freshtext(); @@ -344,7 +352,7 @@ void VerseKey::freshtext() const * RET: book number or < 0 = not valid */ -int VerseKey::getBookAbbrev(const char *iabbr) const +int VerseKey::getBookFromAbbrev(const char *iabbr) const { int diff, abLen, min, max, target, retVal = -1; @@ -424,7 +432,7 @@ int VerseKey::getBookAbbrev(const char *iabbr) const void VerseKey::validateCurrentLocale() const { if (SWLog::getSystemLog()->getLogLevel() >= SWLog::LOG_DEBUG) { //make sure log is wanted, this loop stuff costs a lot of time for (int i = 0; i < refSys->getBookCount(); i++) { - const int bn = getBookAbbrev(getPrivateLocale()->translate(refSys->getBook(i)->getLongName())); + const int bn = getBookFromAbbrev(getPrivateLocale()->translate(refSys->getBook(i)->getLongName())); if (bn != i+1) { char *abbr = 0; stdstr(&abbr, getPrivateLocale()->translate(refSys->getBook(i)->getLongName()), 2); @@ -448,7 +456,7 @@ void VerseKey::validateCurrentLocale() const { /****************************************************************************** - * VerseKey::ParseVerseList - Attempts to parse a buffer into separate + * VerseKey::parseVerseList - Attempts to parse a buffer into separate * verse entries returned in a ListKey * * ENT: buf - buffer to parse; @@ -463,7 +471,7 @@ void VerseKey::validateCurrentLocale() const { * COMMENT: This code works but wreaks. Rewrite to make more maintainable. */ -ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool expandRange, bool useChapterAsVerse) { +ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool expandRange, bool useChapterAsVerse) { // hold on to our own copy of params, as threads/recursion may change outside values const char *bufStart = buf; @@ -498,17 +506,17 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e VerseKey *curKey = (VerseKey *)this->clone(); VerseKey *lastKey = (VerseKey *)this->clone(); - lastKey->ClearBounds(); - curKey->ClearBounds(); + lastKey->clearBounds(); + curKey->clearBounds(); // some silly checks for corner cases if (!strcmp(buf, "[ Module Heading ]")) { - curKey->Verse(0); - curKey->Chapter(0); - curKey->Book(0); - curKey->Testament(0); - lastKey->LowerBound(*curKey); - lastKey->UpperBound(*curKey); + curKey->setVerse(0); + curKey->setChapter(0); + curKey->setBook(0); + curKey->setTestament(0); + lastKey->setLowerBound(*curKey); + lastKey->setUpperBound(*curKey); internalListKey << *lastKey; delete curKey; delete lastKey; @@ -517,20 +525,20 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e if ((!strncmp(buf, "[ Testament ", 12)) && (isdigit(buf[12])) && (!strcmp(buf+13, " Heading ]"))) { - curKey->Verse(0); - curKey->Chapter(0); - curKey->Book(0); - curKey->Testament(buf[12]-48); - lastKey->LowerBound(*curKey); - lastKey->UpperBound(*curKey); + curKey->setVerse(0); + curKey->setChapter(0); + curKey->setBook(0); + curKey->setTestament(buf[12]-48); + lastKey->setLowerBound(*curKey); + lastKey->setUpperBound(*curKey); internalListKey << *lastKey; delete curKey; delete lastKey; return internalListKey; } - curKey->AutoNormalize(AutoNormalize()); - lastKey->AutoNormalize(0); + curKey->setAutoNormalize(isAutoNormalize()); + lastKey->setAutoNormalize(false); if (defaultKey) *lastKey = defaultKey; while (*buf) { @@ -539,8 +547,11 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e if (buf[1] != ' ') { // for silly "Mat 1:1: this verse...." number[tonumber] = 0; tonumber = 0; - if (*number) - chap = atoi(number); + if (*number) { + if (chap >= 0) + verse = atoi(number); + else chap = atoi(number); + } *number = 0; comma = 0; break; @@ -558,7 +569,9 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e break; } if (inTerm) { - book[tobook++] = ' '; + if (tobook < 1 || book[tobook-1] != ' ') { + book[tobook++] = ' '; + } break; } @@ -567,7 +580,7 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e book[tobook] = *buf; book[tobook+1] = *(buf+1); book[tobook+2] = 0; - int bookno = getBookAbbrev(book); + int bookno = getBookFromAbbrev(book); if (bookno > -1) { tobook++; buf++; @@ -588,7 +601,14 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e tobook = 0; bookno = -1; if (*book) { - for (loop = strlen(book) - 1; loop+1; loop--) { + loop = strlen(book) - 1; + + for (; loop+1; loop--) { if (book[loop] == ' ') book[loop] = 0; else break; } + + if (loop > 0 && isdigit(book[loop-1]) && book[loop] >= 'a' && book[loop] <= 'z') { + book[loop--] = 0; + } + for (; loop+1; loop--) { if ((isdigit(book[loop])) || (book[loop] == ' ')) { book[loop] = 0; continue; @@ -618,30 +638,47 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e } } + // check for special inscriptio and subscriptio which are saved as book intro and chap 1 intro (for INTF) + for (loop = strlen(book) - 1; loop+1; loop--) { + if (book[loop] == ' ') { + if (!strnicmp(&book[loop+1], "inscriptio", strlen(&book[loop+1]))) { + book[loop] = 0; + verse = 0; + chap = 0; + } + else if (!strnicmp(&book[loop+1], "subscriptio", strlen(&book[loop+1]))) { + book[loop] = 0; + verse = 0; + chap = 1; + } + break; + } + } + if ((!stricmp(book, "V")) || (!stricmp(book, "VER"))) { // Verse abbrev if (verse == -1) { verse = chap; - chap = lastKey->Chapter(); + chap = lastKey->getChapter(); *book = 0; } } if ((!stricmp(book, "ch")) || (!stricmp(book, "chap"))) { // Verse abbrev strcpy(book, lastKey->getBookName()); } - bookno = getBookAbbrev(book); + bookno = getBookFromAbbrev(book); if ((bookno > -1) && (suffix == 'f') && (book[strlen(book)-1] == 'f')) { suffix = 0; } } if (((bookno > -1) || (!*book)) && ((*book) || (chap >= 0) || (verse >= 0))) { char partial = 0; - curKey->Verse(1); - curKey->Chapter(1); - curKey->Book(1); + curKey->setVerse(1); + curKey->setChapter(1); + curKey->setBook(1); if (bookno < 0) { - curKey->Testament(lastKey->Testament()); - curKey->Book(lastKey->Book()); + curKey->setTestament(lastKey->getTestament()); + curKey->setBook(lastKey->getBook()); } else { int t = 1; @@ -649,15 +686,15 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e t++; bookno -= BMAX[0]; } - curKey->Testament(t); - curKey->Book(bookno); + curKey->setTestament(t); + curKey->setBook(bookno); } if (((comma)||((verse < 0)&&(bookno < 0)))&&(!lastPartial)) { // if (comma) { - curKey->Chapter(lastKey->Chapter()); - curKey->Verse(chap); // chap because this is the first number captured + curKey->setChapter(lastKey->getChapter()); + curKey->setVerse(chap); // chap because this is the first number captured if (suffix) { curKey->setSuffix(suffix); } @@ -670,21 +707,21 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e if (chap >= 0) { - curKey->Chapter(chap); + curKey->setChapter(chap); } else { partial++; - curKey->Chapter(1); + curKey->setChapter(1); } if (verse >= 0) { - curKey->Verse(verse); + curKey->setVerse(verse); if (suffix) { curKey->setSuffix(suffix); } } else { partial++; - curKey->Verse(1); + curKey->setVerse(1); } } @@ -692,23 +729,25 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e for (q = 0; ((buf[q]) && (buf[q] == ' ')); q++); if ((buf[q] == '-') && (expandRange)) { // if this is a dash save lowerBound and wait for upper buf+=q; - lastKey->LowerBound(*curKey); + lastKey->setLowerBound(*curKey); lastKey->setPosition(TOP); tmpListKey << *lastKey; - tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str())); + ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); + tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); } else { if (!dash) { // if last separator was not a dash just add if (expandRange && partial) { - lastKey->LowerBound(*curKey); + lastKey->setLowerBound(*curKey); if (partial > 1) curKey->setPosition(MAXCHAPTER); if (partial > 0) *curKey = MAXVERSE; - lastKey->UpperBound(*curKey); + lastKey->setUpperBound(*curKey); *lastKey = TOP; tmpListKey << *lastKey; - tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str())); + ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); + tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); } else { bool f = false; @@ -716,25 +755,27 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e curKey->setSuffix(0); f = true; } - lastKey->LowerBound(*curKey); + lastKey->setLowerBound(*curKey); if (f && doubleF) (*curKey) = MAXVERSE; else if (f) (*curKey)++; - lastKey->UpperBound(*curKey); + lastKey->setUpperBound(*curKey); *lastKey = TOP; tmpListKey << *lastKey; - tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str())); + ((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize()); + tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); } } else if (expandRange) { - VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.GetElement()); + VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.getElement()); if (newElement) { if (partial > 1) *curKey = MAXCHAPTER; if (partial > 0) *curKey = MAXVERSE; - newElement->UpperBound(*curKey); + newElement->setUpperBound(*curKey); + *lastKey = *curKey; *newElement = TOP; - tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str())); + tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); } } } @@ -761,19 +802,27 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e case '}': break; case '.': - if (buf > orig) // ignore (break) if preceeding char is not a digit + if (buf > orig) { // ignore (break) if preceeding char is not a digit for (notAllDigits = tobook; notAllDigits; notAllDigits--) { if ((!isdigit(book[notAllDigits-1])) && (!strchr(" .", book[notAllDigits-1]))) break; } - if (!notAllDigits) + if (!notAllDigits && !isdigit(buf[1])) break; + } number[tonumber] = 0; tonumber = 0; - if (*number) - chap = atoi(number); - *number = 0; + if (*number) { + if (chap >= 0) + verse = atoi(number); + else chap = atoi(number); + *number = 0; + } + else if (chap == -1 && (tobook < 1 || book[tobook-1] != ' ')) { + book[tobook++] = ' '; + } + break; default: @@ -789,9 +838,15 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e break; default: // suffixes (and oddly 'f'-- ff.) - if (((*buf >= 'a' && *buf <= 'z') && (chap >=0)) || *buf == 'f') { + if ((*buf >= 'a' && *buf <= 'z' && (chap >=0 || bookno > -1 || lastKey->isBoundSet())) + || *buf == 'f') { // if suffix is already an 'f', then we need to mark if we're doubleF. doubleF = (*buf == 'f' && suffix == 'f'); + if (suffix && !doubleF) { + // we've already had a suffix one, so this is another letter, thus any number is not a number, e.g., '2jn'. We're on 'n' + number[tonumber] = 0; + tonumber = 0; + } suffix = *buf; } else { @@ -811,13 +866,25 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e if (*number) { if (chap >= 0) verse = atoi(number); - else chap = atoi(number); + else chap = atoi(number); } *number = 0; book[tobook] = 0; tobook = 0; if (*book) { - for (loop = strlen(book) - 1; loop+1; loop--) { + loop = strlen(book) - 1; + + // strip trailing spaces + for (; loop+1; loop--) { if (book[loop] == ' ') book[loop] = 0; else break; } + + // check if endsWith([0-9][a-z]) and kill the last letter, e.g., ...12a, and chop off the 'a' + // why? What's this for? wouldn't this mess up 2t? + if (loop > 0 && isdigit(book[loop-1]) && book[loop] >= 'a' && book[loop] <= 'z') { + book[loop--] = 0; + } + + // skip trailing spaces and numbers + for (; loop+1; loop--) { if ((isdigit(book[loop])) || (book[loop] == ' ')) { book[loop] = 0; continue; @@ -833,6 +900,7 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e break; } + // check for roman numeral chapter for (loop = strlen(book) - 1; loop+1; loop--) { if (book[loop] == ' ') { // "PS C" is ok, but "II C" is not ok @@ -846,11 +914,29 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e break; } } + // check for special inscriptio and subscriptio which are saved as book intro and chap 1 intro (for INTF) + for (loop = strlen(book) - 1; loop+1; loop--) { + if (book[loop] == ' ') { + if (!strnicmp(&book[loop+1], "inscriptio", strlen(&book[loop+1]))) { + book[loop] = 0; + verse = 0; + chap = 0; + suffix = 0; + } + else if (!strnicmp(&book[loop+1], "subscriptio", strlen(&book[loop+1]))) { + book[loop] = 0; + verse = 0; + chap = 1; + suffix = 0; + } + break; + } + } if ((!stricmp(book, "V")) || (!stricmp(book, "VER"))) { // Verse abbrev. if (verse == -1) { verse = chap; - chap = lastKey->Chapter(); + chap = lastKey->getChapter(); *book = 0; } } @@ -858,20 +944,20 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e if ((!stricmp(book, "ch")) || (!stricmp(book, "chap"))) { // Verse abbrev strcpy(book, lastKey->getBookName()); } - bookno = getBookAbbrev(book); + bookno = getBookFromAbbrev(book); if ((bookno > -1) && (suffix == 'f') && (book[strlen(book)-1] == 'f')) { suffix = 0; } } if (((bookno > -1) || (!*book)) && ((*book) || (chap >= 0) || (verse >= 0))) { char partial = 0; - curKey->Verse(1); - curKey->Chapter(1); - curKey->Book(1); + curKey->setVerse(1); + curKey->setChapter(1); + curKey->setBook(1); if (bookno < 0) { - curKey->Testament(lastKey->Testament()); - curKey->Book(lastKey->Book()); + curKey->setTestament(lastKey->getTestament()); + curKey->setBook(lastKey->getBook()); } else { int t = 1; @@ -879,13 +965,13 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e t++; bookno -= BMAX[0]; } - curKey->Testament(t); - curKey->Book(bookno); + curKey->setTestament(t); + curKey->setBook(bookno); } if (((comma)||((verse < 0)&&(bookno < 0)))&&(!lastPartial)) { - curKey->Chapter(lastKey->Chapter()); - curKey->Verse(chap); // chap because this is the first number captured + curKey->setChapter(lastKey->getChapter()); + curKey->setVerse(chap); // chap because this is the first number captured if (suffix) { curKey->setSuffix(suffix); } @@ -898,42 +984,42 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e if (chap >= 0) { - curKey->Chapter(chap); + curKey->setChapter(chap); } else { partial++; - curKey->Chapter(1); + curKey->setChapter(1); } if (verse >= 0) { - curKey->Verse(verse); + curKey->setVerse(verse); if (suffix) { curKey->setSuffix(suffix); } } else { partial++; - curKey->Verse(1); + curKey->setVerse(1); } } if ((*buf == '-') && (expandRange)) { // if this is a dash save lowerBound and wait for upper - lastKey->LowerBound(*curKey); + lastKey->setLowerBound(*curKey); *lastKey = TOP; tmpListKey << *lastKey; - tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str())); + tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); } else { if (!dash) { // if last separator was not a dash just add if (expandRange && partial) { - lastKey->LowerBound(*curKey); + lastKey->setLowerBound(*curKey); if (partial > 1) *curKey = MAXCHAPTER; if (partial > 0) *curKey = MAXVERSE; - lastKey->UpperBound(*curKey); + lastKey->setUpperBound(*curKey); *lastKey = TOP; tmpListKey << *lastKey; - tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str())); + tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); } else { bool f = false; @@ -941,25 +1027,25 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e curKey->setSuffix(0); f = true; } - lastKey->LowerBound(*curKey); + lastKey->setLowerBound(*curKey); if (f && doubleF) (*curKey) = MAXVERSE; else if (f) (*curKey)++; - lastKey->UpperBound(*curKey); + lastKey->setUpperBound(*curKey); *lastKey = TOP; tmpListKey << *lastKey; - tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str())); + tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); } } else if (expandRange) { - VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.GetElement()); + VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.getElement()); if (newElement) { if (partial > 1) *curKey = MAXCHAPTER; if (partial > 0) *curKey = MAXVERSE; - newElement->UpperBound(*curKey); + newElement->setUpperBound(*curKey); *newElement = TOP; - tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str())); + tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str())); } } } @@ -977,14 +1063,14 @@ ListKey VerseKey::ParseVerseList(const char *buf, const char *defaultKey, bool e /****************************************************************************** - * VerseKey::LowerBound - sets / gets the lower boundary for this key + * VerseKey::setLowerBound - sets / gets the lower boundary for this key */ -VerseKey &VerseKey::LowerBound(const VerseKey &lb) +void VerseKey::setLowerBound(const VerseKey &lb) { initBounds(); - lowerBound = lb.Index(); + lowerBound = lb.getIndex(); lowerBoundComponents.test = lb.getTestament(); lowerBoundComponents.book = lb.getBook(); lowerBoundComponents.chap = lb.getChapter(); @@ -996,39 +1082,35 @@ VerseKey &VerseKey::LowerBound(const VerseKey &lb) // and set values without restrictions, as expected if (upperBound < lowerBound) upperBound = lowerBound; boundSet = true; - - return LowerBound(); } /****************************************************************************** - * VerseKey::UpperBound - sets / gets the upper boundary for this key + * VerseKey::setUpperBound - sets / gets the upper boundary for this key */ -VerseKey &VerseKey::UpperBound(const VerseKey &ub) +void VerseKey::setUpperBound(const VerseKey &ub) { initBounds(); - upperBound = ub.Index(); + upperBound = ub.getIndex(); upperBoundComponents.test = ub.getTestament(); upperBoundComponents.book = ub.getBook(); upperBoundComponents.chap = ub.getChapter(); upperBoundComponents.verse = ub.getVerse(); upperBoundComponents.suffix = ub.getSuffix(); - // see LowerBound comment, above + // see setLowerBound comment, above if (upperBound < lowerBound) upperBound = lowerBound; boundSet = true; - - return UpperBound(); } /****************************************************************************** - * VerseKey::LowerBound - sets / gets the lower boundary for this key + * VerseKey::getLowerBound - gets the lower boundary for this key */ -VerseKey &VerseKey::LowerBound() const +VerseKey &VerseKey::getLowerBound() const { initBounds(); if (!isAutoNormalize()) { @@ -1038,17 +1120,20 @@ VerseKey &VerseKey::LowerBound() const tmpClone->setVerse (lowerBoundComponents.verse); tmpClone->setSuffix (lowerBoundComponents.suffix); } - else tmpClone->Index(lowerBound); + else { + tmpClone->setIndex(lowerBound); + tmpClone->setSuffix (lowerBoundComponents.suffix); + } return (*tmpClone); } /****************************************************************************** - * VerseKey::UpperBound - sets / gets the upper boundary for this key + * VerseKey::getUpperBound - sets / gets the upper boundary for this key */ -VerseKey &VerseKey::UpperBound() const +VerseKey &VerseKey::getUpperBound() const { initBounds(); if (!isAutoNormalize()) { @@ -1058,17 +1143,20 @@ VerseKey &VerseKey::UpperBound() const tmpClone->setVerse (upperBoundComponents.verse); tmpClone->setSuffix (upperBoundComponents.suffix); } - else tmpClone->Index(upperBound); + else { + tmpClone->setIndex(upperBound); + tmpClone->setSuffix (upperBoundComponents.suffix); + } return (*tmpClone); } /****************************************************************************** - * VerseKey::ClearBounds - clears bounds for this VerseKey + * VerseKey::clearBounds - clears bounds for this VerseKey */ -void VerseKey::ClearBounds() +void VerseKey::clearBounds() { delete tmpClone; tmpClone = 0; @@ -1080,13 +1168,13 @@ void VerseKey::initBounds() const { if (!tmpClone) { tmpClone = (VerseKey *)this->clone(); - tmpClone->AutoNormalize(0); - tmpClone->Headings(1); - tmpClone->Testament((BMAX[1])?2:1); - tmpClone->Book(BMAX[(BMAX[1])?1:0]); - tmpClone->Chapter(tmpClone->getChapterMax()); - tmpClone->Verse(tmpClone->getVerseMax()); - upperBound = tmpClone->Index(); + tmpClone->setAutoNormalize(false); + tmpClone->setIntros(true); + tmpClone->setTestament((BMAX[1])?2:1); + tmpClone->setBook(BMAX[(BMAX[1])?1:0]); + tmpClone->setChapter(tmpClone->getChapterMax()); + tmpClone->setVerse(tmpClone->getVerseMax()); + upperBound = tmpClone->getIndex(); upperBoundComponents.test = tmpClone->getTestament(); upperBoundComponents.book = tmpClone->getBook(); upperBoundComponents.chap = tmpClone->getChapter(); @@ -1159,46 +1247,51 @@ const char *VerseKey::getBookAbbrev() const { void VerseKey::setPosition(SW_POSITION p) { switch (p) { case POS_TOP: { - const VerseKey *lb = &LowerBound(); - testament = (lb->Testament() || headings) ? lb->Testament() : 1; - book = (lb->Book() || headings) ? lb->Book() : 1; - chapter = (lb->Chapter() || headings) ? lb->Chapter() : 1; - verse = (lb->Verse() || headings) ? lb->Verse() : 1; + const VerseKey *lb = &getLowerBound(); + testament = (lb->getTestament() || intros) ? lb->getTestament() : 1; + book = (lb->getBook() || intros) ? lb->getBook() : 1; + chapter = (lb->getChapter() || intros) ? lb->getChapter() : 1; + verse = (lb->getVerse() || intros) ? lb->getVerse() : 1; suffix = lb->getSuffix(); break; } case POS_BOTTOM: { - const VerseKey *ub = &UpperBound(); - testament = (ub->Testament() || headings) ? ub->Testament() : 1; - book = (ub->Book() || headings) ? ub->Book() : 1; - chapter = (ub->Chapter() || headings) ? ub->Chapter() : 1; - verse = (ub->Verse() || headings) ? ub->Verse() : 1; + const VerseKey *ub = &getUpperBound(); + testament = (ub->getTestament() || intros) ? ub->getTestament() : 1; + book = (ub->getBook() || intros) ? ub->getBook() : 1; + chapter = (ub->getChapter() || intros) ? ub->getChapter() : 1; + verse = (ub->getVerse() || intros) ? ub->getVerse() : 1; suffix = ub->getSuffix(); break; } case POS_MAXVERSE: - Normalize(); + suffix = 0; + verse = 1; + normalize(); verse = getVerseMax(); suffix = 0; break; case POS_MAXCHAPTER: - verse = 1; suffix = 0; - Normalize(); + verse = 1; + chapter = 1; + normalize(); chapter = getChapterMax(); break; } - Normalize(1); - Error(); // clear error from normalize + normalize(true); + popError(); // clear error from normalize } int VerseKey::getChapterMax() const { - const VerseMgr::Book *b = refSys->getBook(((testament>1)?BMAX[0]:0)+book-1); + if (book < 1) return 0; + const VersificationMgr::Book *b = refSys->getBook(((testament>1)?BMAX[0]:0)+book-1); return (b) ? b->getChapterMax() : -1; } int VerseKey::getVerseMax() const { - const VerseMgr::Book *b = refSys->getBook(((testament>1)?BMAX[0]:0)+book-1); + if (book < 1) return 0; + const VersificationMgr::Book *b = refSys->getBook(((testament>1)?BMAX[0]:0)+book-1); return (b) ? b->getVerseMax(chapter) : -1; } @@ -1212,11 +1305,17 @@ int VerseKey::getVerseMax() const { */ void VerseKey::increment(int step) { + // if we're not autonormalizing and we're already not normalized + if (!autonorm && chapter > 0 && verse > getVerseMax()) { + verse += step; + checkBounds(); + return; + } char ierror = 0; - Index(Index() + step); - while ((!verse) && (!headings) && (!ierror)) { - Index(Index() + 1); - ierror = Error(); + setIndex(getIndex() + step); + while ((!verse) && (!intros) && (!ierror)) { + setIndex(getIndex() + 1); + ierror = popError(); } error = (ierror) ? ierror : error; @@ -1232,14 +1331,19 @@ void VerseKey::increment(int step) { */ void VerseKey::decrement(int step) { + // if we're not autonormalizing and we're already not normalized + if (!autonorm && chapter > 0 && verse > getVerseMax()) { + verse -= step; + checkBounds(); + return; + } char ierror = 0; - - Index(Index() - step); - while ((!verse) && (!headings) && (!ierror)) { - Index(Index() - 1); - ierror = Error(); + setIndex(getIndex() - step); + while ((!verse) && (!intros) && (!ierror)) { + setIndex(getIndex() - 1); + ierror = popError(); } - if ((ierror) && (!headings)) + if ((ierror) && (!intros)) (*this)++; error = (ierror) ? ierror : error; @@ -1247,109 +1351,90 @@ void VerseKey::decrement(int step) { /****************************************************************************** - * VerseKey::Normalize - checks limits and normalizes if necessary (e.g. + * VerseKey::normalize - checks limits and normalizes if necessary (e.g. * Matthew 29:47 = Mark 2:2). If last verse is * exceeded, key is set to last Book CH:VS * RET: *this */ -void VerseKey::Normalize(char autocheck) +void VerseKey::normalize(bool autocheck) { - if (((!autocheck) || (autonorm)) // only normalize if we were explicitely called or if autonorm is turned on - && - ((!headings) || ((verse) && (chapter)))) { // this is cheeze and temporary until deciding what actions should be taken; so headings should only be turned on when positioning with Index() or incrementors + if ((!autocheck || autonorm) // only normalize if we were explicitely called or if autonorm is turned on + ) { error = 0; - while ((testament < 3) && (testament > 0)) { - - if (book > BMAX[testament-1]) { - book -= BMAX[testament-1]; - testament++; - continue; - } - - if (book < 1) { - if (--testament > 0) { - book += BMAX[testament-1]; - } - continue; - } - - if (chapter > getChapterMax()) { - chapter -= getChapterMax(); - book++; - continue; - } - - if (chapter < 1) { - if (--book > 0) { - chapter += getChapterMax(); - verse = getVerseMax(); + while ((testament < 3) && (testament > 0)) { + + + if (book > BMAX[testament-1]) { + book -= (BMAX[testament-1] + (intros?1:0)); + testament++; + continue; } - else { - if (testament > 1) { - chapter += refSys->getBook(BMAX[0]-1)->getChapterMax(); - verse = refSys->getBook(BMAX[0]-1)->getVerseMax(chapter); + if (book < (intros?0:1)) { + if (--testament > 0) { + book += (BMAX[testament-1] + (intros?1:0)); } + continue; + } + + + if (chapter > getChapterMax()) { + chapter -= (getChapterMax() + (intros?1:0)); + book++; + continue; + } + if (chapter < (intros?0:1)) { + --book; + chapter += (getChapterMax() + (intros?1:0)); + continue; } - continue; - } - if (verse > getVerseMax()) { // -1 because e.g chapter 1 of Matthew is books[1][0].versemax[0] - verse -= getVerseMax(); + + if (chapter > 0 && verse > getVerseMax()) { + verse -= (getVerseMax() + (intros?1:0)); chapter++; - continue; - } - - if (verse < 1) { - if (--chapter > 0) { - verse += getVerseMax(); - } - else { - if (book > 1) { - const VerseMgr::Book *prevBook = refSys->getBook(((testament>1)?BMAX[0]:0)+book-2); - verse += prevBook->getVerseMax(prevBook->getChapterMax()); - } - else { - if (testament > 1) { - const VerseMgr::Book *lastOTBook = refSys->getBook(BMAX[0]-1); - verse += lastOTBook->getVerseMax(lastOTBook->getChapterMax()); - } - } - } - continue; - } - - break; // If we've made it this far (all failure checks continue) we're ok - } - - if (testament > (BMAX[1]?2:1)) { - testament = BMAX[1]?2:1; - book = BMAX[testament-1]; - chapter = getChapterMax(); - verse = getVerseMax(); - error = KEYERR_OUTOFBOUNDS; - } - - if (testament < 1) { - error = ((!headings) || (testament < 0) || (book < 0)) ? KEYERR_OUTOFBOUNDS : 0; - testament = ((headings) ? 0 : 1); - book = ((headings) ? 0 : 1); - chapter = ((headings) ? 0 : 1); - verse = ((headings) ? 0 : 1); - } - - // should we always perform bounds checks? Tried but seems to cause infinite recursion - if (_compare(UpperBound()) > 0) { - positionFrom(UpperBound()); - error = KEYERR_OUTOFBOUNDS; - } - if (_compare(LowerBound()) < 0) { - positionFrom(LowerBound()); - error = KEYERR_OUTOFBOUNDS; - } - } + continue; + } + if (verse < (intros?0:1)) { + if (--chapter < (intros?0:1)) { + --book; + chapter += (getChapterMax() + (intros?1:0)); + } + verse += (getVerseMax() + (intros?1:0)); + continue; + } + + break; // If we've made it this far (all failure checks continue) we're ok + } + + if (testament > (BMAX[1]?2:1)) { + testament = BMAX[1]?2:1; + book = BMAX[testament-1]; + chapter = getChapterMax(); + verse = getVerseMax(); + error = KEYERR_OUTOFBOUNDS; + } + + if (testament < 1) { + error = ((!intros) || (testament < 0) || (book < 0)) ? KEYERR_OUTOFBOUNDS : 0; + testament = ((intros) ? 0 : 1); + book = ((intros) ? 0 : 1); + chapter = ((intros) ? 0 : 1); + verse = ((intros) ? 0 : 1); + } + + // should we always perform bounds checks? Tried but seems to cause infinite recursion + if (_compare(getUpperBound()) > 0) { + positionFrom(getUpperBound()); + error = KEYERR_OUTOFBOUNDS; + } + if (_compare(getLowerBound()) < 0) { + positionFrom(getLowerBound()); + error = KEYERR_OUTOFBOUNDS; + } + } } @@ -1378,7 +1463,7 @@ char VerseKey::getBook() const /****************************************************************************** - * VerseKey::Chapter - Gets chapter + * VerseKey::getChapter - Gets chapter * * RET: value of chapter */ @@ -1390,7 +1475,7 @@ int VerseKey::getChapter() const /****************************************************************************** - * VerseKey::Verse - Gets verse + * VerseKey::getVerse - Gets verse * * RET: value of verse */ @@ -1407,16 +1492,16 @@ int VerseKey::getVerse() const * ENT: itestament - value which to set testament * [MAXPOS(char)] - only get * - * RET: if unchanged -> value of testament - * if changed -> previous value of testament */ void VerseKey::setTestament(char itestament) { - if (itestament != MAXPOS(char)) { - testament = itestament; - Normalize(1); - } + suffix = 0; + verse = (intros) ? 0 : 1; + chapter = (intros) ? 0 : 1; + book = (intros) ? 0 : 1; + testament = itestament; + normalize(true); } @@ -1428,10 +1513,11 @@ void VerseKey::setTestament(char itestament) void VerseKey::setBook(char ibook) { - verse = 1; - chapter = 1; + suffix = 0; + verse = (intros) ? 0 : 1; + chapter = (intros) ? 0 : 1; book = ibook; - Normalize(1); + normalize(true); } @@ -1444,7 +1530,7 @@ void VerseKey::setBook(char ibook) void VerseKey::setBookName(const char *bname) { - int bnum = getBookAbbrev(bname); + int bnum = getBookFromAbbrev(bname); if (bnum > -1) { if (bnum > BMAX[0]) { bnum -= BMAX[0]; @@ -1465,11 +1551,10 @@ void VerseKey::setBookName(const char *bname) void VerseKey::setChapter(int ichapter) { - verse = 1; + suffix = 0; + verse = (intros) ? 0 : 1; chapter = ichapter; - Normalize(1); - // TODO: easiest fix, but should be in Normalize - verse = 1; + normalize(true); } @@ -1485,9 +1570,9 @@ void VerseKey::setChapter(int ichapter) void VerseKey::setVerse(int iverse) { - setSuffix(0); - verse = iverse; - Normalize(1); + suffix = 0; + verse = iverse; + normalize(true); } @@ -1500,7 +1585,7 @@ void VerseKey::setSuffix(char suf) { } /****************************************************************************** - * VerseKey::AutoNormalize - Sets/gets flag that tells VerseKey to auto- + * VerseKey::isAutoNormalize - gets flag that tells VerseKey to auto- * matically normalize itself when modified */ @@ -1512,67 +1597,37 @@ bool VerseKey::isAutoNormalize() const void VerseKey::setAutoNormalize(bool iautonorm) { autonorm = iautonorm?1:0; - Normalize(1); + normalize(true); } /****************************************************************************** - * VerseKey::Headings - Sets/gets flag that tells VerseKey to include - * chap/book/testmnt/module headings + * VerseKey::setIntros - Sets flag that tells VerseKey to include + * chap/book/testmnt/module introductions * - * ENT: iheadings - value which to set headings - * [MAXPOS(char)] - only get + * ENT: val - value which to set intros * - * RET: if unchanged -> value of headings - * if changed -> previous value of headings */ -char VerseKey::Headings(char iheadings) +void VerseKey::setIntros(bool val) { - char retval = headings; - - if (iheadings != MAXPOS(char)) { - headings = iheadings; - Normalize(1); - } - return retval; + intros = val; + normalize(true); } - -/****************************************************************************** - * VerseKey::findindex - binary search to find the index closest, but less - * than the given value. - * - * ENT: array - long * to array to search - * size - number of elements in the array - * value - value to find - * - * RET: the index into the array that is less than but closest to value - */ - -int VerseKey::findindex(long *array, int size, long value) +bool VerseKey::isIntros() const { - int lbound, ubound, tval; - - lbound = 0; - ubound = size - 1; - while ((ubound - lbound) > 1) { - tval = lbound + (ubound-lbound)/2; - if (array[tval] <= value) - lbound = tval; - else ubound = tval; - } - return (array[ubound] <= value) ? ubound : lbound; + return intros; } /****************************************************************************** - * VerseKey::Index - Gets index based upon current verse + * VerseKey::getIndex - Gets index based upon current verse * * RET: offset */ -long VerseKey::Index() const +long VerseKey::getIndex() const { long offset; @@ -1590,28 +1645,33 @@ long VerseKey::Index() const /****************************************************************************** - * VerseKey::TestamentIndex - Gets index based upon current verse + * VerseKey::getTestamentIndex - Gets index based upon current verse * * RET: offset */ -long VerseKey::TestamentIndex() const +long VerseKey::getTestamentIndex() const { - long offset = Index(); + long offset = getIndex(); return (testament > 1) ? offset - refSys->getNTStartOffset() : offset; } /****************************************************************************** - * VerseKey::Index - Sets index based upon current verse + * VerseKey::setIndex - Sets index based upon current verse * * ENT: iindex - value to set index to * - * RET: offset */ -long VerseKey::Index(long iindex) +void VerseKey::setIndex(long iindex) { + // assert we're sane + if (iindex < 0) { + error = KEYERR_OUTOFBOUNDS; + return; + } + int b; error = refSys->getVerseFromOffset(iindex, &b, &chapter, &verse); book = (unsigned char)b; @@ -1624,19 +1684,23 @@ long VerseKey::Index(long iindex) if (book < 0) { testament = 0; book = 0; } if (chapter < 0) { book = 0; chapter = 0; } - long i = Index(); + checkBounds(); +} + +void VerseKey::checkBounds() { + + long i = getIndex(); initBounds(); if (i > upperBound) { - i = Index(upperBound); + setIndex(upperBound); + i = getIndex(); error = KEYERR_OUTOFBOUNDS; } if (i < lowerBound) { - i = Index(lowerBound); + setIndex(lowerBound); error = KEYERR_OUTOFBOUNDS; } - - return i; } @@ -1677,14 +1741,14 @@ int VerseKey::_compare(const VerseKey &ivkey) unsigned long keyval1 = 0; unsigned long keyval2 = 0; - keyval1 += Testament() * 1000000000; - keyval2 += ivkey.Testament() * 1000000000; - keyval1 += Book() * 10000000; - keyval2 += ivkey.Book() * 10000000; - keyval1 += Chapter() * 10000; - keyval2 += ivkey.Chapter() * 10000; - keyval1 += Verse() * 50; - keyval2 += ivkey.Verse() * 50; + keyval1 += getTestament() * 1000000000; + keyval2 += ivkey.getTestament() * 1000000000; + keyval1 += getBook() * 10000000; + keyval2 += ivkey.getBook() * 10000000; + keyval1 += getChapter() * 10000; + keyval2 += ivkey.getChapter() * 10000; + keyval1 += getVerse() * 50; + keyval2 += ivkey.getVerse() * 50; keyval1 += (int)getSuffix(); keyval2 += (int)ivkey.getSuffix(); keyval1 = (keyval1 != keyval2) ? ((keyval1 > keyval2) ? 1 : -1) : 0; // -1 | 0 | 1 @@ -1699,11 +1763,11 @@ const char *VerseKey::getOSISRef() const { if (loop > 4) loop = 0; - if (Verse()) - sprintf(buf[loop], "%s.%d.%d", getOSISBookName(), (int)Chapter(), (int)Verse()); - else if (Chapter()) - sprintf(buf[loop], "%s.%d", getOSISBookName(), (int)Chapter()); - else if (Book()) + if (getVerse()) + sprintf(buf[loop], "%s.%d.%d", getOSISBookName(), getChapter(), getVerse()); + else if (getChapter()) + sprintf(buf[loop], "%s.%d", getOSISBookName(), getChapter()); + else if (getBook()) sprintf(buf[loop], "%s", getOSISBookName()); else buf[loop][0] = 0; return buf[loop++]; @@ -1716,9 +1780,9 @@ const char *VerseKey::getOSISRef() const { const char *VerseKey::getRangeText() const { if (isBoundSet() && lowerBound != upperBound) { - SWBuf buf = (const char *)LowerBound(); + SWBuf buf = (const char *)getLowerBound(); buf += "-"; - buf += (const char *)UpperBound(); + buf += (const char *)getUpperBound(); stdstr(&rangeText, buf.c_str()); } else stdstr(&rangeText, getText()); @@ -1732,9 +1796,9 @@ const char *VerseKey::getRangeText() const { const char *VerseKey::getOSISRefRangeText() const { if (isBoundSet() && (lowerBound != upperBound)) { - SWBuf buf = LowerBound().getOSISRef(); + SWBuf buf = getLowerBound().getOSISRef(); buf += "-"; - buf += UpperBound().getOSISRef(); + buf += getUpperBound().getOSISRef(); stdstr(&rangeText, buf.c_str()); } else stdstr(&rangeText, getOSISRef()); @@ -1750,10 +1814,10 @@ const char *VerseKey::convertToOSIS(const char *inRef, const SWKey *lastKnownKey outRef = ""; VerseKey defLanguage; - ListKey verses = defLanguage.ParseVerseList(inRef, (*lastKnownKey), true); + ListKey verses = defLanguage.parseVerseList(inRef, (*lastKnownKey), true); const char *startFrag = inRef; - for (int i = 0; i < verses.Count(); i++) { - SWKey *element = verses.GetElement(i); + for (int i = 0; i < verses.getCount(); i++) { + SWKey *element = verses.getElement(i); // VerseKey *element = SWDYNAMIC_CAST(VerseKey, verses.GetElement(i)); SWBuf buf; // TODO: This code really needs to not use fixed size arrays diff --git a/src/keys/versetreekey.cpp b/src/keys/versetreekey.cpp index edfbcc3..571314f 100644 --- a/src/keys/versetreekey.cpp +++ b/src/keys/versetreekey.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * VerseTreeKey.cpp - code for class 'VerseTreeKey'- versekey using treekey - * for data retrieval * + * versetreekey.cpp - code for class 'VerseTreeKey'- versekey using treekey + * for data retrieval + * + * $Id: versetreekey.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -86,15 +88,15 @@ SWKey *VerseTreeKey::clone() const } -int VerseTreeKey::getBookAbbrev(const char *iabbr) +int VerseTreeKey::getBookFromAbbrev(const char *iabbr) const { - int bookno = VerseKey::getBookAbbrev(iabbr); + int bookno = VerseKey::getBookFromAbbrev(iabbr); if (bookno < 0) { /* vector::iterator it = find(books, iabbr); if (it == books.end()) { TreeKey *tkey = this->treeKey; - int saveError = tkey->Error(); + int saveError = tkey->popError(); long bookmark = tkey->getOffset(); SWBuf segment; internalPosChange = true; @@ -129,7 +131,7 @@ void VerseTreeKey::decrement(int steps) { if (!error) lastGoodOffset = getTreeKey()->getOffset(); do { treeKey->decrement(); - treeError = treeKey->Error(); + treeError = treeKey->popError(); // iterate until 3 levels and no versekey parse errors } while (!treeError && ((treeKey->getLevel() < 3) || error)); if (error && !treeError) { @@ -141,12 +143,12 @@ void VerseTreeKey::decrement(int steps) { treeKey->setOffset(lastGoodOffset); error = treeError; } - if (_compare(UpperBound()) > 0) { - positionFrom(UpperBound()); + if (_compare(getUpperBound()) > 0) { + positionFrom(getUpperBound()); error = KEYERR_OUTOFBOUNDS; } - if (_compare(LowerBound()) < 0) { - positionFrom(LowerBound()); + if (_compare(getLowerBound()) < 0) { + positionFrom(getLowerBound()); error = KEYERR_OUTOFBOUNDS; } } @@ -157,7 +159,7 @@ void VerseTreeKey::increment(int steps) { if (!error) lastGoodOffset = getTreeKey()->getOffset(); do { treeKey->increment(); - treeError = treeKey->Error(); + treeError = treeKey->popError(); // iterate until 3 levels and no versekey parse errors } while (!treeError && ((treeKey->getLevel() < 3) || error)); if (error && !treeError) { @@ -170,12 +172,12 @@ void VerseTreeKey::increment(int steps) { error = treeError; } // bounds - if (_compare(UpperBound()) > 0) { - positionFrom(UpperBound()); + if (_compare(getUpperBound()) > 0) { + positionFrom(getUpperBound()); error = KEYERR_OUTOFBOUNDS; } - if (_compare(LowerBound()) < 0) { - positionFrom(LowerBound()); + if (_compare(getLowerBound()) < 0) { + positionFrom(getLowerBound()); error = KEYERR_OUTOFBOUNDS; } } @@ -184,7 +186,7 @@ void VerseTreeKey::increment(int steps) { void VerseTreeKey::positionChanged() { if (!internalPosChange) { TreeKey *tkey = this->TreeKey::PositionChangeListener::getTreeKey(); - int saveError = tkey->Error(); + int saveError = tkey->popError(); long bookmark = tkey->getOffset(); SWBuf seg[4]; internalPosChange = true; @@ -231,15 +233,15 @@ void VerseTreeKey::positionChanged() { void VerseTreeKey::syncVerseToTree() { internalPosChange = true; SWBuf path; - if (!Testament()) path = "/"; // "[ Module Heading ]"; - else if (!Book()) path.setFormatted("/[ Testament %d Heading ]", Testament()); + if (!getTestament()) path = "/"; // "[ Module Heading ]"; + else if (!getBook()) path.setFormatted("/[ Testament %d Heading ]", getTestament()); else path.setFormatted("/%s/%d/%d", getOSISBookName(), getChapter(), getVerse()); if (getSuffix()) path += getSuffix(); long bookmark = treeKey->getOffset(); treeKey->setText(path); // if our module has jacked inconsistencies, then let's put our tree back to where it was - if (treeKey->Error()) { + if (treeKey->popError()) { treeKey->setOffset(bookmark); } @@ -270,18 +272,18 @@ void VerseTreeKey::setPosition(SW_POSITION p) { switch (p) { case POS_TOP: - Error(); + popError(); treeKey->setPosition(p); increment(); decrement(); - Error(); + popError(); break; case POS_BOTTOM: - Error(); + popError(); treeKey->setPosition(p); decrement(); increment(); - Error(); + popError(); break; case POS_MAXVERSE: case POS_MAXCHAPTER: diff --git a/src/mgr/Makefile.am b/src/mgr/Makefile.am index 10d7158..6acec3a 100644 --- a/src/mgr/Makefile.am +++ b/src/mgr/Makefile.am @@ -23,8 +23,8 @@ libsword_la_SOURCES += $(mgrdir)/swfiltermgr.cpp libsword_la_SOURCES += $(mgrdir)/encfiltmgr.cpp libsword_la_SOURCES += $(mgrdir)/markupfiltmgr.cpp libsword_la_SOURCES += $(mgrdir)/filemgr.cpp -libsword_la_SOURCES += $(mgrdir)/versemgr.cpp -libsword_la_SOURCES += $(mgrdir)/ftptrans.cpp +libsword_la_SOURCES += $(mgrdir)/versificationmgr.cpp +libsword_la_SOURCES += $(mgrdir)/remotetrans.cpp libsword_la_SOURCES += $(mgrdir)/swlocale.cpp libsword_la_SOURCES += $(mgrdir)/localemgr.cpp libsword_la_SOURCES += $(mgrdir)/swcacher.cpp diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp index 7d2fd3c..63eacb1 100644 --- a/src/mgr/curlftpt.cpp +++ b/src/mgr/curlftpt.cpp @@ -1,9 +1,10 @@ - /***************************************************************************** - * CURLFTPTransport functions +/***************************************************************************** * + * curlftpt.cpp - CURLFTPTransport * + * $Id: curlftpt.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -19,106 +20,110 @@ * */ - - #include #include #include -#include #include #include -SWORD_NAMESPACE_START +SWORD_NAMESPACE_START -struct FtpFile { - const char *filename; - FILE *stream; - SWBuf *destBuf; -}; +namespace { + struct FtpFile { + const char *filename; + FILE *stream; + SWBuf *destBuf; + }; -int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream); -int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow); -static CURLFTPTransport_init _CURLFTPTransport_init; + // initialize/cleanup SYSTEMWIDE library with life of this static. + static class CURLFTPTransport_init { + public: + CURLFTPTransport_init() { + curl_global_init(CURL_GLOBAL_DEFAULT); // curl_easy_init automatically calls it if needed + } -CURLFTPTransport_init::CURLFTPTransport_init() { - curl_global_init(CURL_GLOBAL_DEFAULT); // curl_easy_init automatically calls it if needed -} + ~CURLFTPTransport_init() { + curl_global_cleanup(); + } + } _curlFTPTransport_init; -CURLFTPTransport_init::~CURLFTPTransport_init() { - curl_global_cleanup(); -} -int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) { - struct FtpFile *out=(struct FtpFile *)stream; - if (out && !out->stream && !out->destBuf) { - /* open file for writing */ - out->stream=fopen(out->filename, "wb"); - if (!out->stream) - return -1; /* failure, can't open file to write */ - } - if (out->destBuf) { - int s = out->destBuf->size(); - out->destBuf->size(s+(size*nmemb)); - memcpy(out->destBuf->getRawData()+s, buffer, size*nmemb); - return nmemb; + static int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) { + struct FtpFile *out=(struct FtpFile *)stream; + if (out && !out->stream && !out->destBuf) { + /* open file for writing */ + out->stream=fopen(out->filename, "wb"); + if (!out->stream) + return -1; /* failure, can't open file to write */ + } + if (out->destBuf) { + int s = out->destBuf->size(); + out->destBuf->size(s+(size*nmemb)); + memcpy(out->destBuf->getRawData()+s, buffer, size*nmemb); + return nmemb; + } + return fwrite(buffer, size, nmemb, out->stream); } - return fwrite(buffer, size, nmemb, out->stream); -} -struct MyProgressData { - StatusReporter *sr; - bool *term; -}; + struct MyProgressData { + StatusReporter *sr; + bool *term; + }; -int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) { - if (clientp) { - MyProgressData *pd = (MyProgressData *)clientp; -SWLog::getSystemLog()->logDebug("CURLFTPTransport report progress: totalSize: %ld; xfered: %ld\n", (long)dltotal, (long)dlnow); - if (pd->sr) { - pd->sr->statusUpdate(dltotal, dlnow); + static int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) { + if (clientp) { + MyProgressData *pd = (MyProgressData *)clientp; + SWLog::getSystemLog()->logDebug("CURLFTPTransport report progress: totalSize: %ld; xfered: %ld\n", (long)dltotal, (long)dlnow); + if (pd->sr) { + if (dltotal < 0) dltotal = 0; + if (dlnow < 0) dlnow = 0; + if (dlnow > dltotal) dlnow = dltotal; + pd->sr->update(dltotal, dlnow); + } + if (*(pd->term)) return 1; } - if (*(pd->term)) return 1; + return 0; } - return 0; -} -static int my_trace(CURL *handle, curl_infotype type, unsigned char *data, size_t size, void *userp) { - SWBuf header; - (void)userp; /* prevent compiler warning */ - (void)handle; /* prevent compiler warning */ + static int my_trace(CURL *handle, curl_infotype type, unsigned char *data, size_t size, void *userp) { + SWBuf header; + (void)userp; /* prevent compiler warning */ + (void)handle; /* prevent compiler warning */ - switch (type) { - case CURLINFO_TEXT: header = "TEXT"; break; - case CURLINFO_HEADER_OUT: header = "=> Send header"; break; - case CURLINFO_HEADER_IN: header = "<= Recv header"; break; - - // these we don't want to log (HUGE) - case CURLINFO_DATA_OUT: header = "=> Send data"; - case CURLINFO_SSL_DATA_OUT: header = "=> Send SSL data"; - case CURLINFO_DATA_IN: header = "<= Recv data"; - case CURLINFO_SSL_DATA_IN: header = "<= Recv SSL data"; - default: /* in case a new one is introduced to shock us */ + switch (type) { + case CURLINFO_TEXT: header = "TEXT"; break; + case CURLINFO_HEADER_OUT: header = "=> Send header"; break; + case CURLINFO_HEADER_IN: header = "<= Recv header"; break; + + // these we don't want to log (HUGE) + case CURLINFO_DATA_OUT: header = "=> Send data"; + case CURLINFO_SSL_DATA_OUT: header = "=> Send SSL data"; + case CURLINFO_DATA_IN: header = "<= Recv data"; + case CURLINFO_SSL_DATA_IN: header = "<= Recv SSL data"; + default: /* in case a new one is introduced to shock us */ + return 0; + } + + if (size > 120) size = 120; + SWBuf text; + text.size(size); + memcpy(text.getRawData(), data, size); + SWLog::getSystemLog()->logDebug("CURLFTPTransport: %s: %s", header.c_str(), text.c_str()); return 0; } - - if (size > 120) size = 120; - SWBuf text; - text.size(size); - memcpy(text.getRawData(), data, size); - SWLog::getSystemLog()->logDebug("CURLFTPTransport: %s: %s", header.c_str(), text.c_str()); - return 0; } -CURLFTPTransport::CURLFTPTransport(const char *host, StatusReporter *sr) : FTPTransport(host, sr) { + +CURLFTPTransport::CURLFTPTransport(const char *host, StatusReporter *sr) : RemoteTransport(host, sr) { session = (CURL *)curl_easy_init(); } @@ -156,6 +161,7 @@ char CURLFTPTransport::getURL(const char *destPath, const char *sourceURL, SWBuf /* Switch on full protocol/debug output */ curl_easy_setopt(session, CURLOPT_VERBOSE, true); + curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT, 45); /* FTP connection settings */ diff --git a/src/mgr/curlhttpt.cpp b/src/mgr/curlhttpt.cpp index b736050..5db0ee7 100644 --- a/src/mgr/curlhttpt.cpp +++ b/src/mgr/curlhttpt.cpp @@ -1,9 +1,10 @@ - /***************************************************************************** - * CURLHTTPTransport functions +/***************************************************************************** * + * curlhttpt.cpp - CURLHTTPTransport * + * $Id: curlhttpt.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,7 +26,6 @@ #include #include -#include #include #include @@ -34,84 +34,77 @@ using std::vector; -SWORD_NAMESPACE_START - - -struct FtpFile { - const char *filename; - FILE *stream; - SWBuf *destBuf; -}; +SWORD_NAMESPACE_START -int my_httpfwrite(void *buffer, size_t size, size_t nmemb, void *stream); -int my_httpfprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow); +namespace { -static CURLHTTPTransport_init _CURLHTTPTransport_init; + struct FtpFile { + const char *filename; + FILE *stream; + SWBuf *destBuf; + }; -CURLHTTPTransport_init::CURLHTTPTransport_init() { - //curl_global_init(CURL_GLOBAL_DEFAULT); // curl_easy_init automatically calls it if needed -} -CURLHTTPTransport_init::~CURLHTTPTransport_init() { -// CURLFTPT d-tor cleans this up -// curl_global_cleanup(); -} - -int my_httpfwrite(void *buffer, size_t size, size_t nmemb, void *stream) { - struct FtpFile *out=(struct FtpFile *)stream; - if (out && !out->stream && !out->destBuf) { - /* open file for writing */ - out->stream=fopen(out->filename, "wb"); - if (!out->stream) - return -1; /* failure, can't open file to write */ - } - if (out->destBuf) { - int s = out->destBuf->size(); - out->destBuf->size(s+(size*nmemb)); - memcpy(out->destBuf->getRawData()+s, buffer, size*nmemb); - return nmemb; + static int my_httpfwrite(void *buffer, size_t size, size_t nmemb, void *stream) { + struct FtpFile *out=(struct FtpFile *)stream; + if (out && !out->stream && !out->destBuf) { + /* open file for writing */ + out->stream=fopen(out->filename, "wb"); + if (!out->stream) + return -1; /* failure, can't open file to write */ + } + if (out->destBuf) { + int s = out->destBuf->size(); + out->destBuf->size(s+(size*nmemb)); + memcpy(out->destBuf->getRawData()+s, buffer, size*nmemb); + return nmemb; + } + return fwrite(buffer, size, nmemb, out->stream); } - return fwrite(buffer, size, nmemb, out->stream); -} -int my_httpfprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) { - if (clientp) { - ((StatusReporter *)clientp)->statusUpdate(dltotal, dlnow); + static int my_httpfprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) { + if (clientp) { + if (dltotal < 0) dltotal = 0; + if (dlnow < 0) dlnow = 0; + if (dlnow > dltotal) dlnow = dltotal; + ((StatusReporter *)clientp)->update(dltotal, dlnow); + } + return 0; } - return 0; -} -static int myhttp_trace(CURL *handle, curl_infotype type, unsigned char *data, size_t size, void *userp) { - SWBuf header; - (void)userp; /* prevent compiler warning */ - (void)handle; /* prevent compiler warning */ + static int myhttp_trace(CURL *handle, curl_infotype type, unsigned char *data, size_t size, void *userp) { + SWBuf header; + (void)userp; /* prevent compiler warning */ + (void)handle; /* prevent compiler warning */ - switch (type) { - case CURLINFO_TEXT: header = "TEXT"; break; - case CURLINFO_HEADER_OUT: header = "=> Send header"; break; - case CURLINFO_HEADER_IN: header = "<= Recv header"; break; + switch (type) { + case CURLINFO_TEXT: header = "TEXT"; break; + case CURLINFO_HEADER_OUT: header = "=> Send header"; break; + case CURLINFO_HEADER_IN: header = "<= Recv header"; break; + + // these we don't want to log (HUGE) + case CURLINFO_DATA_OUT: header = "=> Send data"; + case CURLINFO_SSL_DATA_OUT: header = "=> Send SSL data"; + case CURLINFO_DATA_IN: header = "<= Recv data"; + case CURLINFO_SSL_DATA_IN: header = "<= Recv SSL data"; + default: /* in case a new one is introduced to shock us */ + return 0; + } - // these we don't want to log (HUGE) - case CURLINFO_DATA_OUT: header = "=> Send data"; - case CURLINFO_SSL_DATA_OUT: header = "=> Send SSL data"; - case CURLINFO_DATA_IN: header = "<= Recv data"; - case CURLINFO_SSL_DATA_IN: header = "<= Recv SSL data"; - default: /* in case a new one is introduced to shock us */ + if (size > 120) size = 120; + SWBuf text; + text.size(size); + memcpy(text.getRawData(), data, size); + SWLog::getSystemLog()->logDebug("CURLHTTPTransport: %s: %s", header.c_str(), text.c_str()); return 0; } - - if (size > 120) size = 120; - SWBuf text; - text.size(size); - memcpy(text.getRawData(), data, size); - SWLog::getSystemLog()->logDebug("CURLHTTPTransport: %s: %s", header.c_str(), text.c_str()); - return 0; } -CURLHTTPTransport::CURLHTTPTransport(const char *host, StatusReporter *sr) : FTPTransport(host, sr) { + +CURLHTTPTransport::CURLHTTPTransport(const char *host, StatusReporter *sr) : RemoteTransport(host, sr) { session = (CURL *)curl_easy_init(); } @@ -136,6 +129,7 @@ char CURLHTTPTransport::getURL(const char *destPath, const char *sourceURL, SWBu if (!passive) curl_easy_setopt(session, CURLOPT_FTPPORT, "-"); curl_easy_setopt(session, CURLOPT_NOPROGRESS, 0); + curl_easy_setopt(session, CURLOPT_FAILONERROR, 1); curl_easy_setopt(session, CURLOPT_PROGRESSDATA, statusReporter); curl_easy_setopt(session, CURLOPT_PROGRESSFUNCTION, my_httpfprogress); curl_easy_setopt(session, CURLOPT_DEBUGFUNCTION, myhttp_trace); @@ -144,7 +138,11 @@ char CURLHTTPTransport::getURL(const char *destPath, const char *sourceURL, SWBu /* Switch on full protocol/debug output */ curl_easy_setopt(session, CURLOPT_VERBOSE, true); + curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT, 45); + /* Disable checking host certificate */ + curl_easy_setopt(session, CURLOPT_SSL_VERIFYPEER, false); + /* FTP connection settings */ #if (LIBCURL_VERSION_MAJOR > 7) || \ @@ -206,7 +204,7 @@ vector CURLHTTPTransport::getDirList(const char *dirURL) { SWBuf dirBuf; const char *pBuf; char *pBufRes; - char possibleName[400]; + SWBuf possibleName; double fSize; int possibleNameLength = 0; @@ -215,10 +213,12 @@ vector CURLHTTPTransport::getDirList(const char *dirURL) { while (pBuf != NULL) { pBuf += 9;//move to the start of the actual name. pBufRes = (char *)strchr(pBuf, '\"');//Find the end of the possible file name + if (!pBufRes) + break; possibleNameLength = pBufRes - pBuf; - sprintf(possibleName, "%.*s", possibleNameLength, pBuf); + possibleName.setFormatted("%.*s", possibleNameLength, pBuf); if (isalnum(possibleName[0])) { - SWLog::getSystemLog()->logDebug("getDirListHTTP: Found a file: %s", possibleName); + SWLog::getSystemLog()->logDebug("getDirListHTTP: Found a file: %s", possibleName.c_str()); pBuf = pBufRes; pBufRes = (char *)findSizeStart(pBuf); fSize = 0; @@ -229,13 +229,13 @@ vector CURLHTTPTransport::getDirList(const char *dirURL) { fSize *= 1024; else if (pBufRes[0] == 'M') fSize *= 1048576; + pBuf = pBufRes; } struct DirEntry i; i.name = possibleName; - i.size = fSize; - i.isDirectory = (possibleName[possibleNameLength-1] == '/'); + i.size = (long unsigned int)fSize; + i.isDirectory = possibleName.endsWith("/"); dirList.push_back(i); - pBuf = pBufRes; } else { pBuf += possibleNameLength; } diff --git a/src/mgr/encfiltmgr.cpp b/src/mgr/encfiltmgr.cpp index cb6dab4..24938bc 100644 --- a/src/mgr/encfiltmgr.cpp +++ b/src/mgr/encfiltmgr.cpp @@ -1,9 +1,12 @@ /****************************************************************************** - * swencodingmgr.cpp - implementaion of class EncodingFilterMgr, subclass of - * used to transcode all module text to a requested - * encoding. * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * encfiltmgr.cpp - implementaion of class EncodingFilterMgr, subclass of + * SWFilterMgr, used to transcode all module text to a + * requested encoding + * + * $Id: encfiltmgr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -22,6 +25,7 @@ #include #include +#include #include #include @@ -32,65 +36,65 @@ #include + SWORD_NAMESPACE_START + /****************************************************************************** * EncodingFilterMgr Constructor - initializes instance of EncodingFilterMgr * * ENT: * enc - Encoding format to emit */ +EncodingFilterMgr::EncodingFilterMgr(char enc) + : SWFilterMgr() { -EncodingFilterMgr::EncodingFilterMgr (char enc) - : SWFilterMgr() { - - latin1utf8 = new Latin1UTF8(); - - encoding = enc; - - switch (encoding) { - case ENC_LATIN1: - targetenc = new UTF8Latin1(); - break; - case ENC_UTF16: - targetenc = new UTF8UTF16(); - break; - case ENC_RTF: - targetenc = new UnicodeRTF(); - break; - case ENC_HTML: - targetenc = new UTF8HTML(); - break; - default: // i.e. case ENC_UTF8 - targetenc = NULL; - } + scsuutf8 = new SCSUUTF8(); + latin1utf8 = new Latin1UTF8(); + + encoding = enc; + + switch (encoding) { + case ENC_LATIN1: targetenc = new UTF8Latin1(); break; + case ENC_UTF16: targetenc = new UTF8UTF16(); break; + case ENC_RTF: targetenc = new UnicodeRTF(); break; + case ENC_HTML: targetenc = new UTF8HTML(); break; + default: // i.e. case ENC_UTF8 + targetenc = NULL; + } } + /****************************************************************************** * EncodingFilterMgr Destructor - Cleans up instance of EncodingFilterMgr */ EncodingFilterMgr::~EncodingFilterMgr() { - if (latin1utf8) - delete latin1utf8; - if (targetenc) - delete targetenc; + delete scsuutf8; + delete latin1utf8; + delete targetenc; } + void EncodingFilterMgr::AddRawFilters(SWModule *module, ConfigEntMap §ion) { ConfigEntMap::iterator entry; SWBuf encoding = ((entry = section.find("Encoding")) != section.end()) ? (*entry).second : (SWBuf)""; if (!encoding.length() || !stricmp(encoding.c_str(), "Latin-1")) { - module->AddRawFilter(latin1utf8); + module->addRawFilter(latin1utf8); + } + else if (!stricmp(encoding.c_str(), "SCSU")) { + module->addRawFilter(scsuutf8); } } + void EncodingFilterMgr::AddEncodingFilters(SWModule *module, ConfigEntMap §ion) { - if (targetenc) - module->AddEncodingFilter(targetenc); + if (targetenc) + module->addEncodingFilter(targetenc); } + /****************************************************************************** * EncodingFilterMgr::Encoding - sets/gets encoding * @@ -99,49 +103,41 @@ void EncodingFilterMgr::AddEncodingFilters(SWModule *module, ConfigEntMap §i * RET: encoding */ char EncodingFilterMgr::Encoding(char enc) { - if (enc && enc != encoding) { - encoding = enc; - SWFilter * oldfilter = targetenc; - - switch (encoding) { - case ENC_LATIN1: - targetenc = new UTF8Latin1(); - break; - case ENC_UTF16: - targetenc = new UTF8UTF16(); - break; - case ENC_RTF: - targetenc = new UnicodeRTF(); - break; - case ENC_HTML: - targetenc = new UTF8HTML(); - break; - default: // i.e. case ENC_UTF8 - targetenc = NULL; - } - - ModMap::const_iterator module; - - if (oldfilter != targetenc) { - if (oldfilter) { - if (!targetenc) { - for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++) - module->second->RemoveRenderFilter(oldfilter); - } - else { - for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++) - module->second->ReplaceRenderFilter(oldfilter, targetenc); - } - delete oldfilter; - } - else if (targetenc) { - for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++) - module->second->AddRenderFilter(targetenc); - } - } - - } - return encoding; + if (enc && enc != encoding) { + encoding = enc; + SWFilter *oldfilter = targetenc; + + switch (encoding) { + case ENC_LATIN1: targetenc = new UTF8Latin1(); break; + case ENC_UTF16: targetenc = new UTF8UTF16(); break; + case ENC_RTF: targetenc = new UnicodeRTF(); break; + case ENC_HTML: targetenc = new UTF8HTML(); break; + default: // i.e. case ENC_UTF8 + targetenc = NULL; + } + + ModMap::const_iterator module; + + if (oldfilter != targetenc) { + if (oldfilter) { + if (!targetenc) { + for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++) + module->second->removeRenderFilter(oldfilter); + } + else { + for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++) + module->second->replaceRenderFilter(oldfilter, targetenc); + } + delete oldfilter; + } + else if (targetenc) { + for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++) + module->second->addRenderFilter(targetenc); + } + } + } + return encoding; } + SWORD_NAMESPACE_END diff --git a/src/mgr/filemgr.cpp b/src/mgr/filemgr.cpp index 820440b..d801aaa 100644 --- a/src/mgr/filemgr.cpp +++ b/src/mgr/filemgr.cpp @@ -1,10 +1,11 @@ /****************************************************************************** - * filemgr.cpp - implementation of class FileMgr used for pooling file - * handles * - * $Id: filemgr.cpp 2495 2009-12-24 22:22:16Z scribe $ + * filemgr.cpp - implementation of class FileMgr used for pooling file + * handles * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: filemgr.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -540,12 +541,18 @@ int FileMgr::removeDir(const char *targetDir) { FileMgr::removeFile(targetPath.c_str()); } else { - removeDir(targetPath.c_str()); + FileMgr::removeDir(targetPath.c_str()); } } } closedir(dir); - removeFile(targetDir); + FileMgr::removeFile(targetDir); +/* + int status = FileMgr::removeFile(targetDir); + int stuff = errno; + char *err = strerror(errno); + int x = stuff; +*/ } return 0; } diff --git a/src/mgr/ftplibftpt.cpp b/src/mgr/ftplibftpt.cpp index fe23048..f1d1655 100644 --- a/src/mgr/ftplibftpt.cpp +++ b/src/mgr/ftplibftpt.cpp @@ -1,9 +1,10 @@ - /***************************************************************************** - * FTPLibFTPTransport functions +/***************************************************************************** * + * ftplibftpt.cpp - FTPLibFTPTransport * + * $Id: ftplibftpt.cpp 2983 2013-09-15 16:22:32Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -18,7 +19,6 @@ * General Public License for more details. * */ - #include #include @@ -34,41 +34,58 @@ SWORD_NAMESPACE_START namespace { -struct MyProgressData { - StatusReporter *sr; - long totalSize; - bool *term; -}; - -int my_fprogress(netbuf *nControl, int xfered, void *arg) { - if (arg) { - MyProgressData *pd = (MyProgressData *)arg; -SWLog::getSystemLog()->logDebug("FTPLibFTPTransport report progress: totalSize: %ld; xfered: %d\n", pd->totalSize, xfered); - if (pd->sr) { - pd->sr->statusUpdate(pd->totalSize, xfered); - } - if (*(pd->term)) return 0; + struct MyProgressData { + StatusReporter *sr; + long totalSize; + bool *term; + }; + + static int my_swbufwriter(netbuf *nControl, void *buffer, size_t size, void *swbuf) { + SWBuf &output = *(SWBuf *)swbuf; + int s = output.size(); + output.size(s+size); + memcpy(output.getRawData()+s, buffer, size); + return size; } - return 1; -} -} +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + static int my_fprogress(netbuf *nControl, int xfered, void *arg) { + if (arg) { + MyProgressData *pd = (MyProgressData *)arg; + SWLog::getSystemLog()->logDebug("FTPLibFTPTransport report progress: totalSize: %ld; xfered: %d\n", pd->totalSize, xfered); + if (pd->sr) { + pd->sr->statusUpdate(pd->totalSize, xfered); + } + if (*(pd->term)) return 0; + } + return 1; + } +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif -static FTPLibFTPTransport_init _FTPLibFTPTransport_init; + // initialize/cleanup SYSTEMWIDE library with life of this static. + static class FTPLibFTPTransport_init { + public: + FTPLibFTPTransport_init() { + FtpInit(); + } + ~FTPLibFTPTransport_init() { + } -FTPLibFTPTransport_init::FTPLibFTPTransport_init() { - FtpInit(); -} + } _ftpLibFTPTransport_init; -FTPLibFTPTransport_init::~FTPLibFTPTransport_init() { } -FTPLibFTPTransport::FTPLibFTPTransport(const char *host, StatusReporter *sr) : FTPTransport(host, sr) { +FTPLibFTPTransport::FTPLibFTPTransport(const char *host, StatusReporter *sr) : RemoteTransport(host, sr) { ftpConnection = 0; } @@ -85,6 +102,8 @@ char FTPLibFTPTransport::assureLoggedIn() { if (ftpConnection == 0) { SWLog::getSystemLog()->logDebug("connecting to host: %s...\n", host.c_str()); if (FtpConnect(host, &ftpConnection)) { + FtpOptions(FTPLIB_CONNMODE, (passive) ? FTPLIB_PASSIVE : FTPLIB_PORT, ftpConnection); + SWLog::getSystemLog()->logDebug("connected. logging in...\n"); if (FtpLogin(u.c_str(), p.c_str(), ftpConnection)) { SWLog::getSystemLog()->logDebug("logged in.\n"); @@ -103,14 +122,6 @@ char FTPLibFTPTransport::assureLoggedIn() { return retVal; } -// yeah yeah, I know I know. Compile with curl support if you don't like it -#pragma GCC diagnostic ignored "-Wall" -void my_tmpnam(char *tmpName) { - tmpName = tmpnam(tmpName); -} -#pragma GCC diagnostic warning "-Wall" - - char FTPLibFTPTransport::getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf) { @@ -128,29 +139,22 @@ char FTPLibFTPTransport::getURL(const char *destPath, const char *sourceURL, SWB if (!destBuf) { outFile = destPath; } - else { -#ifdef ANDROID - outFile = "/sdcard/sword/InstallMgr/swtmpbuf.out"; -#else - char tmpName[128]; - my_tmpnam(tmpName); - outFile = tmpName; -#endif - } sourcePath << (6 + host.length()); // shift << "ftp://hostname"; - SWLog::getSystemLog()->logDebug("getting file %s to %s\n", sourcePath.c_str(), outFile.c_str()); - if (passive) - FtpOptions(FTPLIB_CONNMODE, FTPLIB_PASSIVE, ftpConnection); - else - FtpOptions(FTPLIB_CONNMODE, FTPLIB_PORT, ftpConnection); - + SWLog::getSystemLog()->logDebug("getting file %s to %s\n", sourcePath.c_str(), destBuf ? "*internal buffer*" : outFile.c_str()); struct MyProgressData pd; pd.sr = statusReporter; pd.term = &term; pd.totalSize = 0; - // !!!WDG also want to set callback options + if (destBuf) { + FtpOptions(FTPLIB_CALLBACK_WRITER, (long)&my_swbufwriter, ftpConnection); + FtpOptions(FTPLIB_CALLBACK_WRITERARG, (long)destBuf, ftpConnection); + } + else { + FtpOptions(FTPLIB_CALLBACK_WRITER, 0L, ftpConnection); + } + FtpOptions(FTPLIB_CALLBACK, (long)&my_fprogress, ftpConnection); FtpOptions(FTPLIB_CALLBACKARG, (long)&pd, ftpConnection); FtpOptions(FTPLIB_CALLBACKBYTES, (long)2048, ftpConnection); @@ -159,29 +163,15 @@ char FTPLibFTPTransport::getURL(const char *destPath, const char *sourceURL, SWB // SWLog::getSystemLog()->logDebug("getting test directory %s\n", sourcePath.c_str()); // FtpDir(NULL, sourcePath, ftpConnection); SWLog::getSystemLog()->logDebug("getting real directory %s\n", sourcePath.c_str()); - retVal = FtpDir(outFile.c_str(), sourcePath, ftpConnection) - 1; - SWLog::getSystemLog()->logDebug("got real directory %s to %s\n", sourcePath.c_str(), outFile.c_str()); + retVal = FtpDir(destBuf ? 0 : outFile.c_str(), sourcePath, ftpConnection) - 1; + SWLog::getSystemLog()->logDebug("got real directory %s to %s\n", sourcePath.c_str(), destBuf ? "*internal buffer*" : outFile.c_str()); } else { SWLog::getSystemLog()->logDebug("getting file %s\n", sourcePath.c_str()); int size; FtpSize(sourcePath, &size, FTPLIB_IMAGE, ftpConnection); pd.totalSize = size; - retVal = FtpGet(outFile.c_str(), sourcePath, FTPLIB_IMAGE, ftpConnection) - 1; - } - - // Is there a way to FTPGet directly to a buffer? - // If not, we probably want to add x-platform way to open a tmp file with FileMgr - // Currently outFile is set to tmpFile above sortof unsafe - if (destBuf) { - SWLog::getSystemLog()->logDebug("filling destBuf\n"); - FileDesc *fd = FileMgr::getSystemFileMgr()->open(outFile.c_str(), FileMgr::RDONLY); - long size = fd->seek(0, SEEK_END); - fd->seek(0, SEEK_SET); - destBuf->size(size); - fd->read(destBuf->getRawData(), size); - FileMgr::getSystemFileMgr()->close(fd); - FileMgr::removeFile(outFile.c_str()); + retVal = FtpGet(destBuf ? 0 : outFile.c_str(), sourcePath, FTPLIB_IMAGE, ftpConnection) - 1; } SWLog::getSystemLog()->logDebug("FTPLibFTPTransport - returning: %d\n", retVal); diff --git a/src/mgr/ftptrans.cpp b/src/mgr/ftptrans.cpp deleted file mode 100644 index 6e17661..0000000 --- a/src/mgr/ftptrans.cpp +++ /dev/null @@ -1,193 +0,0 @@ - /***************************************************************************** - * FTPTransport functions - * - * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - - - - -#include -#include - -#include -#include -#include - -extern "C" { -#include -} - -using std::vector; - - -SWORD_NAMESPACE_START - - -namespace { - -void removeTrailingSlash(SWBuf &buf) { - int len = buf.size(); - if ((buf[len-1] == '/') - || (buf[len-1] == '\\')) - buf.size(len-1); -} - -}; - - -void StatusReporter::preStatus(long totalBytes, long completedBytes, const char *message) { -} - -void StatusReporter::statusUpdate(double dtTotal, double dlNow) { -} - - -FTPTransport::FTPTransport(const char *host, StatusReporter *statusReporter) { - this->statusReporter = statusReporter; - this->host = host; - u = "ftp"; - p = "installmgr@user.com"; - term = false; -} - - -FTPTransport::~FTPTransport() { -} - - -// override this method in your real transport class -char FTPTransport::getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf) { - char retVal = 0; - return retVal; -} - - -vector FTPTransport::getDirList(const char *dirURL) { - - vector dirList; - - SWBuf dirBuf; - if (!getURL("", dirURL, &dirBuf)) { - char *start = dirBuf.getRawData(); - char *end = start; - while (start < (dirBuf.getRawData()+dirBuf.size())) { - struct ftpparse item; - bool looking = true; - for (end = start; *end; end++) { - if (looking) { - if ((*end == 10) || (*end == 13)) { - *end = 0; - looking = false; - } - } - else if ((*end != 10) && (*end != 13)) - break; - } - SWLog::getSystemLog()->logWarning("FTPURLGetDir: parsing item %s(%d)\n", start, end-start); - int status = ftpparse(&item, start, end - start); - SWLog::getSystemLog()->logWarning("FTPURLGetDir: got item %s\n", item.name); - if (status) { - struct DirEntry i; - i.name = item.name; - i.size = item.size; - i.isDirectory = (item.flagtrycwd == 1); - dirList.push_back(i); - } - start = end; - } - } - else - { - SWLog::getSystemLog()->logWarning("FTPURLGetDir: failed to get dir %s\n", dirURL); - } - return dirList; -} - - -int FTPTransport::copyDirectory(const char *urlPrefix, const char *dir, const char *dest, const char *suffix) { - unsigned int i; - int retVal = 0; - - SWBuf url = SWBuf(urlPrefix) + SWBuf(dir); - removeTrailingSlash(url); - url += '/'; - - SWLog::getSystemLog()->logWarning("NetTransport: getting dir %s\n", url.c_str()); - vector dirList = getDirList(url.c_str()); - - if (!dirList.size()) { - SWLog::getSystemLog()->logWarning("NetTransport: failed to read dir %s\n", url.c_str()); - return -1; - } - - long totalBytes = 0; - for (i = 0; i < dirList.size(); i++) - totalBytes += dirList[i].size; - long completedBytes = 0; - for (i = 0; i < dirList.size(); i++) { - struct DirEntry &dirEntry = dirList[i]; - SWBuf buffer = (SWBuf)dest; - removeTrailingSlash(buffer); - buffer += "/"; - buffer += dirEntry.name; - if (!strcmp(&buffer.c_str()[buffer.length()-strlen(suffix)], suffix)) { - SWBuf buffer2 = "Downloading ("; - buffer2.appendFormatted("%d", i+1); - buffer2 += " of "; - buffer2.appendFormatted("%d", dirList.size()); - buffer2 += "): "; - buffer2 += dirEntry.name; - if (statusReporter) - statusReporter->preStatus(totalBytes, completedBytes, buffer2.c_str()); - FileMgr::createParent(buffer.c_str()); // make sure parent directory exists - SWTRY { - SWBuf url = (SWBuf)urlPrefix + (SWBuf)dir; - removeTrailingSlash(url); - url += "/"; - url += dirEntry.name; //dont forget the final slash - if (!dirEntry.isDirectory) { - if (getURL(buffer.c_str(), url.c_str())) { - SWLog::getSystemLog()->logWarning("FTPCopy: failed to get file %s\n", url.c_str()); - return -2; - } - completedBytes += dirEntry.size; - } - else { - SWBuf subdir = (SWBuf)dir; - removeTrailingSlash(subdir); - subdir += (SWBuf)"/" + dirEntry.name; - if (copyDirectory(urlPrefix, subdir, buffer.c_str(), suffix)) { - SWLog::getSystemLog()->logWarning("FTPCopy: failed to get file %s\n", subdir.c_str()); - return -2; - } - } - } - SWCATCH (...) {} - if (term) { - retVal = -3; - break; - } - } - } - return retVal; -} - - -SWORD_NAMESPACE_END - diff --git a/src/mgr/installmgr.cpp b/src/mgr/installmgr.cpp index b75df6f..1e83db5 100644 --- a/src/mgr/installmgr.cpp +++ b/src/mgr/installmgr.cpp @@ -1,10 +1,10 @@ - /***************************************************************************** - * InstallMgr functions to be made into something usefully exposed by - * master Glassey +/***************************************************************************** * + * installmgr.cpp - InstallMgr functions * + * $Id: installmgr.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -20,8 +20,6 @@ * */ - - #ifndef EXCLUDEZLIB extern "C" { #include @@ -51,23 +49,26 @@ extern "C" { #endif #include + + +using std::map; + + SWORD_NAMESPACE_START namespace { -void removeTrailingSlash(SWBuf &buf) { - int len = buf.size(); - if ((buf[len-1] == '/') - || (buf[len-1] == '\\')) - buf.size(len-1); -} - -const char *masterRepoList = "masterRepoList.conf"; + static void removeTrailingSlash(SWBuf &buf) { + int len = buf.size(); + if ((buf[len-1] == '/') + || (buf[len-1] == '\\')) + buf.size(len-1); + } -}; + static const char *masterRepoList = "masterRepoList.conf"; +} -using std::map; const int InstallMgr::MODSTAT_OLDER = 0x001; const int InstallMgr::MODSTAT_SAMEVERSION = 0x002; @@ -76,10 +77,11 @@ const int InstallMgr::MODSTAT_NEW = 0x008; const int InstallMgr::MODSTAT_CIPHERED = 0x010; const int InstallMgr::MODSTAT_CIPHERKEYPRESENT = 0x020; -// override this method and provide your own custom FTPTransport subclass + +// override this method and provide your own custom RemoteTransport subclass // here we try a couple defaults if sword was compiled with support for them. // see these classes for examples of how to make your own -FTPTransport *InstallMgr::createFTPTransport(const char *host, StatusReporter *statusReporter) { +RemoteTransport *InstallMgr::createFTPTransport(const char *host, StatusReporter *statusReporter) { #ifdef CURLAVAILABLE return new CURLFTPTransport(host, statusReporter); #else @@ -87,7 +89,8 @@ FTPTransport *InstallMgr::createFTPTransport(const char *host, StatusReporter *s #endif } -FTPTransport *InstallMgr::createHTTPTransport(const char *host, StatusReporter *statusReporter) { + +RemoteTransport *InstallMgr::createHTTPTransport(const char *host, StatusReporter *statusReporter) { #ifdef CURLAVAILABLE return new CURLHTTPTransport(host, statusReporter); #else @@ -96,7 +99,6 @@ FTPTransport *InstallMgr::createHTTPTransport(const char *host, StatusReporter * } - InstallMgr::InstallMgr(const char *privatePath, StatusReporter *sr, SWBuf u, SWBuf p) { userDisclaimerConfirmed = false; statusReporter = sr; @@ -125,6 +127,7 @@ InstallMgr::~InstallMgr() { clearSources(); } + void InstallMgr::clearSources() { for (InstallSourceMap::iterator it = sources.begin(); it != sources.end(); ++it) { delete it->second; @@ -132,6 +135,7 @@ void InstallMgr::clearSources() { sources.clear(); } + void InstallMgr::readInstallConf() { if (installConf) delete installConf; @@ -147,6 +151,7 @@ void InstallMgr::readInstallConf() { ConfigEntMap::iterator sourceEnd; if (confSection != installConf->Sections.end()) { + sourceBegin = confSection->second.lower_bound("FTPSource"); sourceEnd = confSection->second.upper_bound("FTPSource"); @@ -158,6 +163,21 @@ void InstallMgr::readInstallConf() { is->localShadow = (SWBuf)privatePath + "/" + is->uid; sourceBegin++; } + +#ifdef CURLSFTPAVAILABLE + sourceBegin = confSection->second.lower_bound("SFTPSource"); + sourceEnd = confSection->second.upper_bound("SFTPSource"); + + while (sourceBegin != sourceEnd) { + InstallSource *is = new InstallSource("SFTP", sourceBegin->second.c_str()); + sources[is->caption] = is; + SWBuf parent = (SWBuf)privatePath + "/" + is->uid + "/file"; + FileMgr::createParent(parent.c_str()); + is->localShadow = (SWBuf)privatePath + "/" + is->uid; + sourceBegin++; + } +#endif // CURLSFTPAVAILABLE + sourceBegin = confSection->second.lower_bound("HTTPSource"); sourceEnd = confSection->second.upper_bound("HTTPSource"); @@ -169,6 +189,18 @@ void InstallMgr::readInstallConf() { is->localShadow = (SWBuf)privatePath + "/" + is->uid; sourceBegin++; } + + sourceBegin = confSection->second.lower_bound("HTTPSSource"); + sourceEnd = confSection->second.upper_bound("HTTPSSource"); + + while (sourceBegin != sourceEnd) { + InstallSource *is = new InstallSource("HTTPS", sourceBegin->second.c_str()); + sources[is->caption] = is; + SWBuf parent = (SWBuf)privatePath + "/" + is->uid + "/file"; + FileMgr::createParent(parent.c_str()); + is->localShadow = (SWBuf)privatePath + "/" + is->uid; + sourceBegin++; + } } defaultMods.clear(); @@ -270,19 +302,24 @@ int InstallMgr::removeModule(SWMgr *manager, const char *moduleName) { // TODO: rename to netCopy -int InstallMgr::ftpCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer, const char *suffix) { -SWLog::getSystemLog()->logDebug("netCopy: %s, %s, %s, %c, %s", (is?is->source.c_str():"null"), src, (dest?dest:"null"), (dirTransfer?'t':'f'), (suffix?suffix:"null")); +int InstallMgr::remoteCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer, const char *suffix) { +SWLog::getSystemLog()->logDebug("remoteCopy: %s, %s, %s, %c, %s", (is?is->source.c_str():"null"), src, (dest?dest:"null"), (dirTransfer?'t':'f'), (suffix?suffix:"null")); // assert user disclaimer has been confirmed if (!isUserDisclaimerConfirmed()) return -1; int retVal = 0; - FTPTransport *trans = 0; - if (is->type == "FTP") { + RemoteTransport *trans = 0; + if (is->type == "FTP" +#ifdef CURLSFTPAVAILABLE + || is->type == "SFTP" +#endif + ) { + trans = createFTPTransport(is->source, statusReporter); trans->setPassive(passive); } - else if (is->type == "HTTP") { + else if (is->type == "HTTP" || is->type == "HTTPS") { trans = createHTTPTransport(is->source, statusReporter); } transport = trans; // set classwide current transport for other thread terminate() call @@ -295,7 +332,22 @@ SWLog::getSystemLog()->logDebug("netCopy: %s, %s, %s, %c, %s", (is?is->source.c_ trans->setPasswd(p); } - SWBuf urlPrefix = (SWBuf)((is->type == "HTTP") ? "http://" : "ftp://") + is->source; + SWBuf urlPrefix; + if (is->type == "HTTP") { + urlPrefix = (SWBuf) "http://"; + } + else if (is->type == "HTTPS") { + urlPrefix = (SWBuf) "https://"; + } +#ifdef CURLSFTPAVAILABLE + else if (is->type == "SFTP") { + urlPrefix = (SWBuf) "sftp://"; + } +#endif + else { + urlPrefix = (SWBuf) "ftp://"; + } + urlPrefix.append(is->source); // let's be sure we can connect. This seems to be necessary but sucks // SWBuf url = urlPrefix + is->directory.c_str() + "/"; //dont forget the final slash @@ -329,7 +381,7 @@ SWLog::getSystemLog()->logDebug("netCopy: %s, %s, %s, %c, %s", (is?is->source.c_ } } SWTRY { - FTPTransport *deleteMe = trans; + RemoteTransport *deleteMe = trans; // do this order for threadsafeness // (see terminate()) trans = transport = 0; @@ -386,7 +438,7 @@ int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const ch if (is) { while (fileBegin != fileEnd) { // netCopy each file first buffer = sourceDir + fileBegin->second.c_str(); - if (ftpCopy(is, fileBegin->second.c_str(), buffer.c_str())) { + if (remoteCopy(is, fileBegin->second.c_str(), buffer.c_str())) { aborted = true; break; // user aborted } @@ -446,7 +498,7 @@ int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const ch SWLog::getSystemLog()->logDebug("***** relativePath: %s \n", relativePath.c_str()); if (is) { - if (ftpCopy(is, relativePath.c_str(), absolutePath.c_str(), true)) { + if (remoteCopy(is, relativePath.c_str(), absolutePath.c_str(), true)) { aborted = true; // user aborted } } @@ -498,6 +550,7 @@ int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const ch return 1; } + int InstallMgr::refreshRemoteSource(InstallSource *is) { // assert user disclaimer has been confirmed @@ -516,7 +569,7 @@ int InstallMgr::refreshRemoteSource(InstallSource *is) { #ifndef EXCLUDEZLIB SWBuf archive = root + "/mods.d.tar.gz"; - errorCode = ftpCopy(is, "mods.d.tar.gz", archive.c_str(), false); + errorCode = remoteCopy(is, "mods.d.tar.gz", archive.c_str(), false); if (!errorCode) { //sucessfully downloaded the tar,gz of module configs FileDesc *fd = FileMgr::getSystemFileMgr()->open(archive.c_str(), FileMgr::RDONLY); untargz(fd->getFd(), root.c_str()); @@ -524,7 +577,7 @@ int InstallMgr::refreshRemoteSource(InstallSource *is) { } else #endif - errorCode = ftpCopy(is, "mods.d", target.c_str(), true, ".conf"); //copy the whole directory + errorCode = remoteCopy(is, "mods.d", target.c_str(), true, ".conf"); //copy the whole directory is->flush(); return errorCode; @@ -535,6 +588,7 @@ bool InstallMgr::isDefaultModule(const char *modName) { return defaultMods.count(modName); } + /************************************************************************ * getModuleStatus - compare the modules of two SWMgrs and return a * vector describing the status of each. See MODSTAT_* @@ -603,7 +657,7 @@ int InstallMgr::refreshRemoteSourceConfiguration() { InstallSource is("FTP"); is.source = "ftp.crosswire.org"; is.directory = "/pub/sword"; - int errorCode = ftpCopy(&is, masterRepoList, masterRepoListPath.c_str(), false); + int errorCode = remoteCopy(&is, masterRepoList, masterRepoListPath.c_str(), false); if (!errorCode) { //sucessfully downloaded the repo list SWConfig masterList(masterRepoListPath); SectionMap::iterator sections = masterList.Sections.find("Repos"); diff --git a/src/mgr/localemgr.cpp b/src/mgr/localemgr.cpp index 628d271..90d4716 100644 --- a/src/mgr/localemgr.cpp +++ b/src/mgr/localemgr.cpp @@ -1,10 +1,11 @@ /****************************************************************************** - * localemgr.cpp - implementation of class LocaleMgr used to interact with - * registered locales for a sword installation * - * $Id: localemgr.cpp 2499 2010-01-02 04:51:05Z scribe $ + * localemgr.cpp - implementation of class LocaleMgr used to interact with + * registered locales for a SWORD installation * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: localemgr.cpp 3005 2014-01-09 04:06:11Z greg.hellings $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -39,8 +40,10 @@ SWORD_NAMESPACE_START + LocaleMgr *LocaleMgr::systemLocaleMgr = 0; + class __staticsystemLocaleMgr { public: __staticsystemLocaleMgr() { } @@ -261,12 +264,12 @@ void LocaleMgr::setDefaultLocaleName(const char *name) { stdstr(&defaultLocaleName, tmplang); // First check for what we ask for - if (!getLocale(tmplang)) { + if (locales->find(tmplang) == locales->end()) { // check for locale without country char *nocntry=0; stdstr(&nocntry, tmplang); strtok(nocntry, "_"); - if (getLocale(nocntry)) { + if (locales->find(nocntry) != locales->end()) { stdstr(&defaultLocaleName, nocntry); } delete [] nocntry; @@ -274,4 +277,6 @@ void LocaleMgr::setDefaultLocaleName(const char *name) { delete [] tmplang; } + SWORD_NAMESPACE_END + diff --git a/src/mgr/markupfiltmgr.cpp b/src/mgr/markupfiltmgr.cpp index 5dca845..fb12583 100644 --- a/src/mgr/markupfiltmgr.cpp +++ b/src/mgr/markupfiltmgr.cpp @@ -1,9 +1,12 @@ /****************************************************************************** - * swmarkupmgr.cpp - implementaion of class MarkupFilterMgr, subclass of - * used to transcode all module text to a requested - * markup. * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * markupfiltmgr.cpp - implementaion of class MarkupFilterMgr, subclass of + * used to transcode all module text to a requested + * markup + * + * $Id: markupfiltmgr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -27,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -43,13 +45,19 @@ #include #include #include +#include +#include +#include +#include #include #include + SWORD_NAMESPACE_START + /****************************************************************************** * MarkupFilterMgr Constructor - initializes instance of MarkupFilterMgr * @@ -58,12 +66,12 @@ SWORD_NAMESPACE_START * mark - Markup format to emit */ -MarkupFilterMgr::MarkupFilterMgr (char mark, char enc) - : EncodingFilterMgr(enc) { +MarkupFilterMgr::MarkupFilterMgr(char mark, char enc) + : EncodingFilterMgr(enc) { - markup = mark; + markup = mark; - CreateFilters(markup); + CreateFilters(markup); } @@ -72,18 +80,14 @@ MarkupFilterMgr::MarkupFilterMgr (char mark, char enc) */ MarkupFilterMgr::~MarkupFilterMgr() { - if (fromthml) - delete (fromthml); - if (fromgbf) - delete (fromgbf); - if (fromplain) - delete (fromplain); - if (fromosis) - delete (fromosis); - if (fromtei) - delete (fromtei); + delete fromthml; + delete fromgbf; + delete fromplain; + delete fromosis; + delete fromtei; } + /****************************************************************************** * MarkupFilterMgr::Markup - sets/gets markup * @@ -92,204 +96,224 @@ MarkupFilterMgr::~MarkupFilterMgr() { * RET: markup */ char MarkupFilterMgr::Markup(char mark) { - if (mark && mark != markup) { - markup = mark; - ModMap::const_iterator module; - - SWFilter * oldplain = fromplain; - SWFilter * oldthml = fromthml; - SWFilter * oldgbf = fromgbf; - SWFilter * oldosis = fromosis; - SWFilter * oldtei = fromtei; - - CreateFilters(markup); - - for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++) - switch (module->second->Markup()) { - case FMT_THML: - if (oldthml != fromthml) { - if (oldthml) { - if (!fromthml) { - module->second->RemoveRenderFilter(oldthml); - } - else { - module->second->ReplaceRenderFilter(oldthml, fromthml); - } - } - else if (fromthml) { - module->second->AddRenderFilter(fromthml); - } - } - break; - case FMT_GBF: - if (oldgbf != fromgbf) { - if (oldgbf) { - if (!fromgbf) { - module->second->RemoveRenderFilter(oldgbf); - } - else { - module->second->ReplaceRenderFilter(oldgbf, fromgbf); - } - } - else if (fromgbf) { - module->second->AddRenderFilter(fromgbf); - } - break; - } - case FMT_PLAIN: - if (oldplain != fromplain) { - if (oldplain) { - if (!fromplain) { - module->second->RemoveRenderFilter(oldplain); - } - else { - module->second->ReplaceRenderFilter(oldplain, fromplain); - } - } - else if (fromplain) { - module->second->AddRenderFilter(fromplain); - } - break; - } - case FMT_OSIS: - if (oldosis != fromosis) { - if (oldosis) { - if (!fromosis) { - module->second->RemoveRenderFilter(oldosis); - } - else { - module->second->ReplaceRenderFilter(oldosis, fromosis); - } - } - else if (fromosis) { - module->second->AddRenderFilter(fromosis); - } - break; - } - case FMT_TEI: - if (oldtei != fromtei) { - if (oldtei) { - if (!fromtei) { - module->second->RemoveRenderFilter(oldtei); - } - else { - module->second->ReplaceRenderFilter(oldtei, fromtei); - } - } - else if (fromtei) { - module->second->AddRenderFilter(fromtei); - } - break; - } - } - - if (oldthml) - delete oldthml; - if (oldgbf) - delete oldgbf; - if (oldplain) - delete oldplain; - if (oldosis) - delete oldosis; - if (oldtei) - delete oldtei; - } - return markup; + if (mark && mark != markup) { + markup = mark; + ModMap::const_iterator module; + + SWFilter *oldplain = fromplain; + SWFilter *oldthml = fromthml; + SWFilter *oldgbf = fromgbf; + SWFilter *oldosis = fromosis; + SWFilter *oldtei = fromtei; + + CreateFilters(markup); + + for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); ++module) { + switch (module->second->getMarkup()) { + case FMT_THML: + if (oldthml != fromthml) { + if (oldthml) { + if (!fromthml) { + module->second->removeRenderFilter(oldthml); + } + else { + module->second->replaceRenderFilter(oldthml, fromthml); + } + } + else if (fromthml) { + module->second->addRenderFilter(fromthml); + } + } + break; + + case FMT_GBF: + if (oldgbf != fromgbf) { + if (oldgbf) { + if (!fromgbf) { + module->second->removeRenderFilter(oldgbf); + } + else { + module->second->replaceRenderFilter(oldgbf, fromgbf); + } + } + else if (fromgbf) { + module->second->addRenderFilter(fromgbf); + } + } + break; + + case FMT_PLAIN: + if (oldplain != fromplain) { + if (oldplain) { + if (!fromplain) { + module->second->removeRenderFilter(oldplain); + } + else { + module->second->replaceRenderFilter(oldplain, fromplain); + } + } + else if (fromplain) { + module->second->addRenderFilter(fromplain); + } + } + break; + + case FMT_OSIS: + if (oldosis != fromosis) { + if (oldosis) { + if (!fromosis) { + module->second->removeRenderFilter(oldosis); + } + else { + module->second->replaceRenderFilter(oldosis, fromosis); + } + } + else if (fromosis) { + module->second->addRenderFilter(fromosis); + } + } + break; + + case FMT_TEI: + if (oldtei != fromtei) { + if (oldtei) { + if (!fromtei) { + module->second->removeRenderFilter(oldtei); + } + else { + module->second->replaceRenderFilter(oldtei, fromtei); + } + } + else if (fromtei) { + module->second->addRenderFilter(fromtei); + } + } + break; + } + } + + delete oldthml; + delete oldgbf; + delete oldplain; + delete oldosis; + delete oldtei; + } + return markup; } + void MarkupFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) { - switch (module->Markup()) { - case FMT_THML: - if (fromthml) - module->AddRenderFilter(fromthml); - break; - case FMT_GBF: - if (fromgbf) - module->AddRenderFilter(fromgbf); - break; - case FMT_PLAIN: - if (fromplain) - module->AddRenderFilter(fromplain); - break; - case FMT_OSIS: - if (fromosis) - module->AddRenderFilter(fromosis); - break; - case FMT_TEI: - if (fromtei) - module->AddRenderFilter(fromtei); - break; - } + switch (module->getMarkup()) { + case FMT_THML: + if (fromthml) + module->addRenderFilter(fromthml); + break; + case FMT_GBF: + if (fromgbf) + module->addRenderFilter(fromgbf); + break; + case FMT_PLAIN: + if (fromplain) + module->addRenderFilter(fromplain); + break; + case FMT_OSIS: + if (fromosis) + module->addRenderFilter(fromosis); + break; + case FMT_TEI: + if (fromtei) + module->addRenderFilter(fromtei); + break; + } } + void MarkupFilterMgr::CreateFilters(char markup) { - switch (markup) { - case FMT_PLAIN: - fromplain = NULL; - fromthml = new ThMLPlain(); - fromgbf = new GBFPlain(); - fromosis = new OSISPlain(); - fromtei = new TEIPlain(); - break; - case FMT_THML: - fromplain = NULL; - fromthml = NULL; - fromgbf = new GBFThML(); - fromosis = NULL; - fromtei = NULL; - break; - case FMT_GBF: - fromplain = NULL; - fromthml = new ThMLGBF(); - fromgbf = NULL; - fromosis = NULL; - fromtei = NULL; - break; - case FMT_HTML: - fromplain = new PLAINHTML(); - fromthml = new ThMLHTML(); - fromgbf = new GBFHTML(); - fromosis = NULL; - fromtei = NULL; - break; - case FMT_HTMLHREF: - fromplain = new PLAINHTML(); - fromthml = new ThMLHTMLHREF(); - fromgbf = new GBFHTMLHREF(); - fromosis = new OSISHTMLHREF(); - fromtei = new TEIHTMLHREF(); - break; - case FMT_RTF: - fromplain = NULL; - fromthml = new ThMLRTF(); - fromgbf = new GBFRTF(); - fromosis = new OSISRTF(); - fromtei = new TEIRTF(); - break; - case FMT_OSIS: - fromplain = NULL; - fromthml = new ThMLOSIS(); - fromgbf = new GBFOSIS(); - fromosis = new OSISOSIS(); - fromtei = NULL; - break; - case FMT_WEBIF: - fromplain = NULL; - fromthml = new ThMLWEBIF(); - fromgbf = new GBFWEBIF(); - fromosis = new OSISWEBIF(); - fromtei = NULL; - break; - case FMT_TEI: - fromplain = NULL; - fromthml = NULL; - fromgbf = NULL; - fromosis = NULL; - fromtei = NULL; - break; - } + switch (markup) { + case FMT_PLAIN: + fromplain = NULL; + fromthml = new ThMLPlain(); + fromgbf = new GBFPlain(); + fromosis = new OSISPlain(); + fromtei = new TEIPlain(); + break; + + case FMT_THML: + fromplain = NULL; + fromthml = NULL; + fromgbf = new GBFThML(); + fromosis = NULL; + fromtei = NULL; + break; + + case FMT_GBF: + fromplain = NULL; + fromthml = new ThMLGBF(); + fromgbf = NULL; + fromosis = NULL; + fromtei = NULL; + break; + + case FMT_HTML: + fromplain = NULL; + fromthml = new ThMLHTML(); + fromgbf = new GBFHTML(); + fromosis = NULL; + fromtei = NULL; + break; + + case FMT_HTMLHREF: + fromplain = NULL; + fromthml = new ThMLHTMLHREF(); + fromgbf = new GBFHTMLHREF(); + fromosis = new OSISHTMLHREF(); + fromtei = new TEIHTMLHREF(); + break; + + case FMT_RTF: + fromplain = NULL; + fromthml = new ThMLRTF(); + fromgbf = new GBFRTF(); + fromosis = new OSISRTF(); + fromtei = new TEIRTF(); + break; + + case FMT_OSIS: + fromplain = NULL; + fromthml = new ThMLOSIS(); + fromgbf = new GBFOSIS(); + fromosis = new OSISOSIS(); + fromtei = NULL; + break; + + case FMT_WEBIF: + fromplain = NULL; + fromthml = new ThMLWEBIF(); + fromgbf = new GBFWEBIF(); + fromosis = new OSISWEBIF(); + fromtei = NULL; + break; + + case FMT_TEI: + fromplain = NULL; + fromthml = NULL; + fromgbf = NULL; + fromosis = NULL; + fromtei = NULL; + break; + + case FMT_XHTML: + fromplain = NULL; + fromthml = new ThMLXHTML(); + fromgbf = new GBFXHTML(); + fromosis = new OSISXHTML(); + fromtei = new TEIXHTML(); + break; + } } + SWORD_NAMESPACE_END + diff --git a/src/mgr/remotetrans.cpp b/src/mgr/remotetrans.cpp new file mode 100644 index 0000000..03ad3e4 --- /dev/null +++ b/src/mgr/remotetrans.cpp @@ -0,0 +1,204 @@ +/***************************************************************************** + * + * remotetrans.cpp - + * + * $Id: remotetrans.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include + +#include +#include +#include + + +extern "C" { +#include +} + + +using std::vector; + + +SWORD_NAMESPACE_START + + +namespace { + + void removeTrailingSlash(SWBuf &buf) { + int len = buf.size(); + if ((buf[len-1] == '/') + || (buf[len-1] == '\\')) + buf.size(len-1); + } + +}; + + +void StatusReporter::preStatus(long totalBytes, long completedBytes, const char *message) { +} + + +void StatusReporter::statusUpdate(double dtTotal, double dlNow) { +} + + +RemoteTransport::RemoteTransport(const char *host, StatusReporter *statusReporter) { + this->statusReporter = statusReporter; + this->host = host; + u = "ftp"; + p = "installmgr@user.com"; + term = false; +} + + +RemoteTransport::~RemoteTransport() { +} + + +// override this method in your real transport class +char RemoteTransport::getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf) { + char retVal = 0; + return retVal; +} + + +vector RemoteTransport::getDirList(const char *dirURL) { + + vector dirList; + + SWBuf dirBuf; + if (!getURL("", dirURL, &dirBuf)) { + char *start = dirBuf.getRawData(); + char *end = start; + while (start < (dirBuf.getRawData()+dirBuf.size())) { + struct ftpparse item; + bool looking = true; + for (end = start; *end; end++) { + if (looking) { + if ((*end == 10) || (*end == 13)) { + *end = 0; + looking = false; + } + } + else if ((*end != 10) && (*end != 13)) + break; + } + SWLog::getSystemLog()->logWarning("getDirList: parsing item %s(%d)\n", start, end-start); + int status = ftpparse(&item, start, end - start); + // in ftpparse.h, there is a warning that name is not necessarily null terminated + SWBuf name; + name.append(item.name, item.namelen); + SWLog::getSystemLog()->logWarning("getDirList: got item %s\n", name.c_str()); + if (status && name != "." && name != "..") { + struct DirEntry i; + i.name = name; + i.size = item.size; + i.isDirectory = (item.flagtrycwd == 1); + dirList.push_back(i); + } + start = end; + } + } + else { + SWLog::getSystemLog()->logWarning("getDirList: failed to get dir %s\n", dirURL); + } + return dirList; +} + + +int RemoteTransport::copyDirectory(const char *urlPrefix, const char *dir, const char *dest, const char *suffix) { + unsigned int i; + int retVal = 0; + + SWBuf url = SWBuf(urlPrefix) + SWBuf(dir); + removeTrailingSlash(url); + url += '/'; + + SWLog::getSystemLog()->logWarning("NetTransport: getting dir %s\n", url.c_str()); + vector dirList = getDirList(url.c_str()); + + if (!dirList.size()) { + SWLog::getSystemLog()->logWarning("NetTransport: failed to read dir %s\n", url.c_str()); + return -1; + } + + long totalBytes = 0; + for (i = 0; i < dirList.size(); i++) + totalBytes += dirList[i].size; + long completedBytes = 0; + for (i = 0; i < dirList.size(); i++) { + struct DirEntry &dirEntry = dirList[i]; + SWBuf buffer = (SWBuf)dest; + removeTrailingSlash(buffer); + buffer += "/"; + buffer += dirEntry.name; + if (!strcmp(&buffer.c_str()[buffer.length()-strlen(suffix)], suffix)) { + SWBuf buffer2 = "Downloading ("; + buffer2.appendFormatted("%d", i+1); + buffer2 += " of "; + buffer2.appendFormatted("%d", dirList.size()); + buffer2 += "): "; + buffer2 += dirEntry.name; + if (statusReporter) + statusReporter->preStatus(totalBytes, completedBytes, buffer2.c_str()); + FileMgr::createParent(buffer.c_str()); // make sure parent directory exists + SWTRY { + SWBuf url = (SWBuf)urlPrefix + (SWBuf)dir; + removeTrailingSlash(url); + url += "/"; + url += dirEntry.name; //dont forget the final slash + if (!dirEntry.isDirectory) { + if (getURL(buffer.c_str(), url.c_str())) { + SWLog::getSystemLog()->logWarning("copyDirectory: failed to get file %s\n", url.c_str()); + return -2; + } + completedBytes += dirEntry.size; + } + else { + SWBuf subdir = (SWBuf)dir; + removeTrailingSlash(subdir); + subdir += (SWBuf)"/" + dirEntry.name; + if (copyDirectory(urlPrefix, subdir, buffer.c_str(), suffix)) { + SWLog::getSystemLog()->logWarning("copyDirectory: failed to get file %s\n", subdir.c_str()); + return -2; + } + } + } + SWCATCH (...) {} + if (term) { + retVal = -3; + break; + } + } + } + return retVal; +} + + +#if defined(__GNUC__) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif +void StatusReporter::update(unsigned long totalBytes, unsigned long completedBytes) { + statusUpdate(totalBytes, completedBytes); +} + + +SWORD_NAMESPACE_END + diff --git a/src/mgr/stringmgr.cpp b/src/mgr/stringmgr.cpp index c4a994e..0390905 100644 --- a/src/mgr/stringmgr.cpp +++ b/src/mgr/stringmgr.cpp @@ -1,9 +1,10 @@ /****************************************************************************** - * stringmgr.cpp - implementation of class StringMgr * - * $Id: stringmgr.cpp 2115 2007-10-16 18:29:00Z scribe $ + * stringmgr.cpp - implementation of class StringMgr * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: stringmgr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -38,8 +39,10 @@ #endif + SWORD_NAMESPACE_START + StringMgr *StringMgr::systemStringMgr = 0; class __staticsystemStringMgr { @@ -48,70 +51,74 @@ public: ~__staticsystemStringMgr() { if (StringMgr::systemStringMgr) delete StringMgr::systemStringMgr; StringMgr::systemStringMgr = 0; } } _staticsystemStringMgr; -/** - * Determine whether the string contains a valid unicode sequence. The following table give the pattern of a valid UTF-8 character. - * Unicode Range 1st 2nd 3rd 4th 5th 6th - * U-00000000 - U-0000007F 0nnnnnnn - * U-00000080 - U-000007FF 110nnnnn 10nnnnnn - * U-00000800 - U-0000FFFF 1110nnnn 10nnnnnn 10nnnnnn - * U-00010000 - U-001FFFFF 11110nnn 10nnnnnn 10nnnnnn 10nnnnnn - * U-00200000 - U-03FFFFFF 111110nn 10nnnnnn 10nnnnnn 10nnnnnn 10nnnnnn - * U-04000000 - U-7FFFFFFF 1111110n 10nnnnnn 10nnnnnn 10nnnnnn 10nnnnnn 10nnnnnn - * Note: - * The latest UTF-8 RFC allows for a max of 4 bytes. Earlier allowed 6. - * The number of bits of the leading byte before the first 0 is the total number of bytes - * The "n" are the bits of the unicode codepoint. - * - * This routine does not check to see if the code point is in the range. It could. - * - * @param txt the text to check - * @return 1 if all high order characters form a valid unicode sequence - * -1 if there are no high order characters - * 0 if there are high order characters that do not form a valid unicode sequence - * @author DM Smith [dmsmith555 at yahoo dot com] - */ -int isValidUTF8(unsigned char *txt) { - unsigned int countUTF8 = 0; -#if 0 - unsigned char parts = 0; - - - unsigned char *p = txt; - while (*p) { - // Is the high order bit set? - if (*p & 0x80) { - // then count the number of high order bits that are set - // this determines the number of following bytes need to have high order bits set - unsigned char i = *p; - for (parts = 0; i & 0x80; parts++) { - i <<= 1; - } - - // The pattern 10nnnnnn is not a unicode character - if (parts == 1) { - return 0; - } - else { - while (--parts && ++*p) { - // The pattern of each following character must be: 10nnnnnn - if (0xc0 & *p != 0x80) { - return 0; - } +namespace { + + /** + * Determine whether the string contains a valid unicode sequence. The following table give the pattern of a valid UTF-8 character. + * Unicode Range 1st 2nd 3rd 4th 5th 6th + * U-00000000 - U-0000007F 0nnnnnnn + * U-00000080 - U-000007FF 110nnnnn 10nnnnnn + * U-00000800 - U-0000FFFF 1110nnnn 10nnnnnn 10nnnnnn + * U-00010000 - U-001FFFFF 11110nnn 10nnnnnn 10nnnnnn 10nnnnnn + * U-00200000 - U-03FFFFFF 111110nn 10nnnnnn 10nnnnnn 10nnnnnn 10nnnnnn + * U-04000000 - U-7FFFFFFF 1111110n 10nnnnnn 10nnnnnn 10nnnnnn 10nnnnnn 10nnnnnn + * Note: + * The latest UTF-8 RFC allows for a max of 4 bytes. Earlier allowed 6. + * The number of bits of the leading byte before the first 0 is the total number of bytes + * The "n" are the bits of the unicode codepoint. + * + * This routine does not check to see if the code point is in the range. It could. + * + * @param txt the text to check + * @return 1 if all high order characters form a valid unicode sequence + * -1 if there are no high order characters + * 0 if there are high order characters that do not form a valid unicode sequence + * @author DM Smith [dmsmith555 at yahoo dot com] + */ + int isValidUTF8(unsigned char *txt) { + unsigned int countUTF8 = 0; + #if 0 + unsigned char parts = 0; + + + unsigned char *p = txt; + while (*p) { + // Is the high order bit set? + if (*p & 0x80) { + // then count the number of high order bits that are set + // this determines the number of following bytes need to have high order bits set + unsigned char i = *p; + for (parts = 0; i & 0x80; parts++) { + i <<= 1; } - // Oops, we've run out of bytes too soon: Cannot be UTF-8 - if (parts) { + + // The pattern 10nnnnnn is not a unicode character + if (parts == 1) { return 0; } + else { + while (--parts && ++*p) { + // The pattern of each following character must be: 10nnnnnn + if (0xc0 & *p != 0x80) { + return 0; + } + } + + // Oops, we've run out of bytes too soon: Cannot be UTF-8 + if (parts) { + return 0; + } + } + countUTF8++; } - countUTF8++; } - } - // At this point it is either UTF-8 or ascii -#endif - return countUTF8 ? 1 : -1; + // At this point it is either UTF-8 or ascii + #endif + return countUTF8 ? 1 : -1; + } } diff --git a/src/mgr/swcacher.cpp b/src/mgr/swcacher.cpp index 57d0817..e12bdcb 100644 --- a/src/mgr/swcacher.cpp +++ b/src/mgr/swcacher.cpp @@ -1,10 +1,12 @@ /****************************************************************************** - * swcacher.h - definition of class SWCacher used to provide an interface for - * objects that cache and want a standard interface for cleaning up. * - * $Id: swcacher.cpp 1688 2005-01-01 04:42:26Z scribe $ + * swcacher.cpp - definition of class SWCacher used to provide an + * interface for objects that cache and want a standard + * interface for cleaning up * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swcacher.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -22,6 +24,7 @@ #include + SWORD_NAMESPACE_START @@ -44,4 +47,6 @@ long SWCacher::lastAccess() { return 0; } + SWORD_NAMESPACE_END + diff --git a/src/mgr/swconfig.cpp b/src/mgr/swconfig.cpp index 309f686..748071c 100644 --- a/src/mgr/swconfig.cpp +++ b/src/mgr/swconfig.cpp @@ -1,10 +1,11 @@ /****************************************************************************** - * swconfig.cpp - implementation of Class SWConfig used for saving and - * retrieval of configuration information * - * $Id: swconfig.cpp 2218 2008-12-23 09:33:38Z scribe $ + * swconfig.cpp - used for saving and retrieval of configuration + * information * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swconfig.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,9 +29,11 @@ SWORD_NAMESPACE_START + SWConfig::SWConfig() { } + SWConfig::SWConfig(const char * ifilename) { filename = ifilename; Load(); @@ -40,6 +43,7 @@ SWConfig::SWConfig(const char * ifilename) { SWConfig::~SWConfig() { } + void SWConfig::Load() { if (!filename.size()) return; // assert we have a filename @@ -164,4 +168,6 @@ ConfigEntMap & SWConfig::operator [] (const char *section) { return Sections[section]; } + SWORD_NAMESPACE_END + diff --git a/src/mgr/swfiltermgr.cpp b/src/mgr/swfiltermgr.cpp index 434f2e0..5240014 100644 --- a/src/mgr/swfiltermgr.cpp +++ b/src/mgr/swfiltermgr.cpp @@ -1,10 +1,11 @@ /****************************************************************************** - * swfiltermgr.cpp - definition of class SWFilterMgr used as an interface to - * manage filters on a module * - * $Id: swfiltermgr.cpp 1688 2005-01-01 04:42:26Z scribe $ + * swfiltermgr.cpp - Implementation of SWFilterMgr, used as an interface + * to manage filters on a module * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swfiltermgr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -22,6 +23,7 @@ #include + SWORD_NAMESPACE_START @@ -90,4 +92,6 @@ void SWFilterMgr::AddStripFilters(SWModule * module, ConfigEntMap & section) { void SWFilterMgr::AddRawFilters(SWModule * module, ConfigEntMap & section) { } + SWORD_NAMESPACE_END + diff --git a/src/mgr/swlocale.cpp b/src/mgr/swlocale.cpp index fff35d5..a007238 100644 --- a/src/mgr/swlocale.cpp +++ b/src/mgr/swlocale.cpp @@ -1,10 +1,11 @@ /****************************************************************************** - * swlocale.cpp - implementation of Class SWLocale used for retrieval - * of locale lookups * - * $Id: swlocale.cpp 2463 2009-10-14 22:14:55Z chrislit $ + * swlocale.cpp - implementation of Class SWLocale used for retrieval + * of locale lookups * - * Copyright 2000 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swlocale.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,15 +26,21 @@ #include #include #include -#include +#include + SWORD_NAMESPACE_START -typedef std::map < SWBuf, SWBuf, std::less < SWBuf > >LookupMap; + +namespace { + typedef std::map < SWBuf, SWBuf, std::less < SWBuf > >LookupMap; +} + const char *SWLocale::DEFAULT_LOCALE_NAME="en"; -// I have bridge patterns, but this hides swconfig and map from lots o stuff + +// I hate bridge patterns, but this hides swconfig and map from lots o stuff class SWLocale::Private { public: LookupMap lookupTable; @@ -144,10 +151,12 @@ const char *SWLocale::getDescription() { return description; } + const char *SWLocale::getEncoding() { return encoding; } + void SWLocale::augment(SWLocale &addFrom) { *localeSource += *addFrom.localeSource; } @@ -184,3 +193,4 @@ const struct abbrev *SWLocale::getBookAbbrevs(int *retSize) { SWORD_NAMESPACE_END + diff --git a/src/mgr/swmgr.cpp b/src/mgr/swmgr.cpp index 3ee253f..0a2d583 100644 --- a/src/mgr/swmgr.cpp +++ b/src/mgr/swmgr.cpp @@ -1,10 +1,10 @@ /****************************************************************************** - * swmgr.cpp - implementaion of class SWMgr used to interact with an install - * base of sword modules. * - * $Id: swmgr.cpp 2374 2009-05-04 03:48:01Z scribe $ + * swmgr.cpp - used to interact with an install base of sword modules * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swmgr.cpp 2985 2013-10-04 14:38:14Z scribe $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -51,6 +51,8 @@ #include #include #include +#include +#include #include #include #include @@ -58,8 +60,10 @@ #include #include #include -#include #include +#include +#include +#include #include #include #include @@ -81,6 +85,7 @@ #include #include #include +#include #include @@ -88,6 +93,8 @@ #ifndef EXCLUDEZLIB #include "zipcomprs.h" +#include "bz2comprs.h" +#include "xzcomprs.h" #endif @@ -95,8 +102,10 @@ #include #endif + SWORD_NAMESPACE_START + #ifdef _ICU_ bool SWMgr::isICU = true; #else @@ -110,6 +119,14 @@ const char *SWMgr::globalConfPath = GLOBCONFPATH; const char *SWMgr::globalConfPath = "/etc/sword.conf:/usr/local/etc/sword.conf"; #endif + +const char *SWMgr::MODTYPE_BIBLES = "Biblical Texts"; +const char *SWMgr::MODTYPE_COMMENTARIES = "Commentaries"; +const char *SWMgr::MODTYPE_LEXDICTS = "Lexicons / Dictionaries"; +const char *SWMgr::MODTYPE_GENBOOKS = "Generic Books"; +const char *SWMgr::MODTYPE_DAILYDEVOS = "Daily Devotional"; + + void SWMgr::init() { SWOptionFilter *tmpFilter = 0; configPath = 0; @@ -123,6 +140,7 @@ void SWMgr::init() { cipherFilters.clear(); optionFilters.clear(); cleanupFilters.clear(); + extraFilters.clear(); tmpFilter = new ThMLVariants(); optionFilters.insert(OptionFilterMap::value_type("ThMLVariants", tmpFilter)); cleanupFilters.push_back(tmpFilter); @@ -179,10 +197,23 @@ void SWMgr::init() { optionFilters.insert(OptionFilterMap::value_type("OSISMorphSegmentation", tmpFilter)); cleanupFilters.push_back(tmpFilter); - tmpFilter = new OSISRuby(); + tmpFilter = new OSISGlosses(); + optionFilters.insert(OptionFilterMap::value_type("OSISGlosses", tmpFilter)); optionFilters.insert(OptionFilterMap::value_type("OSISRuby", tmpFilter)); cleanupFilters.push_back(tmpFilter); + tmpFilter = new OSISXlit(); + optionFilters.insert(OptionFilterMap::value_type("OSISXlit", tmpFilter)); + cleanupFilters.push_back(tmpFilter); + + tmpFilter = new OSISEnum(); + optionFilters.insert(OptionFilterMap::value_type("OSISEnum", tmpFilter)); + cleanupFilters.push_back(tmpFilter); + + tmpFilter = new OSISVariants(); + optionFilters.insert(OptionFilterMap::value_type("OSISVariants", tmpFilter)); + cleanupFilters.push_back(tmpFilter); + tmpFilter = new ThMLStrongs(); optionFilters.insert(OptionFilterMap::value_type("ThMLStrongs", tmpFilter)); cleanupFilters.push_back(tmpFilter); @@ -241,15 +272,25 @@ void SWMgr::init() { gbfplain = new GBFPlain(); cleanupFilters.push_back(gbfplain); + extraFilters.insert(FilterMap::value_type("GBFPlain", gbfplain)); thmlplain = new ThMLPlain(); cleanupFilters.push_back(thmlplain); + extraFilters.insert(FilterMap::value_type("ThMLPlain", thmlplain)); osisplain = new OSISPlain(); cleanupFilters.push_back(osisplain); + extraFilters.insert(FilterMap::value_type("OSISPlain", osisplain)); teiplain = new TEIPlain(); cleanupFilters.push_back(teiplain); + extraFilters.insert(FilterMap::value_type("TEIPlain", teiplain)); + + // filters which aren't really used anywhere but which we want available for a "FilterName" -> filter mapping (e.g., filterText) + SWFilter *f = new RTFHTML(); + extraFilters.insert(FilterMap::value_type("RTFHTML", f)); + cleanupFilters.push_back(f); + } @@ -715,7 +756,7 @@ void SWMgr::augmentModules(const char *ipath, bool multiMod) { // fix config's Section names to rename modules which are available more than once // find out which sections are in both config objects // inserting all configs first is not good because that overwrites old keys and new modules would share the same config - for (SectionMap::iterator it = config->Sections.begin(); it != config->Sections.end(); ++it) { + for (SectionMap::iterator it = config->Sections.begin(); it != config->Sections.end();) { if (saveConfig->Sections.find( (*it).first ) != saveConfig->Sections.end()) { //if the new section is already present rename it ConfigEntMap entMap((*it).second); @@ -727,8 +768,10 @@ void SWMgr::augmentModules(const char *ipath, bool multiMod) { } while (config->Sections.find(name) != config->Sections.end()); config->Sections.insert(SectionMap::value_type(name, entMap) ); - config->Sections.erase(it); + SectionMap::iterator toErase = it++; + config->Sections.erase(toErase); } + else ++it; } } @@ -819,7 +862,8 @@ signed char SWMgr::Load() { return ret; } -SWModule *SWMgr::CreateMod(const char *name, const char *driver, ConfigEntMap §ion) + +SWModule *SWMgr::createModule(const char *name, const char *driver, ConfigEntMap §ion) { SWBuf description, datapath, misc1; ConfigEntMap::iterator entry; @@ -868,7 +912,9 @@ SWModule *SWMgr::CreateMod(const char *name, const char *driver, ConfigEntMap &s else markup = FMT_GBF; - if (!stricmp(encoding.c_str(), "UTF-8")) { + if (!stricmp(encoding.c_str(), "SCSU")) + enc = ENC_SCSU; + else if (!stricmp(encoding.c_str(), "UTF-8")) { enc = ENC_UTF8; } else enc = ENC_LATIN1; @@ -889,7 +935,6 @@ SWModule *SWMgr::CreateMod(const char *name, const char *driver, ConfigEntMap &s if ((!stricmp(driver, "zText")) || (!stricmp(driver, "zCom"))) { SWCompress *compress = 0; int blockType = CHAPTERBLOCKS; - int blockNum = 1; misc1 = ((entry = section.find("BlockType")) != section.end()) ? (*entry).second : (SWBuf)"CHAPTER"; if (!stricmp(misc1.c_str(), "VERSE")) blockType = VERSEBLOCKS; @@ -898,14 +943,17 @@ SWModule *SWMgr::CreateMod(const char *name, const char *driver, ConfigEntMap &s else if (!stricmp(misc1.c_str(), "BOOK")) blockType = BOOKBLOCKS; - misc1 = ((entry = section.find("BlockNumber")) != section.end()) ? (*entry).second : (SWBuf)"1"; - blockNum = atoi(misc1.c_str()); - misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (SWBuf)"LZSS"; #ifndef EXCLUDEZLIB if (!stricmp(misc1.c_str(), "ZIP")) compress = new ZipCompress(); else + if (!stricmp(misc1.c_str(), "BZIP2_UNSUPPORTED")) + compress = new Bzip2Compress(); + else + if (!stricmp(misc1.c_str(), "XZ_UNSUPPORTED")) + compress = new XzCompress(); + else #endif if (!stricmp(misc1.c_str(), "LZSS")) compress = new LZSSCompress(); @@ -949,18 +997,24 @@ SWModule *SWMgr::CreateMod(const char *name, const char *driver, ConfigEntMap &s int pos = 0; //used for position of final / in AbsoluteDataPath, but also set to 1 for modules types that need to strip module name if (!stricmp(driver, "RawLD")) { - newmod = new RawLD(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str()); + bool caseSensitive = ((entry = section.find("CaseSensitiveKeys")) != section.end()) ? (*entry).second == "true": false; + bool strongsPadding = ((entry = section.find("StrongsPadding")) != section.end()) ? (*entry).second == "true": true; + newmod = new RawLD(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str(), caseSensitive, strongsPadding); pos = 1; } if (!stricmp(driver, "RawLD4")) { - newmod = new RawLD4(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str()); + bool caseSensitive = ((entry = section.find("CaseSensitiveKeys")) != section.end()) ? (*entry).second == "true": false; + bool strongsPadding = ((entry = section.find("StrongsPadding")) != section.end()) ? (*entry).second == "true": true; + newmod = new RawLD4(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str(), caseSensitive, strongsPadding); pos = 1; } if (!stricmp(driver, "zLD")) { SWCompress *compress = 0; int blockCount; + bool caseSensitive = ((entry = section.find("CaseSensitiveKeys")) != section.end()) ? (*entry).second == "true": false; + bool strongsPadding = ((entry = section.find("StrongsPadding")) != section.end()) ? (*entry).second == "true": true; misc1 = ((entry = section.find("BlockCount")) != section.end()) ? (*entry).second : (SWBuf)"200"; blockCount = atoi(misc1.c_str()); blockCount = (blockCount) ? blockCount : 200; @@ -975,7 +1029,7 @@ SWModule *SWMgr::CreateMod(const char *name, const char *driver, ConfigEntMap &s compress = new LZSSCompress(); if (compress) { - newmod = new zLD(datapath.c_str(), name, description.c_str(), blockCount, compress, 0, enc, direction, markup, lang.c_str()); + newmod = new zLD(datapath.c_str(), name, description.c_str(), blockCount, compress, 0, enc, direction, markup, lang.c_str(), caseSensitive, strongsPadding); } pos = 1; } @@ -1008,7 +1062,7 @@ SWModule *SWMgr::CreateMod(const char *name, const char *driver, ConfigEntMap &s if (newmod) { // if a specific module type is set in the config, use this if ((entry = section.find("Type")) != section.end()) - newmod->Type(entry->second.c_str()); + newmod->setType(entry->second.c_str()); newmod->setConfig(§ion); } @@ -1018,11 +1072,37 @@ SWModule *SWMgr::CreateMod(const char *name, const char *driver, ConfigEntMap &s void SWMgr::AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start, ConfigEntMap::iterator end) { - for (;start != end; start++) { + + for (;start != end; ++start) { OptionFilterMap::iterator it; - it = optionFilters.find((*start).second); + SWBuf filterName = start->second; + + + // special cases for filters with parameters + + if (filterName.startsWith("OSISReferenceLinks")) { + SWBuf params = filterName; + filterName = params.stripPrefix('|', true); + SWBuf optionName = params.stripPrefix('|', true); + SWBuf optionTip = params.stripPrefix('|', true); + SWBuf optionType = params.stripPrefix('|', true); + SWBuf optionSubType = params.stripPrefix('|', true); + SWBuf optionDefaultValue = params.stripPrefix('|', true); + // we'll key off of type and subtype. + filterName = filterName + "." + optionType + "." + optionSubType; + + it = optionFilters.find(filterName); + if (it == optionFilters.end()) { + SWOptionFilter *tmpFilter = new OSISReferenceLinks(optionName, optionTip, optionType, optionSubType, optionDefaultValue); + optionFilters.insert(OptionFilterMap::value_type(filterName, tmpFilter)); + cleanupFilters.push_back(tmpFilter); + } + } + + + it = optionFilters.find(filterName); if (it != optionFilters.end()) { - module->AddOptionFilter((*it).second); // add filter to module and option as a valid option + module->addOptionFilter((*it).second); // add filter to module and option as a valid option StringList::iterator loop; for (loop = options.begin(); loop != options.end(); loop++) { if (!strcmp((*loop).c_str(), (*it).second->getOptionName())) @@ -1035,20 +1115,31 @@ void SWMgr::AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntM if (filterMgr) filterMgr->AddGlobalOptions(module, section, start, end); #ifdef _ICU_ - module->AddOptionFilter(transliterator); + module->addOptionFilter(transliterator); #endif } char SWMgr::filterText(const char *filterName, SWBuf &text, const SWKey *key, const SWModule *module) - { +{ char retVal = -1; + // why didn't we use find here? for (OptionFilterMap::iterator it = optionFilters.begin(); it != optionFilters.end(); it++) { if ((*it).second->getOptionName()) { - if (!stricmp(filterName, (*it).second->getOptionName())) - retVal = it->second->processText(text, key, module); // add filter to module + if (!stricmp(filterName, (*it).second->getOptionName())) { + retVal = it->second->processText(text, key, module); + break; + } + } + } + + if (retVal == -1) { + FilterMap::iterator it = extraFilters.find(filterName); + if (it != extraFilters.end()) { + retVal = it->second->processText(text, key, module); } } + return retVal; } @@ -1059,7 +1150,7 @@ void SWMgr::AddLocalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMa OptionFilterMap::iterator it; it = optionFilters.find((*start).second); if (it != optionFilters.end()) { - module->AddOptionFilter((*it).second); // add filter to module + module->addOptionFilter((*it).second); // add filter to module } } @@ -1075,7 +1166,7 @@ void SWMgr::AddStripFilters(SWModule *module, ConfigEntMap §ion, ConfigEntMa OptionFilterMap::iterator it; it = optionFilters.find((*start).second); if (it != optionFilters.end()) { - module->AddStripFilter((*it).second); // add filter to module + module->addStripFilter((*it).second); // add filter to module } } } @@ -1088,9 +1179,9 @@ void SWMgr::AddRawFilters(SWModule *module, ConfigEntMap §ion) { cipherKey = ((entry = section.find("CipherKey")) != section.end()) ? (*entry).second : (SWBuf)""; if (cipherKey.length()) { SWFilter *cipherFilter = new CipherFilter(cipherKey.c_str()); - cipherFilters.insert(FilterMap::value_type(module->Name(), cipherFilter)); + cipherFilters.insert(FilterMap::value_type(module->getName(), cipherFilter)); cleanupFilters.push_back(cipherFilter); - module->AddRawFilter(cipherFilter); + module->addRawFilter(cipherFilter); } if (filterMgr) @@ -1145,16 +1236,16 @@ void SWMgr::AddStripFilters(SWModule *module, ConfigEntMap §ion) } if (!stricmp(sourceformat.c_str(), "GBF")) { - module->AddStripFilter(gbfplain); + module->addStripFilter(gbfplain); } else if (!stricmp(sourceformat.c_str(), "ThML")) { - module->AddStripFilter(thmlplain); + module->addStripFilter(thmlplain); } else if (!stricmp(sourceformat.c_str(), "OSIS")) { - module->AddStripFilter(osisplain); + module->addStripFilter(osisplain); } else if (!stricmp(sourceformat.c_str(), "TEI")) { - module->AddStripFilter(teiplain); + module->addStripFilter(teiplain); } if (filterMgr) @@ -1176,19 +1267,19 @@ void SWMgr::CreateMods(bool multiMod) { driver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (SWBuf)""; if (driver.length()) { - newmod = CreateMod((*it).first, driver, section); + newmod = createModule((*it).first, driver, section); if (newmod) { // Filters to add for this module and globally announce as an option to the user // e.g. translit, strongs, redletterwords, etc, so users can turn these on and off globally - start = (*it).second.lower_bound("GlobalOptionFilter"); - end = (*it).second.upper_bound("GlobalOptionFilter"); + start = section.lower_bound("GlobalOptionFilter"); + end = section.upper_bound("GlobalOptionFilter"); AddGlobalOptions(newmod, section, start, end); // Only add the option to the module, don't announce it's availability // These are useful for like: filters that parse special entryAttribs in a text // or whatever you might want to happen on entry lookup - start = (*it).second.lower_bound("LocalOptionFilter"); - end = (*it).second.upper_bound("LocalOptionFilter"); + start = section.lower_bound("LocalOptionFilter"); + end = section.upper_bound("LocalOptionFilter"); AddLocalOptions(newmod, section, start, end); //STRIP FILTERS @@ -1198,20 +1289,20 @@ void SWMgr::CreateMods(bool multiMod) { // Any special processing for this module when searching: // e.g. for papyri, removed all [](). notation - start = (*it).second.lower_bound("LocalStripFilter"); - end = (*it).second.upper_bound("LocalStripFilter"); + start = section.lower_bound("LocalStripFilter"); + end = section.upper_bound("LocalStripFilter"); AddStripFilters(newmod, section, start, end); AddRawFilters(newmod, section); AddRenderFilters(newmod, section); AddEncodingFilters(newmod, section); - SWModule *oldmod = Modules[newmod->Name()]; + SWModule *oldmod = Modules[newmod->getName()]; if (oldmod) { delete oldmod; } - Modules[newmod->Name()] = newmod; + Modules[newmod->getName()] = newmod; } } } @@ -1382,11 +1473,13 @@ signed char SWMgr::setCipherKey(const char *modName, const char *key) { SWFilter *cipherFilter = new CipherFilter(key); cipherFilters.insert(FilterMap::value_type(modName, cipherFilter)); cleanupFilters.push_back(cipherFilter); - (*it2).second->AddRawFilter(cipherFilter); + (*it2).second->addRawFilter(cipherFilter); return 0; } } return -1; } + SWORD_NAMESPACE_END + diff --git a/src/mgr/swsearchable.cpp b/src/mgr/swsearchable.cpp index 48ae556..5837c9c 100644 --- a/src/mgr/swsearchable.cpp +++ b/src/mgr/swsearchable.cpp @@ -1,10 +1,11 @@ /****************************************************************************** - * swsearchable.h - definition of class SWSearchable used to provide an - * interface for objects that be searched. * - * $Id: swsearchable.cpp 1959 2006-08-28 00:39:56Z scribe $ + * swsearchable.cpp - used to provide an interface for objects that + * can be searched * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swsearchable.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,10 +24,13 @@ #include #include + SWORD_NAMESPACE_START + void SWSearchable::nullPercent(char percent, void *percentUserData) {} + SWSearchable::SWSearchable() { } @@ -34,7 +38,8 @@ SWSearchable::SWSearchable() { SWSearchable::~SWSearchable() { } - // special search framework + +// special search framework signed char SWSearchable::createSearchFramework(void (*percent)(char, void *), void *percentUserData) { return 0; } @@ -50,4 +55,6 @@ bool SWSearchable::isSearchOptimallySupported(const char *istr, int searchType, return retVal; } + SWORD_NAMESPACE_END + diff --git a/src/mgr/versemgr.cpp b/src/mgr/versemgr.cpp deleted file mode 100644 index 354c0df..0000000 --- a/src/mgr/versemgr.cpp +++ /dev/null @@ -1,383 +0,0 @@ -/****************************************************************************** - * versemgr.cpp - implementation of class VerseMgr used for managing - * versification systems - * - * $Id: versemgr.cpp 2108 2007-10-13 20:35:02Z scribe $ - * - * Copyright 2010 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include -#include -#include -#include -#include // KJV internal versification system -#include -#include - -#include // null v11n system - -#include // Leningrad Codex (WLC) v11n system -#include // Masoretic Text (MT) v11n system -#include // KJV + Apocrypha v11n system -#include // NRSV v11n system -#include // NRSV + Apocrypha v11n system -#include // Russian Synodal v11n system -#include // Vulgate v11n system -#include // German v11n system -#include // Luther v11n system -#include // Catholic v11n system (10 chapter Esther) -#include // Catholic2 v11n system (16 chapter Esther) -#include // SynodalP v11n system (KJV with Synodal-like verse counts) - -using std::vector; -using std::map; -using std::distance; -using std::lower_bound; - -SWORD_NAMESPACE_START - - -VerseMgr *VerseMgr::getSystemVerseMgr() { - if (!systemVerseMgr) { - systemVerseMgr = new VerseMgr(); - systemVerseMgr->registerVersificationSystem("KJV", otbooks, ntbooks, vm); - systemVerseMgr->registerVersificationSystem("Leningrad", otbooks_leningrad, ntbooks_null, vm_leningrad); - systemVerseMgr->registerVersificationSystem("MT", otbooks_mt, ntbooks_null, vm_mt); - systemVerseMgr->registerVersificationSystem("KJVA", otbooks_kjva, ntbooks, vm_kjva); - systemVerseMgr->registerVersificationSystem("NRSV", otbooks, ntbooks, vm_nrsv); - systemVerseMgr->registerVersificationSystem("NRSVA", otbooks_nrsva, ntbooks, vm_nrsva); - systemVerseMgr->registerVersificationSystem("Synodal", otbooks_synodal, ntbooks_synodal, vm_synodal); - systemVerseMgr->registerVersificationSystem("Vulg", otbooks_vulg, ntbooks_vulg, vm_vulg); - systemVerseMgr->registerVersificationSystem("German", otbooks_german, ntbooks, vm_german); - systemVerseMgr->registerVersificationSystem("Luther", otbooks_luther, ntbooks_luther, vm_luther); - systemVerseMgr->registerVersificationSystem("Catholic", otbooks_catholic, ntbooks, vm_catholic); - systemVerseMgr->registerVersificationSystem("Catholic2", otbooks_catholic2, ntbooks, vm_catholic2); - systemVerseMgr->registerVersificationSystem("SynodalP", otbooks, ntbooks, vm_synodalp); - } - return systemVerseMgr; -} - - -class VerseMgr::System::Private { -public: - /** Array[chapmax] of maximum verses in chapters */ - vector books; - map osisLookup; - - Private() { - } - Private(const VerseMgr::System::Private &other) { - books = other.books; - osisLookup = other.osisLookup; - } - VerseMgr::System::Private &operator =(const VerseMgr::System::Private &other) { - books = other.books; - osisLookup = other.osisLookup; - return *this; - } -}; - - -class VerseMgr::Book::Private { -friend struct BookOffsetLess; -public: - /** Array[chapmax] of maximum verses in chapters */ - vector verseMax; - vector offsetPrecomputed; - - Private() { - verseMax.clear(); - } - Private(const VerseMgr::Book::Private &other) { - verseMax.clear(); - verseMax = other.verseMax; - offsetPrecomputed = other.offsetPrecomputed; - } - VerseMgr::Book::Private &operator =(const VerseMgr::Book::Private &other) { - verseMax.clear(); - verseMax = other.verseMax; - offsetPrecomputed = other.offsetPrecomputed; - return *this; - } -}; - -struct BookOffsetLess { - bool operator() (const VerseMgr::Book &o1, const VerseMgr::Book &o2) const { return o1.p->offsetPrecomputed[0] < o2.p->offsetPrecomputed[0]; } - bool operator() (const long &o1, const VerseMgr::Book &o2) const { return o1 < o2.p->offsetPrecomputed[0]; } - bool operator() (const VerseMgr::Book &o1, const long &o2) const { return o1.p->offsetPrecomputed[0] < o2; } - bool operator() (const long &o1, const long &o2) const { return o1 < o2; } -}; - -void VerseMgr::Book::init() { - p = new Private(); -} - -void VerseMgr::System::init() { - p = new Private(); - BMAX[0] = 0; - BMAX[1] = 0; - ntStartOffset = 0; -} - - -VerseMgr::System::System(const System &other) { - init(); - name = other.name; - BMAX[0] = other.BMAX[0]; - BMAX[1] = other.BMAX[1]; - (*p) = *(other.p); - ntStartOffset = other.ntStartOffset; -} - -VerseMgr::System &VerseMgr::System::operator =(const System &other) { - name = other.name; - BMAX[0] = other.BMAX[0]; - BMAX[1] = other.BMAX[1]; - (*p) = *(other.p); - ntStartOffset = other.ntStartOffset; - return *this; -} - - -VerseMgr::System::~System() { - delete p; -} - -const VerseMgr::Book *VerseMgr::System::getBook(int number) const { - return (number < (signed int)p->books.size()) ? &(p->books[number]) : 0; -} - - -int VerseMgr::System::getBookNumberByOSISName(const char *bookName) const { - map::const_iterator it = p->osisLookup.find(bookName); - return (it != p->osisLookup.end()) ? it->second : -1; -} - - -void VerseMgr::System::loadFromSBook(const sbook *ot, const sbook *nt, int *chMax) { - int chap = 0; - int book = 0; - long offset = 0; // module heading - offset++; // testament heading - while (ot->chapmax) { - p->books.push_back(Book(ot->name, ot->osis, ot->prefAbbrev, ot->chapmax)); - offset++; // book heading - Book &b = p->books[p->books.size()-1]; - p->osisLookup[b.getOSISName()] = p->books.size(); - for (int i = 0; i < ot->chapmax; i++) { - b.p->verseMax.push_back(chMax[chap]); - offset++; // chapter heading - b.p->offsetPrecomputed.push_back(offset); - offset += chMax[chap++]; - } - ot++; - book++; - } - BMAX[0] = book; - book = 0; - ntStartOffset = offset; - offset++; // testament heading - while (nt->chapmax) { - p->books.push_back(Book(nt->name, nt->osis, nt->prefAbbrev, nt->chapmax)); - offset++; // book heading - Book &b = p->books[p->books.size()-1]; - p->osisLookup[b.getOSISName()] = p->books.size(); - for (int i = 0; i < nt->chapmax; i++) { - b.p->verseMax.push_back(chMax[chap]); - offset++; // chapter heading - b.p->offsetPrecomputed.push_back(offset); - offset += chMax[chap++]; - } - nt++; - book++; - } - BMAX[1] = book; - - // TODO: build offset speed array -} - - -VerseMgr::Book::Book(const Book &other) { - longName = other.longName; - osisName = other.osisName; - prefAbbrev = other.prefAbbrev; - chapMax = other.chapMax; - init(); - (*p) = *(other.p); -} - -VerseMgr::Book& VerseMgr::Book::operator =(const Book &other) { - longName = other.longName; - osisName = other.osisName; - prefAbbrev = other.prefAbbrev; - chapMax = other.chapMax; - init(); - (*p) = *(other.p); - return *this; -} - - -VerseMgr::Book::~Book() { - delete p; -} - - -int VerseMgr::Book::getVerseMax(int chapter) const { - chapter--; - return (p && (chapter < (signed int)p->verseMax.size()) && (chapter > -1)) ? p->verseMax[chapter] : -1; -} - - -int VerseMgr::System::getBookCount() const { - return (p ? p->books.size() : 0); -} - - -long VerseMgr::System::getOffsetFromVerse(int book, int chapter, int verse) const { - long offset = -1; - chapter--; - - const Book *b = getBook(book); - - if (!b) return -1; // assert we have a valid book - if ((chapter > -1) && (chapter >= (signed int)b->p->offsetPrecomputed.size())) return -1; // assert we have a valid chapter - - offset = b->p->offsetPrecomputed[(chapter > -1)?chapter:0]; - if (chapter < 0) offset--; - -/* old code - * - offset = offsets[testament-1][0][book]; - offset = offsets[testament-1][1][(int)offset + chapter]; - if (!(offset|verse)) // if we have a testament but nothing else. - offset = 1; - -*/ - - return (offset + verse); -} - - -char VerseMgr::System::getVerseFromOffset(long offset, int *book, int *chapter, int *verse) const { - - if (offset < 1) { // just handle the module heading corner case up front (and error case) - (*book) = -1; - (*chapter) = 0; - (*verse) = 0; - return offset; // < 0 = error - } - - // binary search for book - vector::iterator b = lower_bound(p->books.begin(), p->books.end(), offset, BookOffsetLess()); - if (b == p->books.end()) b--; - (*book) = distance(p->books.begin(), b)+1; - if (offset < (*(b->p->offsetPrecomputed.begin()))-((((!(*book)) || (*book)==BMAX[0]+1))?2:1)) { // -1 for chapter headings - (*book)--; - if (b != p->books.begin()) { - b--; - } - } - vector::iterator c = lower_bound(b->p->offsetPrecomputed.begin(), b->p->offsetPrecomputed.end(), offset); - - // if we're a book heading, we are lessthan chapter precomputes, but greater book. This catches corner case. - if (c == b->p->offsetPrecomputed.end()) { - c--; - } - if ((offset < *c) && (c == b->p->offsetPrecomputed.begin())) { - (*chapter) = (offset - *c)+1; // should be 0 or -1 (for testament heading) - (*verse) = 0; - } - else { - if (offset < *c) c--; - (*chapter) = distance(b->p->offsetPrecomputed.begin(), c)+1; - (*verse) = (offset - *c); - } - return ((*chapter > 0) && (*verse > b->getVerseMax(*chapter))) ? KEYERR_OUTOFBOUNDS : 0; -} - - -/*************************************************** - * VerseMgr - */ - -class VerseMgr::Private { -public: - Private() { - } - Private(const VerseMgr::Private &other) { - systems = other.systems; - } - VerseMgr::Private &operator =(const VerseMgr::Private &other) { - systems = other.systems; - return *this; - } - map systems; -}; -// ---------------- statics ----------------- -VerseMgr *VerseMgr::systemVerseMgr = 0; - -class __staticsystemVerseMgr { -public: - __staticsystemVerseMgr() { } - ~__staticsystemVerseMgr() { delete VerseMgr::systemVerseMgr; } -} _staticsystemVerseMgr; - - -void VerseMgr::init() { - p = new Private(); -} - - -VerseMgr::~VerseMgr() { - delete p; -} - - -void VerseMgr::setSystemVerseMgr(VerseMgr *newVerseMgr) { - if (systemVerseMgr) - delete systemVerseMgr; - systemVerseMgr = newVerseMgr; -} - - -const VerseMgr::System *VerseMgr::getVersificationSystem(const char *name) const { - map::const_iterator it = p->systems.find(name); - return (it != p->systems.end()) ? &(it->second) : 0; -} - - -void VerseMgr::registerVersificationSystem(const char *name, const sbook *ot, const sbook *nt, int *chMax) { - p->systems[name] = name; - System &s = p->systems[name]; - s.loadFromSBook(ot, nt, chMax); -} - - -void VerseMgr::registerVersificationSystem(const char *name, const TreeKey *tk) { -} - - -const StringList VerseMgr::getVersificationSystems() const { - StringList retVal; - for (map::const_iterator it = p->systems.begin(); it != p->systems.end(); it++) { - retVal.push_back(it->first); - } - return retVal; -} - - -SWORD_NAMESPACE_END diff --git a/src/mgr/versificationmgr.cpp b/src/mgr/versificationmgr.cpp new file mode 100644 index 0000000..7972488 --- /dev/null +++ b/src/mgr/versificationmgr.cpp @@ -0,0 +1,396 @@ +/****************************************************************************** + * + * versificationmgr.cpp - implementation of class VersificationMgr used + * for managing versification systems + * + * $Id: versificationmgr.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include +#include +#include +#include // KJV internal versification system +#include +#include + +#include // null v11n system + +#include // Leningrad Codex (WLC) v11n system +#include // Masoretic Text (MT) v11n system +#include // KJV + Apocrypha v11n system +#include // NRSV v11n system +#include // NRSV + Apocrypha v11n system +#include // Russian Synodal v11n system +#include // Russian Synodal v11n system +#include // Vulgate v11n system +#include // German v11n system +#include // Luther v11n system +#include // Catholic v11n system (10 chapter Esther) +#include // Catholic2 v11n system (16 chapter Esther) +#include // General LXX v11n system (includes GNT, as used in Orthodox Bibles) +#include // Orthodox v11n system as used in Orthodox Bibles + +using std::vector; +using std::map; +using std::distance; +using std::lower_bound; + + +SWORD_NAMESPACE_START + + +VersificationMgr *VersificationMgr::getSystemVersificationMgr() { + if (!systemVersificationMgr) { + systemVersificationMgr = new VersificationMgr(); + systemVersificationMgr->registerVersificationSystem("KJV", otbooks, ntbooks, vm); + systemVersificationMgr->registerVersificationSystem("Leningrad", otbooks_leningrad, ntbooks_null, vm_leningrad); + systemVersificationMgr->registerVersificationSystem("MT", otbooks_mt, ntbooks_null, vm_mt); + systemVersificationMgr->registerVersificationSystem("KJVA", otbooks_kjva, ntbooks, vm_kjva); + systemVersificationMgr->registerVersificationSystem("NRSV", otbooks, ntbooks, vm_nrsv); + systemVersificationMgr->registerVersificationSystem("NRSVA", otbooks_nrsva, ntbooks, vm_nrsva); + systemVersificationMgr->registerVersificationSystem("Synodal", otbooks_synodal, ntbooks_synodal, vm_synodal); + systemVersificationMgr->registerVersificationSystem("SynodalProt", otbooks_synodalProt, ntbooks_synodal, vm_synodalProt); + systemVersificationMgr->registerVersificationSystem("Vulg", otbooks_vulg, ntbooks_vulg, vm_vulg); + systemVersificationMgr->registerVersificationSystem("German", otbooks_german, ntbooks, vm_german); + systemVersificationMgr->registerVersificationSystem("Luther", otbooks_luther, ntbooks_luther, vm_luther); + systemVersificationMgr->registerVersificationSystem("Catholic", otbooks_catholic, ntbooks, vm_catholic); + systemVersificationMgr->registerVersificationSystem("Catholic2", otbooks_catholic2, ntbooks, vm_catholic2); + systemVersificationMgr->registerVersificationSystem("LXX", otbooks_lxx, ntbooks, vm_lxx); + systemVersificationMgr->registerVersificationSystem("Orthodox", otbooks_orthodox, ntbooks, vm_orthodox); + } + return systemVersificationMgr; +} + + +class VersificationMgr::System::Private { +public: + /** Array[chapmax] of maximum verses in chapters */ + vector books; + map osisLookup; + + Private() { + } + Private(const VersificationMgr::System::Private &other) { + books = other.books; + osisLookup = other.osisLookup; + } + VersificationMgr::System::Private &operator =(const VersificationMgr::System::Private &other) { + books = other.books; + osisLookup = other.osisLookup; + return *this; + } +}; + + +class VersificationMgr::Book::Private { +friend struct BookOffsetLess; +public: + /** Array[chapmax] of maximum verses in chapters */ + vector verseMax; + vector offsetPrecomputed; + + Private() { + verseMax.clear(); + } + Private(const VersificationMgr::Book::Private &other) { + verseMax.clear(); + verseMax = other.verseMax; + offsetPrecomputed = other.offsetPrecomputed; + } + VersificationMgr::Book::Private &operator =(const VersificationMgr::Book::Private &other) { + verseMax.clear(); + verseMax = other.verseMax; + offsetPrecomputed = other.offsetPrecomputed; + return *this; + } +}; + + +struct BookOffsetLess { + bool operator() (const VersificationMgr::Book &o1, const VersificationMgr::Book &o2) const { return o1.p->offsetPrecomputed[0] < o2.p->offsetPrecomputed[0]; } + bool operator() (const long &o1, const VersificationMgr::Book &o2) const { return o1 < o2.p->offsetPrecomputed[0]; } + bool operator() (const VersificationMgr::Book &o1, const long &o2) const { return o1.p->offsetPrecomputed[0] < o2; } + bool operator() (const long &o1, const long &o2) const { return o1 < o2; } +}; + + +void VersificationMgr::Book::init() { + p = new Private(); +} + + +void VersificationMgr::System::init() { + p = new Private(); + BMAX[0] = 0; + BMAX[1] = 0; + ntStartOffset = 0; +} + + +VersificationMgr::System::System(const System &other) { + init(); + name = other.name; + BMAX[0] = other.BMAX[0]; + BMAX[1] = other.BMAX[1]; + (*p) = *(other.p); + ntStartOffset = other.ntStartOffset; +} + + +VersificationMgr::System &VersificationMgr::System::operator =(const System &other) { + name = other.name; + BMAX[0] = other.BMAX[0]; + BMAX[1] = other.BMAX[1]; + (*p) = *(other.p); + ntStartOffset = other.ntStartOffset; + return *this; +} + + +VersificationMgr::System::~System() { + delete p; +} + + +const VersificationMgr::Book *VersificationMgr::System::getBook(int number) const { + return (number < (signed int)p->books.size()) ? &(p->books[number]) : 0; +} + + +int VersificationMgr::System::getBookNumberByOSISName(const char *bookName) const { + map::const_iterator it = p->osisLookup.find(bookName); + return (it != p->osisLookup.end()) ? it->second : -1; +} + + +void VersificationMgr::System::loadFromSBook(const sbook *ot, const sbook *nt, int *chMax) { + int chap = 0; + int book = 0; + long offset = 0; // module heading + offset++; // testament heading + while (ot->chapmax) { + p->books.push_back(Book(ot->name, ot->osis, ot->prefAbbrev, ot->chapmax)); + offset++; // book heading + Book &b = p->books[p->books.size()-1]; + p->osisLookup[b.getOSISName()] = p->books.size(); + for (int i = 0; i < ot->chapmax; i++) { + b.p->verseMax.push_back(chMax[chap]); + offset++; // chapter heading + b.p->offsetPrecomputed.push_back(offset); + offset += chMax[chap++]; + } + ot++; + book++; + } + BMAX[0] = book; + book = 0; + ntStartOffset = offset; + offset++; // testament heading + while (nt->chapmax) { + p->books.push_back(Book(nt->name, nt->osis, nt->prefAbbrev, nt->chapmax)); + offset++; // book heading + Book &b = p->books[p->books.size()-1]; + p->osisLookup[b.getOSISName()] = p->books.size(); + for (int i = 0; i < nt->chapmax; i++) { + b.p->verseMax.push_back(chMax[chap]); + offset++; // chapter heading + b.p->offsetPrecomputed.push_back(offset); + offset += chMax[chap++]; + } + nt++; + book++; + } + BMAX[1] = book; + + // TODO: build offset speed array +} + + +VersificationMgr::Book::Book(const Book &other) { + longName = other.longName; + osisName = other.osisName; + prefAbbrev = other.prefAbbrev; + chapMax = other.chapMax; + init(); + (*p) = *(other.p); +} + + +VersificationMgr::Book& VersificationMgr::Book::operator =(const Book &other) { + longName = other.longName; + osisName = other.osisName; + prefAbbrev = other.prefAbbrev; + chapMax = other.chapMax; + init(); + (*p) = *(other.p); + return *this; +} + + +VersificationMgr::Book::~Book() { + delete p; +} + + +int VersificationMgr::Book::getVerseMax(int chapter) const { + chapter--; + return (p && (chapter < (signed int)p->verseMax.size()) && (chapter > -1)) ? p->verseMax[chapter] : -1; +} + + +int VersificationMgr::System::getBookCount() const { + return (p ? p->books.size() : 0); +} + + +long VersificationMgr::System::getOffsetFromVerse(int book, int chapter, int verse) const { + long offset = -1; + chapter--; + + const Book *b = getBook(book); + + if (!b) return -1; // assert we have a valid book + if ((chapter > -1) && (chapter >= (signed int)b->p->offsetPrecomputed.size())) return -1; // assert we have a valid chapter + + offset = b->p->offsetPrecomputed[(chapter > -1)?chapter:0]; + if (chapter < 0) offset--; + +/* old code + * + offset = offsets[testament-1][0][book]; + offset = offsets[testament-1][1][(int)offset + chapter]; + if (!(offset|verse)) // if we have a testament but nothing else. + offset = 1; + +*/ + + return (offset + verse); +} + + +char VersificationMgr::System::getVerseFromOffset(long offset, int *book, int *chapter, int *verse) const { + + if (offset < 1) { // just handle the module heading corner case up front (and error case) + (*book) = -1; + (*chapter) = 0; + (*verse) = 0; + return offset; // < 0 = error + } + + // binary search for book + vector::iterator b = lower_bound(p->books.begin(), p->books.end(), offset, BookOffsetLess()); + if (b == p->books.end()) b--; + (*book) = distance(p->books.begin(), b)+1; + if (offset < (*(b->p->offsetPrecomputed.begin()))-((((!(*book)) || (*book)==BMAX[0]+1))?2:1)) { // -1 for chapter headings + (*book)--; + if (b != p->books.begin()) { + b--; + } + } + vector::iterator c = lower_bound(b->p->offsetPrecomputed.begin(), b->p->offsetPrecomputed.end(), offset); + + // if we're a book heading, we are lessthan chapter precomputes, but greater book. This catches corner case. + if (c == b->p->offsetPrecomputed.end()) { + c--; + } + if ((offset < *c) && (c == b->p->offsetPrecomputed.begin())) { + (*chapter) = (offset - *c)+1; // should be 0 or -1 (for testament heading) + (*verse) = 0; + } + else { + if (offset < *c) c--; + (*chapter) = distance(b->p->offsetPrecomputed.begin(), c)+1; + (*verse) = (offset - *c); + } + return ((*chapter > 0) && (*verse > b->getVerseMax(*chapter))) ? KEYERR_OUTOFBOUNDS : 0; +} + + +/*************************************************** + * VersificationMgr + */ + +class VersificationMgr::Private { +public: + Private() { + } + Private(const VersificationMgr::Private &other) { + systems = other.systems; + } + VersificationMgr::Private &operator =(const VersificationMgr::Private &other) { + systems = other.systems; + return *this; + } + map systems; +}; +// ---------------- statics ----------------- +VersificationMgr *VersificationMgr::systemVersificationMgr = 0; + +class __staticsystemVersificationMgr { +public: + __staticsystemVersificationMgr() { } + ~__staticsystemVersificationMgr() { delete VersificationMgr::systemVersificationMgr; } +} _staticsystemVersificationMgr; + + +void VersificationMgr::init() { + p = new Private(); +} + + +VersificationMgr::~VersificationMgr() { + delete p; +} + + +void VersificationMgr::setSystemVersificationMgr(VersificationMgr *newVersificationMgr) { + if (systemVersificationMgr) + delete systemVersificationMgr; + systemVersificationMgr = newVersificationMgr; +} + + +const VersificationMgr::System *VersificationMgr::getVersificationSystem(const char *name) const { + map::const_iterator it = p->systems.find(name); + return (it != p->systems.end()) ? &(it->second) : 0; +} + + +void VersificationMgr::registerVersificationSystem(const char *name, const sbook *ot, const sbook *nt, int *chMax) { + p->systems[name] = name; + System &s = p->systems[name]; + s.loadFromSBook(ot, nt, chMax); +} + + +void VersificationMgr::registerVersificationSystem(const char *name, const TreeKey *tk) { +} + + +const StringList VersificationMgr::getVersificationSystems() const { + StringList retVal; + for (map::const_iterator it = p->systems.begin(); it != p->systems.end(); it++) { + retVal.push_back(it->first); + } + return retVal; +} + + +SWORD_NAMESPACE_END + diff --git a/src/modules/comments/hrefcom/hrefcom.cpp b/src/modules/comments/hrefcom/hrefcom.cpp index 7035b08..3716dbf 100644 --- a/src/modules/comments/hrefcom/hrefcom.cpp +++ b/src/modules/comments/hrefcom/hrefcom.cpp @@ -1,10 +1,12 @@ /****************************************************************************** - * hrefcom.cpp - code for class 'HREFCom'- a module that produces HTML HREFs - * pointing to actual text desired. Uses standard + * + * hrefcom.cpp - code for class 'HREFCom'- a module that produces HTML + * HREFs pointing to actual text desired. Uses standard * files: ot and nt using indexs ??.bks ??.cps ??.vss * + * $Id: hrefcom.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -67,19 +69,19 @@ HREFCom::~HREFCom() * RET: string buffer with verse */ -SWBuf &HREFCom::getRawEntryBuf() { +SWBuf &HREFCom::getRawEntryBuf() const { long start; unsigned short size; VerseKey *key = 0; key = &getVerseKey(); - findOffset(key->Testament(), key->TestamentIndex(), &start, &size); + findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size); entrySize = size; // support getEntrySize call SWBuf tmpbuf; - readText(key->Testament(), start, size, tmpbuf); + readText(key->getTestament(), start, size, tmpbuf); entryBuf = prefix; entryBuf += tmpbuf.c_str(); prepText(entryBuf); diff --git a/src/modules/comments/rawcom/rawcom.cpp b/src/modules/comments/rawcom/rawcom.cpp index c0404ae..5189cdc 100644 --- a/src/modules/comments/rawcom/rawcom.cpp +++ b/src/modules/comments/rawcom/rawcom.cpp @@ -1,9 +1,12 @@ /****************************************************************************** - * rawcom.cpp - code for class 'RawCom'- a module that reads raw commentary - * files: ot and nt using indexs ??.bks ??.cps ??.vss * + * rawcom.cpp - code for class 'RawCom'- a module that reads raw + * commentary files: + * ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawcom.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -54,7 +57,7 @@ RawCom::~RawCom() } -bool RawCom::isWritable() { +bool RawCom::isWritable() const { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); } /****************************************************************************** @@ -64,16 +67,16 @@ bool RawCom::isWritable() { * RET: string buffer with verse */ -SWBuf &RawCom::getRawEntryBuf() { +SWBuf &RawCom::getRawEntryBuf() const { long start = 0; unsigned short size = 0; VerseKey *key = &getVerseKey(); - findOffset(key->Testament(), key->TestamentIndex(), &start, &size); + findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size); entrySize = size; // support getEntrySize call entryBuf = ""; - readText(key->Testament(), start, size, entryBuf); + readText(key->getTestament(), start, size, entryBuf); rawFilter(entryBuf, 0); // hack, decipher rawFilter(entryBuf, key); @@ -98,7 +101,7 @@ void RawCom::increment(int steps) { unsigned short size; VerseKey *tmpkey = &getVerseKey(); - findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size); + findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size); SWKey lastgood = *tmpkey; while (steps) { @@ -108,12 +111,12 @@ void RawCom::increment(int steps) { (steps > 0) ? ++(*key) : --(*key); tmpkey = &getVerseKey(); - if ((error = key->Error())) { + if ((error = key->popError())) { *key = lastgood; break; } - long index = tmpkey->TestamentIndex(); - findOffset(tmpkey->Testament(), index, &start, &size); + long index = tmpkey->getTestamentIndex(); + findOffset(tmpkey->getTestament(), index, &start, &size); if ( (((laststart != start) || (lastsize != size)) // we're a different entry // && (start > 0) @@ -129,7 +132,7 @@ void RawCom::increment(int steps) { void RawCom::setEntry(const char *inbuf, long len) { VerseKey *key = &getVerseKey(); - doSetText(key->Testament(), key->TestamentIndex(), inbuf, len); + doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len); } @@ -137,7 +140,7 @@ void RawCom::linkEntry(const SWKey *inkey) { VerseKey *destkey = &getVerseKey(); const VerseKey *srckey = &getVerseKey(inkey); - doLinkEntry(destkey->Testament(), destkey->TestamentIndex(), srckey->TestamentIndex()); + doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex()); if (inkey != srckey) // free our key if we created a VerseKey delete srckey; @@ -153,7 +156,7 @@ void RawCom::linkEntry(const SWKey *inkey) { void RawCom::deleteEntry() { VerseKey *key = &getVerseKey(); - doSetText(key->Testament(), key->TestamentIndex(), ""); + doSetText(key->getTestament(), key->getTestamentIndex(), ""); } bool RawCom::isLinked(const SWKey *k1, const SWKey *k2) const { @@ -161,10 +164,10 @@ bool RawCom::isLinked(const SWKey *k1, const SWKey *k2) const { unsigned short size1, size2; VerseKey *vk1 = &getVerseKey(k1); VerseKey *vk2 = &getVerseKey(k2); - if (vk1->Testament() != vk2->Testament()) return false; + if (vk1->getTestament() != vk2->getTestament()) return false; - findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1); - findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2); + findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1); + findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2); if (!size1 || !size2) return false; return start1 == start2; } @@ -174,7 +177,7 @@ bool RawCom::hasEntry(const SWKey *k) const { unsigned short size; VerseKey *vk = &getVerseKey(k); - findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size); + findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size); return size; } diff --git a/src/modules/comments/rawcom4/Makefile b/src/modules/comments/rawcom4/Makefile new file mode 100644 index 0000000..a08e07e --- /dev/null +++ b/src/modules/comments/rawcom4/Makefile @@ -0,0 +1,5 @@ + +root := ../../../.. + +all: + make -C ${root} diff --git a/src/modules/comments/rawcom4/rawcom4.cpp b/src/modules/comments/rawcom4/rawcom4.cpp index c0c4a1d..7cfc603 100644 --- a/src/modules/comments/rawcom4/rawcom4.cpp +++ b/src/modules/comments/rawcom4/rawcom4.cpp @@ -1,9 +1,12 @@ /****************************************************************************** - * rawcom4.cpp - code for class 'RawCom4'- a module that reads raw commentary - * files: ot and nt using indexs ??.bks ??.cps ??.vss * + * rawcom4.cpp - code for class 'RawCom4'- a module that reads raw + * commentary files: + * ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawcom4.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -53,7 +56,7 @@ RawCom4::~RawCom4() } -bool RawCom4::isWritable() { +bool RawCom4::isWritable() const { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); } /****************************************************************************** @@ -63,16 +66,16 @@ bool RawCom4::isWritable() { * RET: string buffer with verse */ -SWBuf &RawCom4::getRawEntryBuf() { +SWBuf &RawCom4::getRawEntryBuf() const { long start = 0; unsigned long size = 0; VerseKey *key = &getVerseKey(); - findOffset(key->Testament(), key->TestamentIndex(), &start, &size); + findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size); entrySize = size; // support getEntrySize call entryBuf = ""; - readText(key->Testament(), start, size, entryBuf); + readText(key->getTestament(), start, size, entryBuf); rawFilter(entryBuf, 0); // hack, decipher rawFilter(entryBuf, key); @@ -97,7 +100,7 @@ void RawCom4::increment(int steps) { unsigned long size; VerseKey *tmpkey = &getVerseKey(); - findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size); + findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size); SWKey lastgood = *tmpkey; while (steps) { @@ -107,12 +110,12 @@ void RawCom4::increment(int steps) { (steps > 0) ? ++(*key) : --(*key); tmpkey = &getVerseKey(); - if ((error = key->Error())) { + if ((error = key->popError())) { *key = lastgood; break; } - long index = tmpkey->TestamentIndex(); - findOffset(tmpkey->Testament(), index, &start, &size); + long index = tmpkey->getTestamentIndex(); + findOffset(tmpkey->getTestament(), index, &start, &size); if ( (((laststart != start) || (lastsize != size)) // we're a different entry // && (start > 0) @@ -128,14 +131,14 @@ void RawCom4::increment(int steps) { void RawCom4::setEntry(const char *inbuf, long len) { VerseKey *key = &getVerseKey(); - doSetText(key->Testament(), key->TestamentIndex(), inbuf, len); + doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len); } void RawCom4::linkEntry(const SWKey *inkey) { VerseKey *destkey = &getVerseKey(); const VerseKey *srckey = &getVerseKey(inkey); - doLinkEntry(destkey->Testament(), destkey->TestamentIndex(), srckey->TestamentIndex()); + doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex()); } @@ -148,7 +151,7 @@ void RawCom4::linkEntry(const SWKey *inkey) { void RawCom4::deleteEntry() { VerseKey *key = &getVerseKey(); - doSetText(key->Testament(), key->TestamentIndex(), ""); + doSetText(key->getTestament(), key->getTestamentIndex(), ""); } bool RawCom4::isLinked(const SWKey *k1, const SWKey *k2) const { @@ -156,10 +159,10 @@ bool RawCom4::isLinked(const SWKey *k1, const SWKey *k2) const { unsigned long size1, size2; VerseKey *vk1 = &getVerseKey(k1); VerseKey *vk2 = &getVerseKey(k2); - if (vk1->Testament() != vk2->Testament()) return false; + if (vk1->getTestament() != vk2->getTestament()) return false; - findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1); - findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2); + findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1); + findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2); if (!size1 || !size2) return false; return start1 == start2; } @@ -169,7 +172,7 @@ bool RawCom4::hasEntry(const SWKey *k) const { unsigned long size; VerseKey *vk = &getVerseKey(k); - findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size); + findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size); return size; } diff --git a/src/modules/comments/rawfiles/rawfiles.cpp b/src/modules/comments/rawfiles/rawfiles.cpp index b0e24fc..7c2d524 100644 --- a/src/modules/comments/rawfiles/rawfiles.cpp +++ b/src/modules/comments/rawfiles/rawfiles.cpp @@ -1,10 +1,12 @@ /****************************************************************************** - * rawfiles.cpp - code for class 'RawFiles'- a module that produces HTML HREFs - * pointing to actual text desired. Uses standard + * + * rawfiles.cpp - code for class 'RawFiles'- a module that produces HTML + * HREFs pointing to actual text desired. Uses standard * files: ot and nt using indexs ??.bks ??.cps ??.vss * + * $Id: rawfiles.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -57,31 +59,31 @@ RawFiles::~RawFiles() /** Is the module writable? :) * @return yes or no */ -bool RawFiles::isWritable() { +bool RawFiles::isWritable() const { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); } /****************************************************************************** - * RawFiles::getRawEntry - Returns the correct verse when char * cast - * is requested + * RawFiles::getRawEntry - Retrieve the unprocessed entry contents at + * the current key position of this module * - * RET: string buffer with verse + * RET: entry contents */ -SWBuf &RawFiles::getRawEntryBuf() { +SWBuf &RawFiles::getRawEntryBuf() const { FileDesc *datafile; long start = 0; unsigned short size = 0; VerseKey *key = &getVerseKey(); - findOffset(key->Testament(), key->TestamentIndex(), &start, &size); + findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size); entryBuf = ""; if (size) { SWBuf tmpbuf = path; tmpbuf += '/'; - readText(key->Testament(), start, size, entryBuf); + readText(key->getTestament(), start, size, entryBuf); tmpbuf += entryBuf; entryBuf = ""; datafile = FileMgr::getSystemFileMgr()->open(tmpbuf.c_str(), FileMgr::RDONLY); @@ -102,7 +104,7 @@ SWBuf &RawFiles::getRawEntryBuf() { /****************************************************************************** - * RawFiles::setEntry(char *)- Update the modules current key entry with + * RawFiles::setEntry(char *)- Update the module's current key entry with * provided text */ @@ -114,13 +116,13 @@ void RawFiles::setEntry(const char *inbuf, long len) { len = (len<0)?strlen(inbuf):len; - findOffset(key->Testament(), key->TestamentIndex(), &start, &size); + findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size); if (size) { SWBuf tmpbuf; entryBuf = path; entryBuf += '/'; - readText(key->Testament(), start, size, tmpbuf); + readText(key->getTestament(), start, size, tmpbuf); entryBuf += tmpbuf; } else { @@ -128,7 +130,7 @@ void RawFiles::setEntry(const char *inbuf, long len) { entryBuf = path; entryBuf += '/'; tmpbuf = getNextFilename(); - doSetText(key->Testament(), key->TestamentIndex(), tmpbuf); + doSetText(key->getTestament(), key->getTestamentIndex(), tmpbuf); entryBuf += tmpbuf; } datafile = FileMgr::getSystemFileMgr()->open(entryBuf, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC); @@ -152,14 +154,14 @@ void RawFiles::linkEntry(const SWKey *inkey) { unsigned short size; const VerseKey *key = &getVerseKey(); - findOffset(key->Testament(), key->TestamentIndex(), &start, &size); + findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size); if (size) { SWBuf tmpbuf; - readText(key->Testament(), start, size + 2, tmpbuf); + readText(key->getTestament(), start, size + 2, tmpbuf); key = &getVerseKey(inkey); - doSetText(key->Testament(), key->TestamentIndex(), tmpbuf.c_str()); + doSetText(key->getTestament(), key->getTestamentIndex(), tmpbuf.c_str()); } } @@ -172,7 +174,7 @@ void RawFiles::linkEntry(const SWKey *inkey) { void RawFiles::deleteEntry() { VerseKey *key = &getVerseKey(); - doSetText(key->Testament(), key->TestamentIndex(), ""); + doSetText(key->getTestament(), key->getTestamentIndex(), ""); } @@ -183,22 +185,22 @@ void RawFiles::deleteEntry() { * RET: filename */ -char *RawFiles::getNextFilename() { - static char incfile[255]; - __u32 number; +const char *RawFiles::getNextFilename() { + static SWBuf incfile; + __u32 number = 0; FileDesc *datafile; - sprintf(incfile, "%s/incfile", path); + incfile.setFormatted("%s/incfile", path); datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::RDONLY); - - if (datafile->read(&number, 4) != 4) number = 0; - number = swordtoarch32(number); - + if (datafile->getFd() != -1) { + if (datafile->read(&number, 4) != 4) number = 0; + number = swordtoarch32(number); + } number++; FileMgr::getSystemFileMgr()->close(datafile); datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC); - sprintf(incfile, "%.7d", number-1); + incfile.setFormatted("%.7d", number-1); number = archtosword32(number); datafile->write(&number, 4); @@ -208,7 +210,7 @@ char *RawFiles::getNextFilename() { } -char RawFiles::createModule (const char *path) { +char RawFiles::createModule(const char *path) { char *incfile = new char [ strlen (path) + 16 ]; __u32 zero = 0; diff --git a/src/modules/comments/swcom.cpp b/src/modules/comments/swcom.cpp index e82751b..52bd61b 100644 --- a/src/modules/comments/swcom.cpp +++ b/src/modules/comments/swcom.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * swcom.cpp - code for base class 'SWCom'- The basis for all commentary - * modules * + * swcom.cpp - code for base class 'SWCom'- The basis for all commentary + * modules * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swcom.cpp 2893 2013-07-16 03:07:02Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -41,9 +43,9 @@ SWCom::SWCom(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTex this->versification = 0; stdstr(&(this->versification), versification); delete key; - key = (VerseKey *)CreateKey(); - tmpVK1 = (VerseKey *)CreateKey(); - tmpVK2 = (VerseKey *)CreateKey(); + key = (VerseKey *)createKey(); + tmpVK1 = (VerseKey *)createKey(); + tmpVK2 = (VerseKey *)createKey(); tmpSecond = false; } @@ -59,7 +61,7 @@ SWCom::~SWCom() { } -SWKey *SWCom::CreateKey() const { +SWKey *SWCom::createKey() const { VerseKey *vk = new VerseKey(); vk->setVersificationSystem(versification); @@ -68,22 +70,20 @@ SWKey *SWCom::CreateKey() const { } -long SWCom::Index() const { +long SWCom::getIndex() const { VerseKey *key = &getVerseKey(); - entryIndex = key->Index(); + entryIndex = key->getIndex(); return entryIndex; } -long SWCom::Index(long iindex) { +void SWCom::setIndex(long iindex) { VerseKey *key = &getVerseKey(); - key->Testament(1); - key->Index(iindex); + key->setTestament(1); + key->setIndex(iindex); if (key != this->key) { this->key->copyFrom(*key); } - - return Index(); } @@ -104,7 +104,7 @@ VerseKey &SWCom::getVerseKey(const SWKey *keyToConvert) const { SWCATCH ( ... ) { } if (lkTest) { SWTRY { - key = SWDYNAMIC_CAST(VerseKey, lkTest->GetElement()); + key = SWDYNAMIC_CAST(VerseKey, lkTest->getElement()); } SWCATCH ( ... ) { } } diff --git a/src/modules/comments/zcom/zcom.cpp b/src/modules/comments/zcom/zcom.cpp index 35b8946..65c4ca8 100644 --- a/src/modules/comments/zcom/zcom.cpp +++ b/src/modules/comments/zcom/zcom.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * rawcom.cpp - code for class 'zCom'- a module that reads raw commentary - * files: ot and nt using indexs ??.bks ??.cps ??.vss * + * zcom.cpp - code for class 'zCom'- a module that reads raw commentary + * files * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: zcom.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,6 +25,7 @@ #include #include +#include #include #include #include @@ -59,7 +62,7 @@ zCom::~zCom() { } -bool zCom::isWritable() { +bool zCom::isWritable() const { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); } @@ -70,17 +73,17 @@ bool zCom::isWritable() { * * RET: string buffer with verse */ -SWBuf &zCom::getRawEntryBuf() { +SWBuf &zCom::getRawEntryBuf() const { long start = 0; unsigned short size = 0; unsigned long buffnum; VerseKey *key = &getVerseKey(); - findOffset(key->Testament(), key->TestamentIndex(), &start, &size, &buffnum); + findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size, &buffnum); entrySize = size; // support getEntrySize call entryBuf = ""; - zReadText(key->Testament(), start, size, buffnum, entryBuf); + zReadText(key->getTestament(), start, size, buffnum, entryBuf); rawFilter(entryBuf, key); @@ -92,18 +95,18 @@ SWBuf &zCom::getRawEntryBuf() { bool zCom::sameBlock(VerseKey *k1, VerseKey *k2) { - if (k1->Testament() != k2->Testament()) + if (k1->getTestament() != k2->getTestament()) return false; switch (blockType) { case VERSEBLOCKS: - if (k1->Verse() != k2->Verse()) + if (k1->getVerse() != k2->getVerse()) return false; case CHAPTERBLOCKS: - if (k1->Chapter() != k2->Chapter()) + if (k1->getChapter() != k2->getChapter()) return false; case BOOKBLOCKS: - if (k1->Book() != k2->Book()) + if (k1->getBook() != k2->getBook()) return false; } return true; @@ -120,7 +123,7 @@ void zCom::setEntry(const char *inbuf, long len) { delete lastWriteKey; } - doSetText(key->Testament(), key->TestamentIndex(), inbuf, len); + doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len); lastWriteKey = (VerseKey *)key->clone(); // must delete } @@ -130,7 +133,7 @@ void zCom::linkEntry(const SWKey *inkey) { VerseKey *destkey = &getVerseKey(); const VerseKey *srckey = &getVerseKey(inkey); - doLinkEntry(destkey->Testament(), destkey->TestamentIndex(), srckey->TestamentIndex()); + doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex()); if (inkey != srckey) // free our key if we created a VerseKey delete srckey; @@ -145,7 +148,7 @@ void zCom::linkEntry(const SWKey *inkey) { void zCom::deleteEntry() { VerseKey *key = &getVerseKey(); - doSetText(key->Testament(), key->TestamentIndex(), ""); + doSetText(key->getTestament(), key->getTestamentIndex(), ""); } @@ -163,7 +166,7 @@ void zCom::increment(int steps) { unsigned long buffnum; VerseKey *tmpkey = &getVerseKey(); - findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size, &buffnum); + findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size, &buffnum); SWKey lastgood = *tmpkey; while (steps) { @@ -173,12 +176,12 @@ void zCom::increment(int steps) { (steps > 0) ? ++(*key) : --(*key); tmpkey = &getVerseKey(); - if ((error = key->Error())) { + if ((error = key->popError())) { *key = lastgood; break; } - long index = tmpkey->TestamentIndex(); - findOffset(tmpkey->Testament(), index, &start, &size, &buffnum); + long index = tmpkey->getTestamentIndex(); + findOffset(tmpkey->getTestament(), index, &start, &size, &buffnum); if ( (((laststart != start) || (lastsize != size)) // we're a different entry // && (start > 0) @@ -197,10 +200,10 @@ bool zCom::isLinked(const SWKey *k1, const SWKey *k2) const { unsigned long buffnum1, buffnum2; VerseKey *vk1 = &getVerseKey(k1); VerseKey *vk2 = &getVerseKey(k2); - if (vk1->Testament() != vk2->Testament()) return false; + if (vk1->getTestament() != vk2->getTestament()) return false; - findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1, &buffnum1); - findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2, &buffnum2); + findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1, &buffnum1); + findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2, &buffnum2); return start1 == start2 && buffnum1 == buffnum2; } @@ -210,7 +213,7 @@ bool zCom::hasEntry(const SWKey *k) const { unsigned long buffnum; VerseKey *vk = &getVerseKey(k); - findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size, &buffnum); + findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size, &buffnum); return size; } diff --git a/src/modules/common/Makefile.am b/src/modules/common/Makefile.am index 34a14bf..90a3f98 100644 --- a/src/modules/common/Makefile.am +++ b/src/modules/common/Makefile.am @@ -6,7 +6,9 @@ libsword_la_SOURCES += $(commondir)/swcomprs.cpp libsword_la_SOURCES += $(commondir)/lzsscomprs.cpp if HAVE_LIBZ -SWZLIB = $(commondir)/zipcomprs.cpp +SWZLIB = $(commondir)/zipcomprs.cpp +SWZLIB += $(commondir)/bz2comprs.cpp +SWZLIB += $(commondir)/xzcomprs.cpp else SWZLIB = endif diff --git a/src/modules/common/bz2comprs.cpp b/src/modules/common/bz2comprs.cpp new file mode 100644 index 0000000..16f6d11 --- /dev/null +++ b/src/modules/common/bz2comprs.cpp @@ -0,0 +1,181 @@ +/****************************************************************************** + * + * bz2comprs.cpp - Bzip2Compress, a driver class that provides bzip2 + * compression (Burrows–Wheeler with Huffman coding) + * + * $Id: bz2comprs.cpp 2858 2013-07-08 03:08:10Z chrislit $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + + +#include +#include +#include +#include +#include + +SWORD_NAMESPACE_START + +/****************************************************************************** + * Bzip2Compress Constructor - Initializes data for instance of Bzip2Compress + * + */ + +Bzip2Compress::Bzip2Compress() : SWCompress() { +} + + +/****************************************************************************** + * Bzip2Compress Destructor - Cleans up instance of Bzip2Compress + */ + +Bzip2Compress::~Bzip2Compress() { +} + + +/****************************************************************************** + * Bzip2Compress::Encode - This function "encodes" the input stream into the + * output stream. + * The GetChars() and SendChars() functions are + * used to separate this method from the actual + * i/o. + * NOTE: must set zlen for parent class to know length of + * compressed buffer. + */ + +void Bzip2Compress::Encode(void) +{ +/* +ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); + Compresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be at least 0.1% larger than + sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the + compressed buffer. + This function can be used to compress a whole file at once if the + input file is mmap'ed. + compress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer. +*/ + direct = 0; // set direction needed by parent [Get|Send]Chars() + + // get buffer + char chunk[1024]; + char *buf = (char *)calloc(1, 1024); + char *chunkbuf = buf; + unsigned long chunklen; + unsigned long len = 0; + while((chunklen = GetChars(chunk, 1023))) { + memcpy(chunkbuf, chunk, chunklen); + len += chunklen; + if (chunklen < 1023) + break; + else buf = (char *)realloc(buf, len + 1024); + chunkbuf = buf+len; + } + + + zlen = (long) (len*1.001)+15; + char *zbuf = new char[zlen+1]; + if (len) + { + //printf("Doing compress\n"); + if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len) != Z_OK) + { + printf("ERROR in compression\n"); + } + else { + SendChars(zbuf, zlen); + } + } + else + { + fprintf(stderr, "ERROR: no buffer to compress\n"); + } + delete [] zbuf; + free (buf); +} + + +/****************************************************************************** + * Bzip2Compress::Decode - This function "decodes" the input stream into the + * output stream. + * The GetChars() and SendChars() functions are + * used to separate this method from the actual + * i/o. + */ + +void Bzip2Compress::Decode(void) +{ +/* +ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be large enough to hold the + entire uncompressed data. (The size of the uncompressed data must have + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer. + This function can be used to decompress a whole file at once if the + input file is mmap'ed. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted. +*/ + + // get buffer + char chunk[1024]; + char *zbuf = (char *)calloc(1, 1024); + char *chunkbuf = zbuf; + int chunklen; + unsigned long zlen = 0; + while((chunklen = GetChars(chunk, 1023))) { + memcpy(chunkbuf, chunk, chunklen); + zlen += chunklen; + if (chunklen < 1023) + break; + else zbuf = (char *)realloc(zbuf, zlen + 1024); + chunkbuf = zbuf + zlen; + } + + //printf("Decoding complength{%ld} uncomp{%ld}\n", zlen, blen); + if (zlen) { + unsigned long blen = zlen*20; // trust compression is less than 1000% + char *buf = new char[blen]; + //printf("Doing decompress {%s}\n", zbuf); + slen = 0; + switch (uncompress((Bytef*)buf, &blen, (Bytef*)zbuf, zlen)){ + case Z_OK: SendChars(buf, blen); slen = blen; break; + case Z_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break; + case Z_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break; + case Z_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break; + default: fprintf(stderr, "ERROR: an unknown error occured during decompression.\n"); break; + } + delete [] buf; + } + else { + fprintf(stderr, "ERROR: no buffer to decompress!\n"); + } + //printf("Finished decoding\n"); + free (zbuf); +} + +SWORD_NAMESPACE_END diff --git a/src/modules/common/compress.cpp.txt b/src/modules/common/compress.cpp.txt deleted file mode 100644 index 5031adb..0000000 --- a/src/modules/common/compress.cpp.txt +++ /dev/null @@ -1,767 +0,0 @@ -Compression Info, 10-11-95 -Jeff Wheeler - -Source of Algorithm -------------------- - -The compression algorithms used here are based upon the algorithms developed and published by Haruhiko Okumura in a paper entitled "Data Compression Algorithms of LARC and LHarc." This paper discusses three compression algorithms, LSZZ, LZARI, and LZHUF. LZSS is described as the "first" of these, and is described as providing moderate compression with good speed. LZARI is described as an improved LZSS, a combination of the LZSS algorithm with adaptive arithmetic compression. It is described as being slower than LZSS but with better compression. LZHUF (the basis of the common LHA compression program) was included in the paper, however, a free usage license was not included. - -The following are copies of the statements included at the beginning of each source code listing that was supplied in the working paper. - - LZSS, dated 4/6/89, marked as "Use, distribute and - modify this program freely." - - LZARI, dated 4/7/89, marked as "Use, distribute and - modify this program freely." - - LZHUF, dated 11/20/88, written by Haruyasu Yoshizaki, - translated by Haruhiko Okumura on 4/7/89. Not - expressly marked as redistributable or modifiable. - -Since both LZSS and LZARI are marked as "use, distribute and modify freely" we have felt at liberty basing our compression algorithm on either of these. - -Selection of Algorithm ----------------------- - -Working samples of three possible compression algorithms are supplied in Okumura's paper. Which should be used? - -LZSS is the fastest at decompression, but does not generated as small a compressed file as the other methods. The other two methods provided, perhaps, a 15% improvement in compression. Or, put another way, on a 100K file, LZSS might compress it to 50K while the others might approach 40-45K. For STEP purposes, it was decided that decoding speed was of more importance than tighter compression. For these reasons, the first compression algorithm implemented is the LZSS algorithm. - -About LZSS Encoding -------------------- - -(adapted from Haruhiko Okumura's paper) - -This scheme was proposed by Ziv and Lempel [1]. A slightly modified version is described by Storer and Szymanski [2]. An implementation using a binary tree has been proposed by Bell [3]. - -The algorithm is quite simple. -1. Keep a ring buffer which initially contains all space characters. -2. Read several letters from the file to the buffer. -3. Search the buffer for the longest string that matches the letters just read, and send its length and position into the buffer. - -If the ring buffer is 4096 bytes, the position can be stored in 12 bits. If the length is represented in 4 bits, the pair is two bytes long. If the longest match is no more than two characters, then just one character is sent without encoding. The process starts again with the next character. An extra bit is sent each time to tell the decoder whether the next item is a character of a pair. - -[1] J. Ziv and A. Lempel, IEEE Transactions IT-23, 337-343 (1977). -[2] J. A. Storer and T. G. Szymanski, J. ACM, 29, 928-951 (1982). -[3] T.C. Gell, IEEE Transactions COM-34, 1176-1182 (1986). - -void InitTree( // no return value - void); // no parameters - -void InsertNode( // no return value - short int Pos); // position in the buffer - -void DeleteNode( // no return value - short int Node); // node to be removed - -void Encode( // no return value - void); // no parameters - -void Decode( // no return value - void); // no parameters - -// The following are constant sizes used by the compression algorithm. -// -// N - This is the size of the ring buffer. It is set -// to 4K. It is important to note that a position -// within the ring buffer requires 12 bits. -// -// F - This is the maximum length of a character sequence -// that can be taken from the ring buffer. It is set -// to 18. Note that a length must be 3 before it is -// worthwhile to store a position/length pair, so the -// length can be encoded in only 4 bits. Or, put yet -// another way, it is not necessary to encode a length -// of 0-18, it is necessary to encode a length of -// 3-18, which requires 4 bits. -// -// THRESHOLD - It takes 2 bytes to store an offset and -// a length. If a character sequence only -// requires 1 or 2 characters to store -// uncompressed, then it is better to store -// it uncompressed than as an offset into -// the ring buffer. -// -// Note that the 12 bits used to store the position and the 4 bits -// used to store the length equal a total of 16 bits, or 2 bytes. - -#define N 4096 -#define F 18 -#define THRESHOLD 3 -#define NOT_USED N - -// m_ring_buffer is a text buffer. It contains "nodes" of -// uncompressed text that can be indexed by position. That is, -// a substring of the ring buffer can be indexed by a position -// and a length. When decoding, the compressed text may contain -// a position in the ring buffer and a count of the number of -// bytes from the ring buffer that are to be moved into the -// uncompressed buffer. -// -// This ring buffer is not maintained as part of the compressed -// text. Instead, it is reconstructed dynamically. That is, -// it starts out empty and gets built as the text is decompressed. -// -// The ring buffer contain N bytes, with an additional F - 1 bytes -// to facilitate string comparison. - -unsigned char m_ring_buffer[N + F - 1]; - -// m_match_position and m_match_length are set by InsertNode(). -// -// These variables indicate the position in the ring buffer -// and the number of characters at that position that match -// a given string. - -short int m_match_position; -short int m_match_length; - -// m_lson, m_rson, and m_dad are the Japanese way of referring to -// a tree structure. The dad is the parent and it has a right and -// left son (child). -// -// For i = 0 to N-1, m_rson[i] and m_lson[i] will be the right -// and left children of node i. -// -// For i = 0 to N-1, m_dad[i] is the parent of node i. -// -// For i = 0 to 255, rson[N + i + 1] is the root of the tree for -// strings that begin with the character i. Note that this requires -// one byte characters. -// -// These nodes store values of 0...(N-1). Memory requirements -// can be reduces by using 2-byte integers instead of full 4-byte -// integers (for 32-bit applications). Therefore, these are -// defined as "short ints." - -short int m_lson[N + 1]; -short int m_rson[N + 257]; -short int m_dad[N + 1]; - -/* - ------------------------------------------------------------------------- - cLZSS::InitTree - - This function initializes the tree nodes to "empty" states. - ------------------------------------------------------------------------- -*/ - -void cLZSS::InitTree( // no return value - void) // no parameters - throw() // exception list - - { - int i; - - // For i = 0 to N - 1, m_rson[i] and m_lson[i] will be the right - // and left children of node i. These nodes need not be - // initialized. However, for debugging purposes, it is nice to - // have them initialized. Since this is only used for compression - // (not decompression), I don't mind spending the time to do it. - // - // For the same range of i, m_dad[i] is the parent of node i. - // These are initialized to a known value that can represent - // a "not used" state. - - for (i = 0; i < N; i++) - { - m_lson[i] = NOT_USED; - m_rson[i] = NOT_USED; - m_dad[i] = NOT_USED; - } - - // For i = 0 to 255, m_rson[N + i + 1] is the root of the tree - // for strings that begin with the character i. This is why - // the right child array is larger than the left child array. - // These are also initialzied to a "not used" state. - // - // Note that there are 256 of these, one for each of the possible - // 256 characters. - - for (i = N + 1; i <= (N + 256); i++) - { - m_rson[i] = NOT_USED; - } - - // Done. - } - -/* - ------------------------------------------------------------------------- - cLZSS::InsertNode - - This function inserts a string from the ring buffer into one of - the trees. It loads the match position and length member variables - for the longest match. - - The string to be inserted is identified by the parameter Pos, - A full F bytes are inserted. So, m_ring_buffer[Pos ... Pos+F-1] - are inserted. - - If the matched length is exactly F, then an old node is removed - in favor of the new one (because the old one will be deleted - sooner). - - Note that Pos plays a dual role. It is used as both a position - in the ring buffer and also as a tree node. m_ring_buffer[Pos] - defines a character that is used to identify a tree node. - ------------------------------------------------------------------------- -*/ - -void cLZSS::InsertNode( // no return value - short int Pos) // position in the buffer - throw() // exception list - - { - short int i; - short int p; - int cmp; - unsigned char * key; - - ASSERT(Pos >= 0); - ASSERT(Pos < N); - - cmp = 1; - key = &(m_ring_buffer[Pos]); - - // The last 256 entries in m_rson contain the root nodes for - // strings that begin with a letter. Get an index for the - // first letter in this string. - - p = (short int) (N + 1 + key[0]); - - // Set the left and right tree nodes for this position to "not - // used." - - m_lson[Pos] = NOT_USED; - m_rson[Pos] = NOT_USED; - - // Haven't matched anything yet. - - m_match_length = 0; - - for ( ; ; ) - { - if (cmp >= 0) - { - if (m_rson[p] != NOT_USED) - { - p = m_rson[p]; - } - else - { - m_rson[p] = Pos; - m_dad[Pos] = p; - return; - } - } - else - { - if (m_lson[p] != NOT_USED) - { - p = m_lson[p]; - } - else - { - m_lson[p] = Pos; - m_dad[Pos] = p; - return; - } - } - - // Should we go to the right or the left to look for the - // next match? - - for (i = 1; i < F; i++) - { - cmp = key[i] - m_ring_buffer[p + i]; - if (cmp != 0) - break; - } - - if (i > m_match_length) - { - m_match_position = p; - m_match_length = i; - - if (i >= F) - break; - } - } - - m_dad[Pos] = m_dad[p]; - m_lson[Pos] = m_lson[p]; - m_rson[Pos] = m_rson[p]; - - m_dad[ m_lson[p] ] = Pos; - m_dad[ m_rson[p] ] = Pos; - - if (m_rson[ m_dad[p] ] == p) - { - m_rson[ m_dad[p] ] = Pos; - } - else - { - m_lson[ m_dad[p] ] = Pos; - } - - // Remove "p" - - m_dad[p] = NOT_USED; - } - -/* - ------------------------------------------------------------------------- - cLZSS::DeleteNode - - This function removes the node "Node" from the tree. - ------------------------------------------------------------------------- -*/ - -void cLZSS::DeleteNode( // no return value - short int Node) // node to be removed - throw() // exception list - - { - short int q; - - ASSERT(Node >= 0); - ASSERT(Node < (N+1)); - - if (m_dad[Node] == NOT_USED) - { - // not in tree, nothing to do - return; - } - - if (m_rson[Node] == NOT_USED) - { - q = m_lson[Node]; - } - else if (m_lson[Node] == NOT_USED) - { - q = m_rson[Node]; - } - else - { - q = m_lson[Node]; - if (m_rson[q] != NOT_USED) - { - do - { - q = m_rson[q]; - } - while (m_rson[q] != NOT_USED); - - m_rson[ m_dad[q] ] = m_lson[q]; - m_dad[ m_lson[q] ] = m_dad[q]; - m_lson[q] = m_lson[Node]; - m_dad[ m_lson[Node] ] = q; - } - - m_rson[q] = m_rson[Node]; - m_dad[ m_rson[Node] ] = q; - } - - m_dad[q] = m_dad[Node]; - - if (m_rson[ m_dad[Node] ] == Node) - { - m_rson[ m_dad[Node] ] = q; - } - else - { - m_lson[ m_dad[Node] ] = q; - } - - m_dad[Node] = NOT_USED; - } - -/* - ------------------------------------------------------------------------- - cLZSS::Encode - - This function "encodes" the input stream into the output stream. - The GetChars() and SendChars() functions are used to separate - this method from the actual i/o. - ------------------------------------------------------------------------- -*/ - -void cLZSS::Encode( // no return value - void) // no parameters - - { - short int i; // an iterator - short int r; // node number in the binary tree - short int s; // position in the ring buffer - unsigned short int len; // len of initial string - short int last_match_length; // length of last match - short int code_buf_pos; // position in the output buffer - unsigned char code_buf[17]; // the output buffer - unsigned char mask; // bit mask for byte 0 of out buf - unsigned char c; // character read from string - - // Start with a clean tree. - - InitTree(); - - // code_buf[0] works as eight flags. A "1" represents that the - // unit is an unencoded letter (1 byte), and a "0" represents - // that the next unit is a pair (2 bytes). - // - // code_buf[1..16] stores eight units of code. Since the best - // we can do is store eight pairs, at most 16 - // bytes are needed to store this. - // - // This is why the maximum size of the code buffer is 17 bytes. - - code_buf[0] = 0; - code_buf_pos = 1; - - // Mask iterates over the 8 bits in the code buffer. The first - // character ends up being stored in the low bit. - // - // bit 8 7 6 5 4 3 2 1 - // | | - // | first sequence in code buffer - // | - // last sequence in code buffer - - mask = 1; - - s = 0; - r = (short int) N - (short int) F; - - // Initialize the ring buffer with spaces... - - // Note that the last F bytes of the ring buffer are not filled. - // This is because those F bytes will be filled in immediately - // with bytes from the input stream. - - memset(m_ring_buffer, ' ', N - F); - - // Read F bytes into the last F bytes of the ring buffer. - // - // This function loads the buffer with X characters and returns - // the actual amount loaded. - - len = GetChars(&(m_ring_buffer[r]), F); - - // Make sure there is something to be compressed. - - if (len == 0) - return; - - // Insert the F strings, each of which begins with one or more - // 'space' characters. Note the order in which these strings - // are inserted. This way, degenerate trees will be less likely - // to occur. - - for (i = 1; i <= F; i++) - { - InsertNode((short int) (r - i)); - } - - // Finally, insert the whole string just read. The - // member variables match_length and match_position are set. - - InsertNode(r); - - // Now that we're preloaded, continue till done. - - do - { - - // m_match_length may be spuriously long near the end of - // text. - - if (m_match_length > len) - { - m_match_length = len; - } - - // Is it cheaper to store this as a single character? If so, - // make it so. - - if (m_match_length < THRESHOLD) - { - // Send one character. Remember that code_buf[0] is the - // set of flags for the next eight items. - - m_match_length = 1; - code_buf[0] |= mask; - code_buf[code_buf_pos++] = m_ring_buffer[r]; - } - - // Otherwise, we do indeed have a string that can be stored - // compressed to save space. - - else - { - // The next 16 bits need to contain the position (12 bits) - // and the length (4 bits). - - code_buf[code_buf_pos++] = (unsigned char) m_match_position; - code_buf[code_buf_pos++] = (unsigned char) ( - ((m_match_position >> 4) & 0xf0) | - (m_match_length - THRESHOLD) ); - } - - // Shift the mask one bit to the left so that it will be ready - // to store the new bit. - - mask = (unsigned char) (mask << 1); - - // If the mask is now 0, then we know that we have a full set - // of flags and items in the code buffer. These need to be - // output. - - if (mask == 0) - { - // code_buf is the buffer of characters to be output. - // code_buf_pos is the number of characters it contains. - - SendChars(code_buf, code_buf_pos); - - // Reset for next buffer... - - code_buf[0] = 0; - code_buf_pos = 1; - mask = 1; - } - - last_match_length = m_match_length; - - // Delete old strings and read new bytes... - - for (i = 0; i < last_match_length; i++) - { - - // Get next character... - - if (GetChars(&c, 1) != 1) - break; - - // Delete "old strings" - - DeleteNode(s); - - // Put this character into the ring buffer. - // - // The original comment here says "If the position is near - // the end of the buffer, extend the buffer to make - // string comparison easier." - // - // That's a little misleading, because the "end" of the - // buffer is really what we consider to be the "beginning" - // of the buffer, that is, positions 0 through F. - // - // The idea is that the front end of the buffer is duplicated - // into the back end so that when you're looking at characters - // at the back end of the buffer, you can index ahead (beyond - // the normal end of the buffer) and see the characters - // that are at the front end of the buffer wihtout having - // to adjust the index. - // - // That is... - // - // 1234xxxxxxxxxxxxxxxxxxxxxxxxxxxxx1234 - // | | | - // position 0 end of buffer | - // | - // duplicate of front of buffer - - m_ring_buffer[s] = c; - - if (s < F - 1) - { - m_ring_buffer[s + N] = c; - } - - // Increment the position, and wrap around when we're at - // the end. Note that this relies on N being a power of 2. - - s = (short int) ( (s + 1) & (N - 1) ); - r = (short int) ( (r + 1) & (N - 1) ); - - // Register the string that is found in - // m_ring_buffer[r..r+F-1]. - - InsertNode(r); - } - - // If we didn't quit because we hit the last_match_length, - // then we must have quit because we ran out of characters - // to process. - - while (i++ < last_match_length) - { - DeleteNode(s); - - s = (short int) ( (s + 1) & (N - 1) ); - r = (short int) ( (r + 1) & (N - 1) ); - - // Note that len hitting 0 is the key that causes the - // do...while() to terminate. This is the only place - // within the loop that len is modified. - // - // Its original value is F (or a number less than F for - // short strings). - - if (--len) - { - InsertNode(r); /* buffer may not be empty. */ - } - } - - // End of do...while() loop. Continue processing until there - // are no more characters to be compressed. The variable - // "len" is used to signal this condition. - } - while (len > 0); - - // There could still be something in the output buffer. Send it - // now. - - if (code_buf_pos > 1) - { - // code_buf is the encoded string to send. - // code_buf_ptr is the number of characters. - - SendChars(code_buf, code_buf_pos); - } - - // Done! - } - -/* - ------------------------------------------------------------------------- - cLZSS::Decode - - This function "decodes" the input stream into the output stream. - The GetChars() and SendChars() functions are used to separate - this method from the actual i/o. - ------------------------------------------------------------------------- -*/ - -void cLZSS::Decode( // no return value - void) // no parameters - - { - int k; - int r; // node number - unsigned char c[F]; // an array of chars - unsigned char flags; // 8 bits of flags - int flag_count; // which flag we're on - short int pos; // position in the ring buffer - short int len; // number of chars in ring buffer - - // Initialize the ring buffer with a common string. - // - // Note that the last F bytes of the ring buffer are not filled. - - memset(m_ring_buffer, ' ', N - F); - - r = N - F; - - flags = (char) 0; - flag_count = 0; - - for ( ; ; ) - { - - // If there are more bits of interest in this flag, then - // shift that next interesting bit into the 1's position. - // - // If this flag has been exhausted, the next byte must - // be a flag. - - if (flag_count > 0) - { - flags = (unsigned char) (flags >> 1); - flag_count--; - } - else - { - // Next byte must be a flag. - - if (GetChars(&flags, 1) != 1) - break; - - // Set the flag counter. While at first it might appear - // that this should be an 8 since there are 8 bits in the - // flag, it should really be a 7 because the shift must - // be performed 7 times in order to see all 8 bits. - - flag_count = 7; - } - - // If the low order bit of the flag is now set, then we know - // that the next byte is a single, unencoded character. - - if (flags & 1) - { - if (GetChars(c, 1) != 1) - break; - - if (SendChars(c, 1) != 1) - break; - - // Add to buffer, and increment to next spot. Wrap at end. - - m_ring_buffer[r] = c[0]; - r = (short int) ( (r + 1) & (N - 1) ); - } - - // Otherwise, we know that the next two bytes are a - // pair. The position is in 12 bits and - // the length is in 4 bits. - - else - { - // Original code: - // if ((i = getc(infile)) == EOF) - // break; - // if ((j = getc(infile)) == EOF) - // break; - // i |= ((j & 0xf0) << 4); - // j = (j & 0x0f) + THRESHOLD; - // - // I've modified this to only make one input call, and - // have changed the variable names to something more - // obvious. - - if (GetChars(c, 2) != 2) - break; - - // Convert these two characters into the position and - // length. Note that the length is always at least - // THRESHOLD, which is why we're able to get a length - // of 18 out of only 4 bits. - - pos = (short int) ( c[0] | ((c[1] & 0xf0) << 4) ); - - len = (short int) ( (c[1] & 0x0f) + THRESHOLD ); - - // There are now "len" characters at position "pos" in - // the ring buffer that can be pulled out. Note that - // len is never more than F. - - for (k = 0; k < len; k++) - { - c[k] = m_ring_buffer[(pos + k) & (N - 1)]; - - // Add to buffer, and increment to next spot. Wrap at end. - - m_ring_buffer[r] = c[k]; - r = (short int) ( (r + 1) & (N - 1) ); - } - - // Add the "len" characters to the output stream. - - if (SendChars(c, len) != len) - break; - } - } - } - diff --git a/src/modules/common/entriesblk.cpp b/src/modules/common/entriesblk.cpp index 6e4c9aa..4872d28 100644 --- a/src/modules/common/entriesblk.cpp +++ b/src/modules/common/entriesblk.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * entriesblk.cpp - EntriesBlock facilitates compressed lex/dict modules + * + * $Id: entriesblk.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/common/lzsscomprs.cpp b/src/modules/common/lzsscomprs.cpp index 624942d..ef1bc8c 100644 --- a/src/modules/common/lzsscomprs.cpp +++ b/src/modules/common/lzsscomprs.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * lzsscomprs.cpp - code for class 'LZSSCompress'- a driver class that - * provides LZSS compression * + * lzssomprs.cpp - LZSSCompress: a driver class that provides LZSS + * compression + * + * $Id: lzsscomprs.cpp 2935 2013-08-02 11:06:30Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,8 +25,52 @@ #include #include +// The following are constant sizes used by the compression algorithm. +// +// N - This is the size of the ring buffer. It is set +// to 4K. It is important to note that a position +// within the ring buffer requires 12 bits. +// +// F - This is the maximum length of a character sequence +// that can be taken from the ring buffer. It is set +// to 18. Note that a length must be 3 before it is +// worthwhile to store a position/length pair, so the +// length can be encoded in only 4 bits. Or, put yet +// another way, it is not necessary to encode a length +// of 0-18, it is necessary to encode a length of +// 3-18, which requires 4 bits. +// +// THRESHOLD - It takes 2 bytes to store an offset and +// a length. If a character sequence only +// requires 1 or 2 characters to store +// uncompressed, then it is better to store +// it uncompressed than as an offset into +// the ring buffer. +// +// Note that the 12 bits used to store the position and the 4 bits +// used to store the length equal a total of 16 bits, or 2 bytes. + +#define N 4096 +#define F 18 +#define THRESHOLD 3 +#define NOT_USED N + + SWORD_NAMESPACE_START +class LZSSCompress::Private { +public: + static unsigned char m_ring_buffer[N + F - 1]; + static short int m_match_position; + static short int m_match_length; + static short int m_lson[N + 1]; + static short int m_rson[N + 257]; + static short int m_dad[N + 1]; + void InitTree(); + void InsertNode(short int Pos); + void DeleteNode(short int Node); +}; + /****************************************************************************** * LZSSCompress Statics */ @@ -44,7 +90,7 @@ SWORD_NAMESPACE_START // The ring buffer contain N bytes, with an additional F - 1 bytes // to facilitate string comparison. -unsigned char LZSSCompress::m_ring_buffer[N + F - 1]; +unsigned char LZSSCompress::Private::m_ring_buffer[N + F - 1]; // m_match_position and m_match_length are set by InsertNode(). // @@ -52,8 +98,8 @@ unsigned char LZSSCompress::m_ring_buffer[N + F - 1]; // and the number of characters at that position that match // a given string. -short int LZSSCompress::m_match_position; -short int LZSSCompress::m_match_length; +short int LZSSCompress::Private::m_match_position; +short int LZSSCompress::Private::m_match_length; // m_lson, m_rson, and m_dad are the Japanese way of referring to // a tree structure. The dad is the parent and it has a right and @@ -73,9 +119,9 @@ short int LZSSCompress::m_match_length; // integers (for 32-bit applications). Therefore, these are // defined as "short ints." -short int LZSSCompress::m_lson[N + 1]; -short int LZSSCompress::m_rson[N + 257]; -short int LZSSCompress::m_dad[N + 1]; +short int LZSSCompress::Private::m_lson[N + 1]; +short int LZSSCompress::Private::m_rson[N + 257]; +short int LZSSCompress::Private::m_dad[N + 1]; /****************************************************************************** @@ -84,6 +130,7 @@ short int LZSSCompress::m_dad[N + 1]; */ LZSSCompress::LZSSCompress() : SWCompress() { + p = new Private(); } @@ -92,6 +139,7 @@ LZSSCompress::LZSSCompress() : SWCompress() { */ LZSSCompress::~LZSSCompress() { + delete p; } @@ -100,7 +148,7 @@ LZSSCompress::~LZSSCompress() { * "empty" states. */ -void LZSSCompress::InitTree(void) { +void LZSSCompress::Private::InitTree(void) { int i; // For i = 0 to N - 1, m_rson[i] and m_lson[i] will be the right @@ -159,7 +207,7 @@ void LZSSCompress::InitTree(void) { * ENT: pos - position in the buffer */ -void LZSSCompress::InsertNode(short int Pos) +void LZSSCompress::Private::InsertNode(short int Pos) { short int i; short int p; @@ -257,7 +305,7 @@ void LZSSCompress::InsertNode(short int Pos) * ENT: node - node to be removed */ -void LZSSCompress::DeleteNode(short int Node) +void LZSSCompress::Private::DeleteNode(short int Node) { short int q; @@ -330,7 +378,7 @@ void LZSSCompress::Encode(void) // Start with a clean tree. - InitTree(); + p->InitTree(); direct = 0; // set direction needed by parent [Get|Send]Chars() // code_buf[0] works as eight flags. A "1" represents that the @@ -366,14 +414,14 @@ void LZSSCompress::Encode(void) // This is because those F bytes will be filled in immediately // with bytes from the input stream. - memset(m_ring_buffer, ' ', N - F); + memset(p->m_ring_buffer, ' ', N - F); // Read F bytes into the last F bytes of the ring buffer. // // This function loads the buffer with X characters and returns // the actual amount loaded. - len = GetChars((char *) &(m_ring_buffer[r]), F); + len = GetChars((char *) &(p->m_ring_buffer[r]), F); // Make sure there is something to be compressed. @@ -386,13 +434,13 @@ void LZSSCompress::Encode(void) // to occur. for (i = 1; i <= F; i++) { - InsertNode((short int) (r - i)); + p->InsertNode((short int) (r - i)); } // Finally, insert the whole string just read. The // member variables match_length and match_position are set. - InsertNode(r); + p->InsertNode(r); // Now that we're preloaded, continue till done. @@ -401,20 +449,20 @@ void LZSSCompress::Encode(void) // m_match_length may be spuriously long near the end of // text. - if (m_match_length > len) { - m_match_length = len; + if (p->m_match_length > len) { + p->m_match_length = len; } // Is it cheaper to store this as a single character? If so, // make it so. - if (m_match_length < THRESHOLD) { + if (p->m_match_length < THRESHOLD) { // Send one character. Remember that code_buf[0] is the // set of flags for the next eight items. - m_match_length = 1; + p->m_match_length = 1; code_buf[0] |= mask; - code_buf[code_buf_pos++] = m_ring_buffer[r]; + code_buf[code_buf_pos++] = p->m_ring_buffer[r]; } // Otherwise, we do indeed have a string that can be stored @@ -424,10 +472,10 @@ void LZSSCompress::Encode(void) // The next 16 bits need to contain the position (12 bits) // and the length (4 bits). - code_buf[code_buf_pos++] = (unsigned char) m_match_position; + code_buf[code_buf_pos++] = (unsigned char) p->m_match_position; code_buf[code_buf_pos++] = (unsigned char) ( - ((m_match_position >> 4) & 0xf0) | - (m_match_length - THRESHOLD) ); + ((p->m_match_position >> 4) & 0xf0) | + (p->m_match_length - THRESHOLD) ); } // Shift the mask one bit to the left so that it will be ready @@ -452,7 +500,7 @@ void LZSSCompress::Encode(void) mask = 1; } - last_match_length = m_match_length; + last_match_length = p->m_match_length; // Delete old strings and read new bytes... @@ -464,7 +512,7 @@ void LZSSCompress::Encode(void) // Delete "old strings" - DeleteNode(s); + p->DeleteNode(s); // Put this character into the ring buffer. // @@ -491,10 +539,10 @@ void LZSSCompress::Encode(void) // | // duplicate of front of buffer - m_ring_buffer[s] = c; + p->m_ring_buffer[s] = c; if (s < F - 1) { - m_ring_buffer[s + N] = c; + p->m_ring_buffer[s + N] = c; } // Increment the position, and wrap around when we're at @@ -506,7 +554,7 @@ void LZSSCompress::Encode(void) // Register the string that is found in // m_ring_buffer[r..r+F-1]. - InsertNode(r); + p->InsertNode(r); } // If we didn't quit because we hit the last_match_length, @@ -514,7 +562,7 @@ void LZSSCompress::Encode(void) // to process. while (i++ < last_match_length) { - DeleteNode(s); + p->DeleteNode(s); s = (short int) ( (s + 1) & (N - 1) ); r = (short int) ( (r + 1) & (N - 1) ); @@ -527,7 +575,7 @@ void LZSSCompress::Encode(void) // short strings). if (--len) { - InsertNode(r); /* buffer may not be empty. */ + p->InsertNode(r); /* buffer may not be empty. */ } } @@ -577,7 +625,7 @@ void LZSSCompress::Decode(void) // // Note that the last F bytes of the ring buffer are not filled. - memset(m_ring_buffer, ' ', N - F); + memset(p->m_ring_buffer, ' ', N - F); r = N - F; @@ -624,7 +672,7 @@ void LZSSCompress::Decode(void) // Add to buffer, and increment to next spot. Wrap at end. - m_ring_buffer[r] = c[0]; + p->m_ring_buffer[r] = c[0]; r = (short int) ( (r + 1) & (N - 1) ); } @@ -662,11 +710,11 @@ void LZSSCompress::Decode(void) // len is never more than F. for (k = 0; k < len; k++) { - c[k] = m_ring_buffer[(pos + k) & (N - 1)]; + c[k] = p->m_ring_buffer[(pos + k) & (N - 1)]; // Add to buffer, and increment to next spot. Wrap at end. - m_ring_buffer[r] = c[k]; + p->m_ring_buffer[r] = c[k]; r = (short int) ( (r + 1) & (N - 1) ); } diff --git a/src/modules/common/lzsscomprs.txt b/src/modules/common/lzsscomprs.txt new file mode 100644 index 0000000..b6817f2 --- /dev/null +++ b/src/modules/common/lzsscomprs.txt @@ -0,0 +1,802 @@ +The following is the original information send from Parson's Technologies via +Craig Rairden. +_______________________________________________________________________________ +Compression Info, 10-11-95 +Jeff Wheeler + +Source of Algorithm +------------------- + +The compression algorithms used here are based upon the algorithms developed +and published by Haruhiko Okumura in a paper entitled "Data Compression +Algorithms of LARC and LHarc." This paper discusses three compression +algorithms, LSZZ, LZARI, and LZHUF. LZSS is described as the "first" of +these, and is described as providing moderate compression with good speed. +LZARI is described as an improved LZSS, a combination of the LZSS algorithm +with adaptive arithmetic compression. It is described as being slower than +LZSS but with better compression. LZHUF (the basis of the common LHA +compression program) was included in the paper, however, a free usage license +was not included. + +The following are copies of the statements included at the beginning of each +source code listing that was supplied in the working paper. + + LZSS, dated 4/6/89, marked as "Use, distribute and + modify this program freely." + + LZARI, dated 4/7/89, marked as "Use, distribute and + modify this program freely." + + LZHUF, dated 11/20/88, written by Haruyasu Yoshizaki, + translated by Haruhiko Okumura on 4/7/89. Not + expressly marked as redistributable or modifiable. + +Since both LZSS and LZARI are marked as "use, distribute and modify freely" we +have felt at liberty basing our compression algorithm on either of these. + +Selection of Algorithm +---------------------- + +Working samples of three possible compression algorithms are supplied in +Okumura's paper. Which should be used? + +LZSS is the fastest at decompression, but does not generated as small a +compressed file as the other methods. The other two methods provided, perhaps, +a 15% improvement in compression. Or, put another way, on a 100K file, LZSS +might compress it to 50K while the others might approach 40-45K. For STEP +purposes, it was decided that decoding speed was of more importance than +tighter compression. For these reasons, the first compression algorithm +implemented is the LZSS algorithm. + +About LZSS Encoding +------------------- + +(adapted from Haruhiko Okumura's paper) + +This scheme was proposed by Ziv and Lempel [1]. A slightly modified version +is described by Storer and Szymanski [2]. An implementation using a binary +tree has been proposed by Bell [3]. + +The algorithm is quite simple. +1. Keep a ring buffer which initially contains all space characters. +2. Read several letters from the file to the buffer. +3. Search the buffer for the longest string that matches the letters just + read, and send its length and position into the buffer. + +If the ring buffer is 4096 bytes, the position can be stored in 12 bits. If the +length is represented in 4 bits, the pair is two bytes +long. If the longest match is no more than two characters, then just one +character is sent without encoding. The process starts again with the next +character. An extra bit is sent each time to tell the decoder whether the +next item is a character of a pair. + +[1] J. Ziv and A. Lempel, IEEE Transactions IT-23, 337-343 (1977). +[2] J. A. Storer and T. G. Szymanski, J. ACM, 29, 928-951 (1982). +[3] T.C. Gell, IEEE Transactions COM-34, 1176-1182 (1986). + +class SWCompress { +public: +void InitTree( // no return value + void); // no parameters + +void InsertNode( // no return value + short int Pos); // position in the buffer + +void DeleteNode( // no return value + short int Node); // node to be removed + +void Encode( // no return value + void); // no parameters + +void Decode( // no return value + void); // no parameters +}; + +// The following are constant sizes used by the compression algorithm. +// +// N - This is the size of the ring buffer. It is set +// to 4K. It is important to note that a position +// within the ring buffer requires 12 bits. +// +// F - This is the maximum length of a character sequence +// that can be taken from the ring buffer. It is set +// to 18. Note that a length must be 3 before it is +// worthwhile to store a position/length pair, so the +// length can be encoded in only 4 bits. Or, put yet +// another way, it is not necessary to encode a length +// of 0-18, it is necessary to encode a length of +// 3-18, which requires 4 bits. +// +// THRESHOLD - It takes 2 bytes to store an offset and +// a length. If a character sequence only +// requires 1 or 2 characters to store +// uncompressed, then it is better to store +// it uncompressed than as an offset into +// the ring buffer. +// +// Note that the 12 bits used to store the position and the 4 bits +// used to store the length equal a total of 16 bits, or 2 bytes. + +#define N 4096 +#define F 18 +#define THRESHOLD 3 +#define NOT_USED N + +// m_ring_buffer is a text buffer. It contains "nodes" of +// uncompressed text that can be indexed by position. That is, +// a substring of the ring buffer can be indexed by a position +// and a length. When decoding, the compressed text may contain +// a position in the ring buffer and a count of the number of +// bytes from the ring buffer that are to be moved into the +// uncompressed buffer. +// +// This ring buffer is not maintained as part of the compressed +// text. Instead, it is reconstructed dynamically. That is, +// it starts out empty and gets built as the text is decompressed. +// +// The ring buffer contain N bytes, with an additional F - 1 bytes +// to facilitate string comparison. + +unsigned char m_ring_buffer[N + F - 1]; + +// m_match_position and m_match_length are set by InsertNode(). +// +// These variables indicate the position in the ring buffer +// and the number of characters at that position that match +// a given string. + +short int m_match_position; +short int m_match_length; + +// m_lson, m_rson, and m_dad are the Japanese way of referring to +// a tree structure. The dad is the parent and it has a right and +// left son (child). +// +// For i = 0 to N-1, m_rson[i] and m_lson[i] will be the right +// and left children of node i. +// +// For i = 0 to N-1, m_dad[i] is the parent of node i. +// +// For i = 0 to 255, rson[N + i + 1] is the root of the tree for +// strings that begin with the character i. Note that this requires +// one byte characters. +// +// These nodes store values of 0...(N-1). Memory requirements +// can be reduces by using 2-byte integers instead of full 4-byte +// integers (for 32-bit applications). Therefore, these are +// defined as "short ints." + +short int m_lson[N + 1]; +short int m_rson[N + 257]; +short int m_dad[N + 1]; + + + + +/* + ------------------------------------------------------------------------- + cLZSS::InitTree + + This function initializes the tree nodes to "empty" states. + ------------------------------------------------------------------------- +*/ + +void cLZSS::InitTree( // no return value + void) // no parameters + throw() // exception list + + { + int i; + + // For i = 0 to N - 1, m_rson[i] and m_lson[i] will be the right + // and left children of node i. These nodes need not be + // initialized. However, for debugging purposes, it is nice to + // have them initialized. Since this is only used for compression + // (not decompression), I don't mind spending the time to do it. + // + // For the same range of i, m_dad[i] is the parent of node i. + // These are initialized to a known value that can represent + // a "not used" state. + + for (i = 0; i < N; i++) + { + m_lson[i] = NOT_USED; + m_rson[i] = NOT_USED; + m_dad[i] = NOT_USED; + } + + // For i = 0 to 255, m_rson[N + i + 1] is the root of the tree + // for strings that begin with the character i. This is why + // the right child array is larger than the left child array. + // These are also initialzied to a "not used" state. + // + // Note that there are 256 of these, one for each of the possible + // 256 characters. + + for (i = N + 1; i <= (N + 256); i++) + { + m_rson[i] = NOT_USED; + } + + // Done. + } + +/* + ------------------------------------------------------------------------- + cLZSS::InsertNode + + This function inserts a string from the ring buffer into one of + the trees. It loads the match position and length member variables + for the longest match. + + The string to be inserted is identified by the parameter Pos, + A full F bytes are inserted. So, m_ring_buffer[Pos ... Pos+F-1] + are inserted. + + If the matched length is exactly F, then an old node is removed + in favor of the new one (because the old one will be deleted + sooner). + + Note that Pos plays a dual role. It is used as both a position + in the ring buffer and also as a tree node. m_ring_buffer[Pos] + defines a character that is used to identify a tree node. + ------------------------------------------------------------------------- +*/ + +void cLZSS::InsertNode( // no return value + short int Pos) // position in the buffer + throw() // exception list + + { + short int i; + short int p; + int cmp; + unsigned char * key; + + ASSERT(Pos >= 0); + ASSERT(Pos < N); + + cmp = 1; + key = &(m_ring_buffer[Pos]); + + // The last 256 entries in m_rson contain the root nodes for + // strings that begin with a letter. Get an index for the + // first letter in this string. + + p = (short int) (N + 1 + key[0]); + + // Set the left and right tree nodes for this position to "not + // used." + + m_lson[Pos] = NOT_USED; + m_rson[Pos] = NOT_USED; + + // Haven't matched anything yet. + + m_match_length = 0; + + for ( ; ; ) + { + if (cmp >= 0) + { + if (m_rson[p] != NOT_USED) + { + p = m_rson[p]; + } + else + { + m_rson[p] = Pos; + m_dad[Pos] = p; + return; + } + } + else + { + if (m_lson[p] != NOT_USED) + { + p = m_lson[p]; + } + else + { + m_lson[p] = Pos; + m_dad[Pos] = p; + return; + } + } + + // Should we go to the right or the left to look for the + // next match? + + for (i = 1; i < F; i++) + { + cmp = key[i] - m_ring_buffer[p + i]; + if (cmp != 0) + break; + } + + if (i > m_match_length) + { + m_match_position = p; + m_match_length = i; + + if (i >= F) + break; + } + } + + m_dad[Pos] = m_dad[p]; + m_lson[Pos] = m_lson[p]; + m_rson[Pos] = m_rson[p]; + + m_dad[ m_lson[p] ] = Pos; + m_dad[ m_rson[p] ] = Pos; + + if (m_rson[ m_dad[p] ] == p) + { + m_rson[ m_dad[p] ] = Pos; + } + else + { + m_lson[ m_dad[p] ] = Pos; + } + + // Remove "p" + + m_dad[p] = NOT_USED; + } + +/* + ------------------------------------------------------------------------- + cLZSS::DeleteNode + + This function removes the node "Node" from the tree. + ------------------------------------------------------------------------- +*/ + +void cLZSS::DeleteNode( // no return value + short int Node) // node to be removed + throw() // exception list + + { + short int q; + + ASSERT(Node >= 0); + ASSERT(Node < (N+1)); + + if (m_dad[Node] == NOT_USED) + { + // not in tree, nothing to do + return; + } + + if (m_rson[Node] == NOT_USED) + { + q = m_lson[Node]; + } + else if (m_lson[Node] == NOT_USED) + { + q = m_rson[Node]; + } + else + { + q = m_lson[Node]; + if (m_rson[q] != NOT_USED) + { + do + { + q = m_rson[q]; + } + while (m_rson[q] != NOT_USED); + + m_rson[ m_dad[q] ] = m_lson[q]; + m_dad[ m_lson[q] ] = m_dad[q]; + m_lson[q] = m_lson[Node]; + m_dad[ m_lson[Node] ] = q; + } + + m_rson[q] = m_rson[Node]; + m_dad[ m_rson[Node] ] = q; + } + + m_dad[q] = m_dad[Node]; + + if (m_rson[ m_dad[Node] ] == Node) + { + m_rson[ m_dad[Node] ] = q; + } + else + { + m_lson[ m_dad[Node] ] = q; + } + + m_dad[Node] = NOT_USED; + } + +/* + ------------------------------------------------------------------------- + cLZSS::Encode + + This function "encodes" the input stream into the output stream. + The GetChars() and SendChars() functions are used to separate + this method from the actual i/o. + ------------------------------------------------------------------------- +*/ + +void cLZSS::Encode( // no return value + void) // no parameters + + { + short int i; // an iterator + short int r; // node number in the binary tree + short int s; // position in the ring buffer + unsigned short int len; // len of initial string + short int last_match_length; // length of last match + short int code_buf_pos; // position in the output buffer + unsigned char code_buf[17]; // the output buffer + unsigned char mask; // bit mask for byte 0 of out buf + unsigned char c; // character read from string + + // Start with a clean tree. + + InitTree(); + + // code_buf[0] works as eight flags. A "1" represents that the + // unit is an unencoded letter (1 byte), and a "0" represents + // that the next unit is a pair (2 bytes). + // + // code_buf[1..16] stores eight units of code. Since the best + // we can do is store eight pairs, at most 16 + // bytes are needed to store this. + // + // This is why the maximum size of the code buffer is 17 bytes. + + code_buf[0] = 0; + code_buf_pos = 1; + + // Mask iterates over the 8 bits in the code buffer. The first + // character ends up being stored in the low bit. + // + // bit 8 7 6 5 4 3 2 1 + // | | + // | first sequence in code buffer + // | + // last sequence in code buffer + + mask = 1; + + s = 0; + r = (short int) N - (short int) F; + + // Initialize the ring buffer with spaces... + + // Note that the last F bytes of the ring buffer are not filled. + // This is because those F bytes will be filled in immediately + // with bytes from the input stream. + + memset(m_ring_buffer, ' ', N - F); + + // Read F bytes into the last F bytes of the ring buffer. + // + // This function loads the buffer with X characters and returns + // the actual amount loaded. + + len = GetChars(&(m_ring_buffer[r]), F); + + // Make sure there is something to be compressed. + + if (len == 0) + return; + + // Insert the F strings, each of which begins with one or more + // 'space' characters. Note the order in which these strings + // are inserted. This way, degenerate trees will be less likely + // to occur. + + for (i = 1; i <= F; i++) + { + InsertNode((short int) (r - i)); + } + + // Finally, insert the whole string just read. The + // member variables match_length and match_position are set. + + InsertNode(r); + + // Now that we're preloaded, continue till done. + + do + { + + // m_match_length may be spuriously long near the end of + // text. + + if (m_match_length > len) + { + m_match_length = len; + } + + // Is it cheaper to store this as a single character? If so, + // make it so. + + if (m_match_length < THRESHOLD) + { + // Send one character. Remember that code_buf[0] is the + // set of flags for the next eight items. + + m_match_length = 1; + code_buf[0] |= mask; + code_buf[code_buf_pos++] = m_ring_buffer[r]; + } + + // Otherwise, we do indeed have a string that can be stored + // compressed to save space. + + else + { + // The next 16 bits need to contain the position (12 bits) + // and the length (4 bits). + + code_buf[code_buf_pos++] = (unsigned char) m_match_position; + code_buf[code_buf_pos++] = (unsigned char) ( + ((m_match_position >> 4) & 0xf0) | + (m_match_length - THRESHOLD) ); + } + + // Shift the mask one bit to the left so that it will be ready + // to store the new bit. + + mask = (unsigned char) (mask << 1); + + // If the mask is now 0, then we know that we have a full set + // of flags and items in the code buffer. These need to be + // output. + + if (mask == 0) + { + // code_buf is the buffer of characters to be output. + // code_buf_pos is the number of characters it contains. + + SendChars(code_buf, code_buf_pos); + + // Reset for next buffer... + + code_buf[0] = 0; + code_buf_pos = 1; + mask = 1; + } + + last_match_length = m_match_length; + + // Delete old strings and read new bytes... + + for (i = 0; i < last_match_length; i++) + { + + // Get next character... + + if (GetChars(&c, 1) != 1) + break; + + // Delete "old strings" + + DeleteNode(s); + + // Put this character into the ring buffer. + // + // The original comment here says "If the position is near + // the end of the buffer, extend the buffer to make + // string comparison easier." + // + // That's a little misleading, because the "end" of the + // buffer is really what we consider to be the "beginning" + // of the buffer, that is, positions 0 through F. + // + // The idea is that the front end of the buffer is duplicated + // into the back end so that when you're looking at characters + // at the back end of the buffer, you can index ahead (beyond + // the normal end of the buffer) and see the characters + // that are at the front end of the buffer wihtout having + // to adjust the index. + // + // That is... + // + // 1234xxxxxxxxxxxxxxxxxxxxxxxxxxxxx1234 + // | | | + // position 0 end of buffer | + // | + // duplicate of front of buffer + + m_ring_buffer[s] = c; + + if (s < F - 1) + { + m_ring_buffer[s + N] = c; + } + + // Increment the position, and wrap around when we're at + // the end. Note that this relies on N being a power of 2. + + s = (short int) ( (s + 1) & (N - 1) ); + r = (short int) ( (r + 1) & (N - 1) ); + + // Register the string that is found in + // m_ring_buffer[r..r+F-1]. + + InsertNode(r); + } + + // If we didn't quit because we hit the last_match_length, + // then we must have quit because we ran out of characters + // to process. + + while (i++ < last_match_length) + { + DeleteNode(s); + + s = (short int) ( (s + 1) & (N - 1) ); + r = (short int) ( (r + 1) & (N - 1) ); + + // Note that len hitting 0 is the key that causes the + // do...while() to terminate. This is the only place + // within the loop that len is modified. + // + // Its original value is F (or a number less than F for + // short strings). + + if (--len) + { + InsertNode(r); /* buffer may not be empty. */ + } + } + + // End of do...while() loop. Continue processing until there + // are no more characters to be compressed. The variable + // "len" is used to signal this condition. + } + while (len > 0); + + // There could still be something in the output buffer. Send it + // now. + + if (code_buf_pos > 1) + { + // code_buf is the encoded string to send. + // code_buf_ptr is the number of characters. + + SendChars(code_buf, code_buf_pos); + } + + // Done! + } + +/* + ------------------------------------------------------------------------- + cLZSS::Decode + + This function "decodes" the input stream into the output stream. + The GetChars() and SendChars() functions are used to separate + this method from the actual i/o. + ------------------------------------------------------------------------- +*/ + +void cLZSS::Decode( // no return value + void) // no parameters + + { + int k; + int r; // node number + unsigned char c[F]; // an array of chars + unsigned char flags; // 8 bits of flags + int flag_count; // which flag we're on + short int pos; // position in the ring buffer + short int len; // number of chars in ring buffer + + // Initialize the ring buffer with a common string. + // + // Note that the last F bytes of the ring buffer are not filled. + + memset(m_ring_buffer, ' ', N - F); + + r = N - F; + + flags = (char) 0; + flag_count = 0; + + for ( ; ; ) + { + + // If there are more bits of interest in this flag, then + // shift that next interesting bit into the 1's position. + // + // If this flag has been exhausted, the next byte must + // be a flag. + + if (flag_count > 0) + { + flags = (unsigned char) (flags >> 1); + flag_count--; + } + else + { + // Next byte must be a flag. + + if (GetChars(&flags, 1) != 1) + break; + + // Set the flag counter. While at first it might appear + // that this should be an 8 since there are 8 bits in the + // flag, it should really be a 7 because the shift must + // be performed 7 times in order to see all 8 bits. + + flag_count = 7; + } + + // If the low order bit of the flag is now set, then we know + // that the next byte is a single, unencoded character. + + if (flags & 1) + { + if (GetChars(c, 1) != 1) + break; + + if (SendChars(c, 1) != 1) + break; + + // Add to buffer, and increment to next spot. Wrap at end. + + m_ring_buffer[r] = c[0]; + r = (short int) ( (r + 1) & (N - 1) ); + } + + // Otherwise, we know that the next two bytes are a + // pair. The position is in 12 bits and + // the length is in 4 bits. + + else + { + // Original code: + // if ((i = getc(infile)) == EOF) + // break; + // if ((j = getc(infile)) == EOF) + // break; + // i |= ((j & 0xf0) << 4); + // j = (j & 0x0f) + THRESHOLD; + // + // I've modified this to only make one input call, and + // have changed the variable names to something more + // obvious. + + if (GetChars(c, 2) != 2) + break; + + // Convert these two characters into the position and + // length. Note that the length is always at least + // THRESHOLD, which is why we're able to get a length + // of 18 out of only 4 bits. + + pos = (short int) ( c[0] | ((c[1] & 0xf0) << 4) ); + + len = (short int) ( (c[1] & 0x0f) + THRESHOLD ); + + // There are now "len" characters at position "pos" in + // the ring buffer that can be pulled out. Note that + // len is never more than F. + + for (k = 0; k < len; k++) + { + c[k] = m_ring_buffer[(pos + k) & (N - 1)]; + + // Add to buffer, and increment to next spot. Wrap at end. + + m_ring_buffer[r] = c[k]; + r = (short int) ( (r + 1) & (N - 1) ); + } + + // Add the "len" characters to the output stream. + + if (SendChars(c, len) != len) + break; + } + } + } + diff --git a/src/modules/common/rawstr.cpp b/src/modules/common/rawstr.cpp index 6f17628..788ab6e 100644 --- a/src/modules/common/rawstr.cpp +++ b/src/modules/common/rawstr.cpp @@ -1,11 +1,13 @@ /****************************************************************************** - * rawstr.cpp - code for class 'RawStr'- a module that reads raw text - * files: ot and nt using indexs ??.bks ??.cps ??.vss - * and provides lookup and parsing functions based on - * class StrKey * + * rawstr.cpp - code for class 'RawStr'- a module that reads raw text + * files: ot and nt using indexs ??.bks ??.cps ??.vss + * and provides lookup and parsing functions based on + * class StrKey * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawstr.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -54,7 +56,7 @@ const int RawStr::IDXENTRYSIZE = 6; * (e.g. 'modules/texts/rawtext/webster/') */ -RawStr::RawStr(const char *ipath, int fileMode) +RawStr::RawStr(const char *ipath, int fileMode, bool caseSensitive) : caseSensitive(caseSensitive) { SWBuf buf; @@ -121,7 +123,7 @@ void RawStr::getIDXBufDat(long ioffset, char **buf) const datfd->read(*buf, size); } (*buf)[size] = 0; - toupperstr_utf8(*buf, size*2); + if (!caseSensitive) toupperstr_utf8(*buf, size*2); } else { *buf = (*buf) ? (char *)realloc(*buf, 1) : (char *)malloc(1); @@ -181,7 +183,7 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long headoff = 0; stdstr(&key, ikey, 3); - toupperstr_utf8(key, strlen(key)*3); + if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3); int keylen = strlen(key); bool substr = false; @@ -302,7 +304,7 @@ signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long * */ -void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) +void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) const { unsigned int ch; char *idxbuflocal = 0; @@ -380,7 +382,7 @@ void RawStr::doSetText(const char *ikey, const char *buf, long len) char errorStatus = findOffset(ikey, &start, &size, 0, &idxoff); stdstr(&key, ikey, 2); - toupperstr_utf8(key, strlen(key)*2); + if (!caseSensitive) toupperstr_utf8(key, strlen(key)*2); len = (len < 0) ? strlen(buf) : len; diff --git a/src/modules/common/rawstr4.cpp b/src/modules/common/rawstr4.cpp index 003b2fe..e2ce899 100644 --- a/src/modules/common/rawstr4.cpp +++ b/src/modules/common/rawstr4.cpp @@ -1,11 +1,13 @@ /****************************************************************************** - * rawstr.cpp - code for class 'RawStr'- a module that reads raw text - * files: ot and nt using indexs ??.bks ??.cps ??.vss - * and provides lookup and parsing functions based on - * class StrKey * + * rawstr4.cpp - code for class 'RawStr'- a module that reads raw text + * files: ot and nt using indexs ??.bks ??.cps ??.vss + * and provides lookup and parsing functions based on + * class StrKey * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawstr4.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -53,7 +55,7 @@ const int RawStr4::IDXENTRYSIZE = 8; * (e.g. 'modules/texts/rawtext/webster/') */ -RawStr4::RawStr4(const char *ipath, int fileMode) +RawStr4::RawStr4(const char *ipath, int fileMode, bool caseSensitive) : caseSensitive(caseSensitive) { SWBuf buf; @@ -121,7 +123,7 @@ void RawStr4::getIDXBufDat(long ioffset, char **buf) const datfd->read(*buf, size); } (*buf)[size] = 0; - toupperstr_utf8(*buf, size*2); + if (!caseSensitive) toupperstr_utf8(*buf, size*2); } else { *buf = (*buf) ? (char *)realloc(*buf, 1) : (char *)malloc(1); @@ -157,7 +159,7 @@ void RawStr4::getIDXBuf(long ioffset, char **buf) const } *targetbuf = 0; trybuf = 0; - toupperstr_utf8(targetbuf); + if (!caseSensitive) toupperstr_utf8(targetbuf); */ } } @@ -191,7 +193,7 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon headoff = 0; stdstr(&key, ikey, 3); - toupperstr_utf8(key, strlen(key)*3); + if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3); int keylen = strlen(key); bool substr = false; @@ -311,7 +313,7 @@ signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, lon * */ -void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) +void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) const { unsigned int ch; char *idxbuflocal = 0; @@ -388,7 +390,7 @@ void RawStr4::doSetText(const char *ikey, const char *buf, long len) { char errorStatus = findOffset(ikey, &start, &size, 0, &idxoff); stdstr(&key, ikey, 3); - toupperstr_utf8(key, strlen(key)*3); + if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3); len = (len < 0) ? strlen(buf) : len; getIDXBufDat(start, &dbKey); diff --git a/src/modules/common/rawverse.cpp b/src/modules/common/rawverse.cpp index 99beaa2..5527d38 100644 --- a/src/modules/common/rawverse.cpp +++ b/src/modules/common/rawverse.cpp @@ -1,11 +1,12 @@ /****************************************************************************** - * rawverse.cpp - code for class 'RawVerse'- a module that reads raw text + * + * rawverse.cpp - code for class 'RawVerse'- a module that reads raw text * files: ot and nt using indexs ??.bks ??.cps ??.vss * and provides lookup and parsing functions based on * class VerseKey * * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -149,7 +150,7 @@ void RawVerse::findOffset(char testmt, long idxoff, long *start, unsigned short * */ -void RawVerse::readText(char testmt, long start, unsigned short size, SWBuf &buf) { +void RawVerse::readText(char testmt, long start, unsigned short size, SWBuf &buf) const { buf = ""; buf.setFillByte(0); buf.setSize(size + 1); @@ -278,15 +279,15 @@ char RawVerse::createModule(const char *ipath, const char *v11n) VerseKey vk; vk.setVersificationSystem(v11n); - vk.Headings(1); + vk.setIntros(1); __s32 offset = 0; __u16 size = 0; offset = archtosword32(offset); size = archtosword16(size); - for (vk = TOP; !vk.Error(); vk++) { - if (vk.Testament() < 2) { + for (vk = TOP; !vk.popError(); vk++) { + if (vk.getTestament() < 2) { fd->write(&offset, 4); fd->write(&size, 2); } diff --git a/src/modules/common/rawverse4.cpp b/src/modules/common/rawverse4.cpp index ee0b207..b87ea0d 100644 --- a/src/modules/common/rawverse4.cpp +++ b/src/modules/common/rawverse4.cpp @@ -1,11 +1,14 @@ /****************************************************************************** - * rawverse.cpp - code for class 'RawVerse4'- a module that reads raw text - * files: ot and nt using indexs ??.bks ??.cps ??.vss + * + * rawverse4.cpp - code for class 'RawVerse4'- a module that reads raw + * text files: + * ot and nt using indexs ??.bks ??.cps ??.vss * and provides lookup and parsing functions based on * class VerseKey * + * $Id: rawverse4.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -149,7 +152,7 @@ void RawVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long * */ -void RawVerse4::readText(char testmt, long start, unsigned long size, SWBuf &buf) { +void RawVerse4::readText(char testmt, long start, unsigned long size, SWBuf &buf) const { buf = ""; buf.setFillByte(0); buf.setSize(size + 1); @@ -278,14 +281,14 @@ char RawVerse4::createModule(const char *ipath, const char *v11n) VerseKey vk; vk.setVersificationSystem(v11n); - vk.Headings(1); + vk.setIntros(1); __u32 offset = 0; __u32 size = 0; offset = archtosword32(offset); size = archtosword32(size); - for (vk = TOP; !vk.Error(); vk++) { - if (vk.Testament() < 2) { + for (vk = TOP; !vk.popError(); vk++) { + if (vk.getTestament() < 2) { fd->write(&offset, 4); fd->write(&size, 4); } diff --git a/src/modules/common/sapphire.cpp b/src/modules/common/sapphire.cpp index 7b141d2..8cc3e15 100644 --- a/src/modules/common/sapphire.cpp +++ b/src/modules/common/sapphire.cpp @@ -1,15 +1,39 @@ -/* sapphire.cpp -- the Saphire II stream cipher class. - Dedicated to the Public Domain the author and inventor: - (Michael Paul Johnson). This code comes with no warranty. - Use it at your own risk. - Ported from the Pascal implementation of the Sapphire Stream - Cipher 9 December 1994. - Added hash pre- and post-processing 27 December 1994. - Modified initialization to make index variables key dependent, - made the output function more resistant to cryptanalysis, - and renamed to Sapphire II 2 January 1995 -*/ - +/****************************************************************************** + * + * sapphire.cpp - the Saphire II stream cipher class + * + * $Id: sapphire.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +/****************************************************************************** + * + * Original license notice & credits: + * Dedicated to the Public Domain the author and inventor: + * (Michael Paul Johnson). This code comes with no warranty. + * Use it at your own risk. + * Ported from the Pascal implementation of the Sapphire Stream + * Cipher 9 December 1994. + * Added hash pre- and post-processing 27 December 1994. + * Modified initialization to make index variables key dependent, + * made the output function more resistant to cryptanalysis, + * and renamed to Sapphire II 2 January 1995 + * + */ #include diff --git a/src/modules/common/swcipher.cpp b/src/modules/common/swcipher.cpp index 5ab91ea..16279dc 100644 --- a/src/modules/common/swcipher.cpp +++ b/src/modules/common/swcipher.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * swcipher.cpp - code for class 'SWCipher'- a driver class that provides - * cipher utilities. * + * swcipher.cpp - code for class 'SWCipher'- a driver class that + * provides cipher utilities * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swcipher.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/common/swcomprs.cpp b/src/modules/common/swcomprs.cpp index 378c8b1..9df8e7d 100644 --- a/src/modules/common/swcomprs.cpp +++ b/src/modules/common/swcomprs.cpp @@ -1,9 +1,10 @@ /****************************************************************************** - * swcomprs.cpp - code for class 'SWCompress'- a driver class that provides - * compression utilities. * + * swcomprs.cpp - a driver class that provides compression utilities * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swcomprs.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/common/swcomprs.doc b/src/modules/common/swcomprs.doc deleted file mode 100644 index b6817f2..0000000 --- a/src/modules/common/swcomprs.doc +++ /dev/null @@ -1,802 +0,0 @@ -The following is the original information send from Parson's Technologies via -Craig Rairden. -_______________________________________________________________________________ -Compression Info, 10-11-95 -Jeff Wheeler - -Source of Algorithm -------------------- - -The compression algorithms used here are based upon the algorithms developed -and published by Haruhiko Okumura in a paper entitled "Data Compression -Algorithms of LARC and LHarc." This paper discusses three compression -algorithms, LSZZ, LZARI, and LZHUF. LZSS is described as the "first" of -these, and is described as providing moderate compression with good speed. -LZARI is described as an improved LZSS, a combination of the LZSS algorithm -with adaptive arithmetic compression. It is described as being slower than -LZSS but with better compression. LZHUF (the basis of the common LHA -compression program) was included in the paper, however, a free usage license -was not included. - -The following are copies of the statements included at the beginning of each -source code listing that was supplied in the working paper. - - LZSS, dated 4/6/89, marked as "Use, distribute and - modify this program freely." - - LZARI, dated 4/7/89, marked as "Use, distribute and - modify this program freely." - - LZHUF, dated 11/20/88, written by Haruyasu Yoshizaki, - translated by Haruhiko Okumura on 4/7/89. Not - expressly marked as redistributable or modifiable. - -Since both LZSS and LZARI are marked as "use, distribute and modify freely" we -have felt at liberty basing our compression algorithm on either of these. - -Selection of Algorithm ----------------------- - -Working samples of three possible compression algorithms are supplied in -Okumura's paper. Which should be used? - -LZSS is the fastest at decompression, but does not generated as small a -compressed file as the other methods. The other two methods provided, perhaps, -a 15% improvement in compression. Or, put another way, on a 100K file, LZSS -might compress it to 50K while the others might approach 40-45K. For STEP -purposes, it was decided that decoding speed was of more importance than -tighter compression. For these reasons, the first compression algorithm -implemented is the LZSS algorithm. - -About LZSS Encoding -------------------- - -(adapted from Haruhiko Okumura's paper) - -This scheme was proposed by Ziv and Lempel [1]. A slightly modified version -is described by Storer and Szymanski [2]. An implementation using a binary -tree has been proposed by Bell [3]. - -The algorithm is quite simple. -1. Keep a ring buffer which initially contains all space characters. -2. Read several letters from the file to the buffer. -3. Search the buffer for the longest string that matches the letters just - read, and send its length and position into the buffer. - -If the ring buffer is 4096 bytes, the position can be stored in 12 bits. If the -length is represented in 4 bits, the pair is two bytes -long. If the longest match is no more than two characters, then just one -character is sent without encoding. The process starts again with the next -character. An extra bit is sent each time to tell the decoder whether the -next item is a character of a pair. - -[1] J. Ziv and A. Lempel, IEEE Transactions IT-23, 337-343 (1977). -[2] J. A. Storer and T. G. Szymanski, J. ACM, 29, 928-951 (1982). -[3] T.C. Gell, IEEE Transactions COM-34, 1176-1182 (1986). - -class SWCompress { -public: -void InitTree( // no return value - void); // no parameters - -void InsertNode( // no return value - short int Pos); // position in the buffer - -void DeleteNode( // no return value - short int Node); // node to be removed - -void Encode( // no return value - void); // no parameters - -void Decode( // no return value - void); // no parameters -}; - -// The following are constant sizes used by the compression algorithm. -// -// N - This is the size of the ring buffer. It is set -// to 4K. It is important to note that a position -// within the ring buffer requires 12 bits. -// -// F - This is the maximum length of a character sequence -// that can be taken from the ring buffer. It is set -// to 18. Note that a length must be 3 before it is -// worthwhile to store a position/length pair, so the -// length can be encoded in only 4 bits. Or, put yet -// another way, it is not necessary to encode a length -// of 0-18, it is necessary to encode a length of -// 3-18, which requires 4 bits. -// -// THRESHOLD - It takes 2 bytes to store an offset and -// a length. If a character sequence only -// requires 1 or 2 characters to store -// uncompressed, then it is better to store -// it uncompressed than as an offset into -// the ring buffer. -// -// Note that the 12 bits used to store the position and the 4 bits -// used to store the length equal a total of 16 bits, or 2 bytes. - -#define N 4096 -#define F 18 -#define THRESHOLD 3 -#define NOT_USED N - -// m_ring_buffer is a text buffer. It contains "nodes" of -// uncompressed text that can be indexed by position. That is, -// a substring of the ring buffer can be indexed by a position -// and a length. When decoding, the compressed text may contain -// a position in the ring buffer and a count of the number of -// bytes from the ring buffer that are to be moved into the -// uncompressed buffer. -// -// This ring buffer is not maintained as part of the compressed -// text. Instead, it is reconstructed dynamically. That is, -// it starts out empty and gets built as the text is decompressed. -// -// The ring buffer contain N bytes, with an additional F - 1 bytes -// to facilitate string comparison. - -unsigned char m_ring_buffer[N + F - 1]; - -// m_match_position and m_match_length are set by InsertNode(). -// -// These variables indicate the position in the ring buffer -// and the number of characters at that position that match -// a given string. - -short int m_match_position; -short int m_match_length; - -// m_lson, m_rson, and m_dad are the Japanese way of referring to -// a tree structure. The dad is the parent and it has a right and -// left son (child). -// -// For i = 0 to N-1, m_rson[i] and m_lson[i] will be the right -// and left children of node i. -// -// For i = 0 to N-1, m_dad[i] is the parent of node i. -// -// For i = 0 to 255, rson[N + i + 1] is the root of the tree for -// strings that begin with the character i. Note that this requires -// one byte characters. -// -// These nodes store values of 0...(N-1). Memory requirements -// can be reduces by using 2-byte integers instead of full 4-byte -// integers (for 32-bit applications). Therefore, these are -// defined as "short ints." - -short int m_lson[N + 1]; -short int m_rson[N + 257]; -short int m_dad[N + 1]; - - - - -/* - ------------------------------------------------------------------------- - cLZSS::InitTree - - This function initializes the tree nodes to "empty" states. - ------------------------------------------------------------------------- -*/ - -void cLZSS::InitTree( // no return value - void) // no parameters - throw() // exception list - - { - int i; - - // For i = 0 to N - 1, m_rson[i] and m_lson[i] will be the right - // and left children of node i. These nodes need not be - // initialized. However, for debugging purposes, it is nice to - // have them initialized. Since this is only used for compression - // (not decompression), I don't mind spending the time to do it. - // - // For the same range of i, m_dad[i] is the parent of node i. - // These are initialized to a known value that can represent - // a "not used" state. - - for (i = 0; i < N; i++) - { - m_lson[i] = NOT_USED; - m_rson[i] = NOT_USED; - m_dad[i] = NOT_USED; - } - - // For i = 0 to 255, m_rson[N + i + 1] is the root of the tree - // for strings that begin with the character i. This is why - // the right child array is larger than the left child array. - // These are also initialzied to a "not used" state. - // - // Note that there are 256 of these, one for each of the possible - // 256 characters. - - for (i = N + 1; i <= (N + 256); i++) - { - m_rson[i] = NOT_USED; - } - - // Done. - } - -/* - ------------------------------------------------------------------------- - cLZSS::InsertNode - - This function inserts a string from the ring buffer into one of - the trees. It loads the match position and length member variables - for the longest match. - - The string to be inserted is identified by the parameter Pos, - A full F bytes are inserted. So, m_ring_buffer[Pos ... Pos+F-1] - are inserted. - - If the matched length is exactly F, then an old node is removed - in favor of the new one (because the old one will be deleted - sooner). - - Note that Pos plays a dual role. It is used as both a position - in the ring buffer and also as a tree node. m_ring_buffer[Pos] - defines a character that is used to identify a tree node. - ------------------------------------------------------------------------- -*/ - -void cLZSS::InsertNode( // no return value - short int Pos) // position in the buffer - throw() // exception list - - { - short int i; - short int p; - int cmp; - unsigned char * key; - - ASSERT(Pos >= 0); - ASSERT(Pos < N); - - cmp = 1; - key = &(m_ring_buffer[Pos]); - - // The last 256 entries in m_rson contain the root nodes for - // strings that begin with a letter. Get an index for the - // first letter in this string. - - p = (short int) (N + 1 + key[0]); - - // Set the left and right tree nodes for this position to "not - // used." - - m_lson[Pos] = NOT_USED; - m_rson[Pos] = NOT_USED; - - // Haven't matched anything yet. - - m_match_length = 0; - - for ( ; ; ) - { - if (cmp >= 0) - { - if (m_rson[p] != NOT_USED) - { - p = m_rson[p]; - } - else - { - m_rson[p] = Pos; - m_dad[Pos] = p; - return; - } - } - else - { - if (m_lson[p] != NOT_USED) - { - p = m_lson[p]; - } - else - { - m_lson[p] = Pos; - m_dad[Pos] = p; - return; - } - } - - // Should we go to the right or the left to look for the - // next match? - - for (i = 1; i < F; i++) - { - cmp = key[i] - m_ring_buffer[p + i]; - if (cmp != 0) - break; - } - - if (i > m_match_length) - { - m_match_position = p; - m_match_length = i; - - if (i >= F) - break; - } - } - - m_dad[Pos] = m_dad[p]; - m_lson[Pos] = m_lson[p]; - m_rson[Pos] = m_rson[p]; - - m_dad[ m_lson[p] ] = Pos; - m_dad[ m_rson[p] ] = Pos; - - if (m_rson[ m_dad[p] ] == p) - { - m_rson[ m_dad[p] ] = Pos; - } - else - { - m_lson[ m_dad[p] ] = Pos; - } - - // Remove "p" - - m_dad[p] = NOT_USED; - } - -/* - ------------------------------------------------------------------------- - cLZSS::DeleteNode - - This function removes the node "Node" from the tree. - ------------------------------------------------------------------------- -*/ - -void cLZSS::DeleteNode( // no return value - short int Node) // node to be removed - throw() // exception list - - { - short int q; - - ASSERT(Node >= 0); - ASSERT(Node < (N+1)); - - if (m_dad[Node] == NOT_USED) - { - // not in tree, nothing to do - return; - } - - if (m_rson[Node] == NOT_USED) - { - q = m_lson[Node]; - } - else if (m_lson[Node] == NOT_USED) - { - q = m_rson[Node]; - } - else - { - q = m_lson[Node]; - if (m_rson[q] != NOT_USED) - { - do - { - q = m_rson[q]; - } - while (m_rson[q] != NOT_USED); - - m_rson[ m_dad[q] ] = m_lson[q]; - m_dad[ m_lson[q] ] = m_dad[q]; - m_lson[q] = m_lson[Node]; - m_dad[ m_lson[Node] ] = q; - } - - m_rson[q] = m_rson[Node]; - m_dad[ m_rson[Node] ] = q; - } - - m_dad[q] = m_dad[Node]; - - if (m_rson[ m_dad[Node] ] == Node) - { - m_rson[ m_dad[Node] ] = q; - } - else - { - m_lson[ m_dad[Node] ] = q; - } - - m_dad[Node] = NOT_USED; - } - -/* - ------------------------------------------------------------------------- - cLZSS::Encode - - This function "encodes" the input stream into the output stream. - The GetChars() and SendChars() functions are used to separate - this method from the actual i/o. - ------------------------------------------------------------------------- -*/ - -void cLZSS::Encode( // no return value - void) // no parameters - - { - short int i; // an iterator - short int r; // node number in the binary tree - short int s; // position in the ring buffer - unsigned short int len; // len of initial string - short int last_match_length; // length of last match - short int code_buf_pos; // position in the output buffer - unsigned char code_buf[17]; // the output buffer - unsigned char mask; // bit mask for byte 0 of out buf - unsigned char c; // character read from string - - // Start with a clean tree. - - InitTree(); - - // code_buf[0] works as eight flags. A "1" represents that the - // unit is an unencoded letter (1 byte), and a "0" represents - // that the next unit is a pair (2 bytes). - // - // code_buf[1..16] stores eight units of code. Since the best - // we can do is store eight pairs, at most 16 - // bytes are needed to store this. - // - // This is why the maximum size of the code buffer is 17 bytes. - - code_buf[0] = 0; - code_buf_pos = 1; - - // Mask iterates over the 8 bits in the code buffer. The first - // character ends up being stored in the low bit. - // - // bit 8 7 6 5 4 3 2 1 - // | | - // | first sequence in code buffer - // | - // last sequence in code buffer - - mask = 1; - - s = 0; - r = (short int) N - (short int) F; - - // Initialize the ring buffer with spaces... - - // Note that the last F bytes of the ring buffer are not filled. - // This is because those F bytes will be filled in immediately - // with bytes from the input stream. - - memset(m_ring_buffer, ' ', N - F); - - // Read F bytes into the last F bytes of the ring buffer. - // - // This function loads the buffer with X characters and returns - // the actual amount loaded. - - len = GetChars(&(m_ring_buffer[r]), F); - - // Make sure there is something to be compressed. - - if (len == 0) - return; - - // Insert the F strings, each of which begins with one or more - // 'space' characters. Note the order in which these strings - // are inserted. This way, degenerate trees will be less likely - // to occur. - - for (i = 1; i <= F; i++) - { - InsertNode((short int) (r - i)); - } - - // Finally, insert the whole string just read. The - // member variables match_length and match_position are set. - - InsertNode(r); - - // Now that we're preloaded, continue till done. - - do - { - - // m_match_length may be spuriously long near the end of - // text. - - if (m_match_length > len) - { - m_match_length = len; - } - - // Is it cheaper to store this as a single character? If so, - // make it so. - - if (m_match_length < THRESHOLD) - { - // Send one character. Remember that code_buf[0] is the - // set of flags for the next eight items. - - m_match_length = 1; - code_buf[0] |= mask; - code_buf[code_buf_pos++] = m_ring_buffer[r]; - } - - // Otherwise, we do indeed have a string that can be stored - // compressed to save space. - - else - { - // The next 16 bits need to contain the position (12 bits) - // and the length (4 bits). - - code_buf[code_buf_pos++] = (unsigned char) m_match_position; - code_buf[code_buf_pos++] = (unsigned char) ( - ((m_match_position >> 4) & 0xf0) | - (m_match_length - THRESHOLD) ); - } - - // Shift the mask one bit to the left so that it will be ready - // to store the new bit. - - mask = (unsigned char) (mask << 1); - - // If the mask is now 0, then we know that we have a full set - // of flags and items in the code buffer. These need to be - // output. - - if (mask == 0) - { - // code_buf is the buffer of characters to be output. - // code_buf_pos is the number of characters it contains. - - SendChars(code_buf, code_buf_pos); - - // Reset for next buffer... - - code_buf[0] = 0; - code_buf_pos = 1; - mask = 1; - } - - last_match_length = m_match_length; - - // Delete old strings and read new bytes... - - for (i = 0; i < last_match_length; i++) - { - - // Get next character... - - if (GetChars(&c, 1) != 1) - break; - - // Delete "old strings" - - DeleteNode(s); - - // Put this character into the ring buffer. - // - // The original comment here says "If the position is near - // the end of the buffer, extend the buffer to make - // string comparison easier." - // - // That's a little misleading, because the "end" of the - // buffer is really what we consider to be the "beginning" - // of the buffer, that is, positions 0 through F. - // - // The idea is that the front end of the buffer is duplicated - // into the back end so that when you're looking at characters - // at the back end of the buffer, you can index ahead (beyond - // the normal end of the buffer) and see the characters - // that are at the front end of the buffer wihtout having - // to adjust the index. - // - // That is... - // - // 1234xxxxxxxxxxxxxxxxxxxxxxxxxxxxx1234 - // | | | - // position 0 end of buffer | - // | - // duplicate of front of buffer - - m_ring_buffer[s] = c; - - if (s < F - 1) - { - m_ring_buffer[s + N] = c; - } - - // Increment the position, and wrap around when we're at - // the end. Note that this relies on N being a power of 2. - - s = (short int) ( (s + 1) & (N - 1) ); - r = (short int) ( (r + 1) & (N - 1) ); - - // Register the string that is found in - // m_ring_buffer[r..r+F-1]. - - InsertNode(r); - } - - // If we didn't quit because we hit the last_match_length, - // then we must have quit because we ran out of characters - // to process. - - while (i++ < last_match_length) - { - DeleteNode(s); - - s = (short int) ( (s + 1) & (N - 1) ); - r = (short int) ( (r + 1) & (N - 1) ); - - // Note that len hitting 0 is the key that causes the - // do...while() to terminate. This is the only place - // within the loop that len is modified. - // - // Its original value is F (or a number less than F for - // short strings). - - if (--len) - { - InsertNode(r); /* buffer may not be empty. */ - } - } - - // End of do...while() loop. Continue processing until there - // are no more characters to be compressed. The variable - // "len" is used to signal this condition. - } - while (len > 0); - - // There could still be something in the output buffer. Send it - // now. - - if (code_buf_pos > 1) - { - // code_buf is the encoded string to send. - // code_buf_ptr is the number of characters. - - SendChars(code_buf, code_buf_pos); - } - - // Done! - } - -/* - ------------------------------------------------------------------------- - cLZSS::Decode - - This function "decodes" the input stream into the output stream. - The GetChars() and SendChars() functions are used to separate - this method from the actual i/o. - ------------------------------------------------------------------------- -*/ - -void cLZSS::Decode( // no return value - void) // no parameters - - { - int k; - int r; // node number - unsigned char c[F]; // an array of chars - unsigned char flags; // 8 bits of flags - int flag_count; // which flag we're on - short int pos; // position in the ring buffer - short int len; // number of chars in ring buffer - - // Initialize the ring buffer with a common string. - // - // Note that the last F bytes of the ring buffer are not filled. - - memset(m_ring_buffer, ' ', N - F); - - r = N - F; - - flags = (char) 0; - flag_count = 0; - - for ( ; ; ) - { - - // If there are more bits of interest in this flag, then - // shift that next interesting bit into the 1's position. - // - // If this flag has been exhausted, the next byte must - // be a flag. - - if (flag_count > 0) - { - flags = (unsigned char) (flags >> 1); - flag_count--; - } - else - { - // Next byte must be a flag. - - if (GetChars(&flags, 1) != 1) - break; - - // Set the flag counter. While at first it might appear - // that this should be an 8 since there are 8 bits in the - // flag, it should really be a 7 because the shift must - // be performed 7 times in order to see all 8 bits. - - flag_count = 7; - } - - // If the low order bit of the flag is now set, then we know - // that the next byte is a single, unencoded character. - - if (flags & 1) - { - if (GetChars(c, 1) != 1) - break; - - if (SendChars(c, 1) != 1) - break; - - // Add to buffer, and increment to next spot. Wrap at end. - - m_ring_buffer[r] = c[0]; - r = (short int) ( (r + 1) & (N - 1) ); - } - - // Otherwise, we know that the next two bytes are a - // pair. The position is in 12 bits and - // the length is in 4 bits. - - else - { - // Original code: - // if ((i = getc(infile)) == EOF) - // break; - // if ((j = getc(infile)) == EOF) - // break; - // i |= ((j & 0xf0) << 4); - // j = (j & 0x0f) + THRESHOLD; - // - // I've modified this to only make one input call, and - // have changed the variable names to something more - // obvious. - - if (GetChars(c, 2) != 2) - break; - - // Convert these two characters into the position and - // length. Note that the length is always at least - // THRESHOLD, which is why we're able to get a length - // of 18 out of only 4 bits. - - pos = (short int) ( c[0] | ((c[1] & 0xf0) << 4) ); - - len = (short int) ( (c[1] & 0x0f) + THRESHOLD ); - - // There are now "len" characters at position "pos" in - // the ring buffer that can be pulled out. Note that - // len is never more than F. - - for (k = 0; k < len; k++) - { - c[k] = m_ring_buffer[(pos + k) & (N - 1)]; - - // Add to buffer, and increment to next spot. Wrap at end. - - m_ring_buffer[r] = c[k]; - r = (short int) ( (r + 1) & (N - 1) ); - } - - // Add the "len" characters to the output stream. - - if (SendChars(c, len) != len) - break; - } - } - } - diff --git a/src/modules/common/xzcomprs.cpp b/src/modules/common/xzcomprs.cpp new file mode 100644 index 0000000..db8a4a8 --- /dev/null +++ b/src/modules/common/xzcomprs.cpp @@ -0,0 +1,181 @@ +/****************************************************************************** + * + * xzcomprs.cpp - XzCompress, a driver class that provides xz (LZMA2) + * compression + * + * $Id: xzcomprs.cpp 2850 2013-07-02 09:57:20Z chrislit $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + + +#include +#include +#include +#include +#include + +SWORD_NAMESPACE_START + +/****************************************************************************** + * XzCompress Constructor - Initializes data for instance of XzCompress + * + */ + +XzCompress::XzCompress() : SWCompress() { +} + + +/****************************************************************************** + * XzCompress Destructor - Cleans up instance of XzCompress + */ + +XzCompress::~XzCompress() { +} + + +/****************************************************************************** + * XzCompress::Encode - This function "encodes" the input stream into the + * output stream. + * The GetChars() and SendChars() functions are + * used to separate this method from the actual + * i/o. + * NOTE: must set zlen for parent class to know length of + * compressed buffer. + */ + +void XzCompress::Encode(void) +{ +/* +ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); + Compresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be at least 0.1% larger than + sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the + compressed buffer. + This function can be used to compress a whole file at once if the + input file is mmap'ed. + compress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer. +*/ + direct = 0; // set direction needed by parent [Get|Send]Chars() + + // get buffer + char chunk[1024]; + char *buf = (char *)calloc(1, 1024); + char *chunkbuf = buf; + unsigned long chunklen; + unsigned long len = 0; + while((chunklen = GetChars(chunk, 1023))) { + memcpy(chunkbuf, chunk, chunklen); + len += chunklen; + if (chunklen < 1023) + break; + else buf = (char *)realloc(buf, len + 1024); + chunkbuf = buf+len; + } + + + zlen = (long) (len*1.001)+15; + char *zbuf = new char[zlen+1]; + if (len) + { + //printf("Doing compress\n"); + if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len) != Z_OK) + { + printf("ERROR in compression\n"); + } + else { + SendChars(zbuf, zlen); + } + } + else + { + fprintf(stderr, "ERROR: no buffer to compress\n"); + } + delete [] zbuf; + free (buf); +} + + +/****************************************************************************** + * XzCompress::Decode - This function "decodes" the input stream into the + * output stream. + * The GetChars() and SendChars() functions are + * used to separate this method from the actual + * i/o. + */ + +void XzCompress::Decode(void) +{ +/* +ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be large enough to hold the + entire uncompressed data. (The size of the uncompressed data must have + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer. + This function can be used to decompress a whole file at once if the + input file is mmap'ed. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted. +*/ + + // get buffer + char chunk[1024]; + char *zbuf = (char *)calloc(1, 1024); + char *chunkbuf = zbuf; + int chunklen; + unsigned long zlen = 0; + while((chunklen = GetChars(chunk, 1023))) { + memcpy(chunkbuf, chunk, chunklen); + zlen += chunklen; + if (chunklen < 1023) + break; + else zbuf = (char *)realloc(zbuf, zlen + 1024); + chunkbuf = zbuf + zlen; + } + + //printf("Decoding complength{%ld} uncomp{%ld}\n", zlen, blen); + if (zlen) { + unsigned long blen = zlen*20; // trust compression is less than 1000% + char *buf = new char[blen]; + //printf("Doing decompress {%s}\n", zbuf); + slen = 0; + switch (uncompress((Bytef*)buf, &blen, (Bytef*)zbuf, zlen)){ + case Z_OK: SendChars(buf, blen); slen = blen; break; + case Z_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break; + case Z_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break; + case Z_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break; + default: fprintf(stderr, "ERROR: an unknown error occured during decompression.\n"); break; + } + delete [] buf; + } + else { + fprintf(stderr, "ERROR: no buffer to decompress!\n"); + } + //printf("Finished decoding\n"); + free (zbuf); +} + +SWORD_NAMESPACE_END diff --git a/src/modules/common/zipcomprs.cpp b/src/modules/common/zipcomprs.cpp index 534d840..3e44abd 100644 --- a/src/modules/common/zipcomprs.cpp +++ b/src/modules/common/zipcomprs.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * swcomprs.cpp - code for class 'ZipCompress'- a driver class that provides - * compression utilities. - using zlib * + * zipcomprs.cpp - ZipCompress, a driver class that provides zlib + * compression + * + * $Id: zipcomprs.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/common/zstr.cpp b/src/modules/common/zstr.cpp index 5b4da64..a745502 100644 --- a/src/modules/common/zstr.cpp +++ b/src/modules/common/zstr.cpp @@ -1,10 +1,12 @@ /****************************************************************************** - * zstr.cpp - code for class 'zStr'- a module that reads compressed text + * + * zstr.cpp - code for class 'zStr'- a module that reads compressed text * files and provides lookup and parsing functions based on * class StrKey * + * $Id: zstr.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -54,11 +56,10 @@ const int zStr::ZDXENTRYSIZE = 8; * ENT: ipath - path of the directory where data and index files are located. */ -zStr::zStr(const char *ipath, int fileMode, long blockCount, SWCompress *icomp) +zStr::zStr(const char *ipath, int fileMode, long blockCount, SWCompress *icomp, bool caseSensitive) : caseSensitive(caseSensitive) { SWBuf buf; - nl = '\n'; lastoff = -1; path = 0; stdstr(&path, ipath); @@ -144,7 +145,7 @@ void zStr::getKeyFromDatOffset(long ioffset, char **buf) const datfd->read(*buf, size); } (*buf)[size] = 0; - toupperstr_utf8(*buf, size*2); + if (!caseSensitive) toupperstr_utf8(*buf, size*2); } else { *buf = (*buf) ? (char *)realloc(*buf, 1) : (char *)malloc(1); @@ -201,7 +202,7 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const if (*ikey) { headoff = 0; stdstr(&key, ikey, 3); - toupperstr_utf8(key, strlen(key)*3); + if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3); int keylen = strlen(key); bool substr = false; @@ -321,7 +322,7 @@ signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const * */ -void zStr::getText(long offset, char **idxbuf, char **buf) { +void zStr::getText(long offset, char **idxbuf, char **buf) const { char *ch; char *idxbuflocal = 0; getKeyFromIdxOffset(offset, &idxbuflocal); @@ -386,7 +387,7 @@ void zStr::getText(long offset, char **idxbuf, char **buf) { * file. */ -void zStr::getCompressedText(long block, long entry, char **buf) { +void zStr::getCompressedText(long block, long entry, char **buf) const { __u32 size = 0; @@ -431,12 +432,13 @@ void zStr::getCompressedText(long block, long entry, char **buf) { void zStr::setText(const char *ikey, const char *buf, long len) { + static const char nl[] = {13, 10}; + __u32 start, outstart; __u32 size, outsize; __s32 endoff; long idxoff = 0; __s32 shiftSize; - static const char nl[] = {13, 10}; char *tmpbuf = 0; char *key = 0; char *dbKey = 0; @@ -446,7 +448,7 @@ void zStr::setText(const char *ikey, const char *buf, long len) { len = (len < 0) ? strlen(buf) : len; stdstr(&key, ikey, 3); - toupperstr_utf8(key, strlen(key)*3); + if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3); char notFound = findKeyIndex(ikey, &idxoff, 0); if (!notFound) { @@ -583,7 +585,10 @@ void zStr::linkEntry(const char *destkey, const char *srckey) { } -void zStr::flushCache() { +void zStr::flushCache() const { + + static const char nl[] = {13, 10}; + if (cacheBlock) { if (cacheDirty) { __u32 start = 0; diff --git a/src/modules/common/zverse.cpp b/src/modules/common/zverse.cpp index fa76467..c280d98 100644 --- a/src/modules/common/zverse.cpp +++ b/src/modules/common/zverse.cpp @@ -1,11 +1,13 @@ /****************************************************************************** - * zverse.h - code for class 'zVerse'- a module that reads raw text + * + * zverse.cpp - code for class 'zVerse'- a module that reads raw text * files: ot and nt using indexs ??.bks ??.cps ??.vss * and provides lookup and parsing functions based on * class VerseKey for compressed modules * + * $Id: zverse.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -155,7 +157,7 @@ void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *s // set size to // set *start = *size = *buffnum = 0; - //printf ("Finding offset %ld\n", idxoff); + //fprintf(stderr, "Finding offset %ld\n", idxoff); idxoff *= 10; if (!testmt) { testmt = ((idxfp[0]) ? 1:2); @@ -168,7 +170,7 @@ void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *s long newOffset = compfp[testmt-1]->seek(idxoff, SEEK_SET); if (newOffset == idxoff) { if (compfp[testmt-1]->read(&ulBuffNum, 4) != 4) { - printf ("Error reading ulBuffNum\n"); + fprintf(stderr, "Error reading ulBuffNum\n"); return; } } @@ -176,12 +178,12 @@ void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *s if (compfp[testmt-1]->read(&ulVerseStart, 4) < 2) { - printf ("Error reading ulVerseStart\n"); + fprintf(stderr, "Error reading ulVerseStart\n"); return; } if (compfp[testmt-1]->read(&usVerseSize, 2) < 2) { - printf ("Error reading usVerseSize\n"); + fprintf(stderr, "Error reading usVerseSize\n"); return; } @@ -202,7 +204,7 @@ void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *s * */ -void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned long ulBuffNum, SWBuf &inBuf) { +void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned long ulBuffNum, SWBuf &inBuf) const { __u32 ulCompOffset = 0; // compressed buffer start __u32 ulCompSize = 0; // buffer size compressed __u32 ulUnCompSize = 0; // buffer size uncompressed @@ -217,26 +219,26 @@ void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned lo if (size && !(((long) ulBuffNum == cacheBufIdx) && (testmt == cacheTestament) && (cacheBuf))) { - //printf ("Got buffer number{%ld} versestart{%ld} versesize{%d}\n", ulBuffNum, ulVerseStart, usVerseSize); + //fprintf(stderr, "Got buffer number{%ld} versestart{%ld} versesize{%d}\n", ulBuffNum, ulVerseStart, usVerseSize); if (idxfp[testmt-1]->seek(ulBuffNum*12, SEEK_SET)!=(long) ulBuffNum*12) { - printf ("Error seeking compressed file index\n"); + fprintf(stderr, "Error seeking compressed file index\n"); return; } if (idxfp[testmt-1]->read(&ulCompOffset, 4)<4) { - printf ("Error reading ulCompOffset\n"); + fprintf(stderr, "Error reading ulCompOffset\n"); return; } if (idxfp[testmt-1]->read(&ulCompSize, 4)<4) { - printf ("Error reading ulCompSize\n"); + fprintf(stderr, "Error reading ulCompSize\n"); return; } if (idxfp[testmt-1]->read(&ulUnCompSize, 4)<4) { - printf ("Error reading ulUnCompSize\n"); + fprintf(stderr, "Error reading ulUnCompSize\n"); return; } @@ -246,14 +248,14 @@ void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned lo if (textfp[testmt-1]->seek(ulCompOffset, SEEK_SET)!=(long)ulCompOffset) { - printf ("Error: could not seek to right place in compressed text\n"); + fprintf(stderr, "Error: could not seek to right place in compressed text\n"); return; } SWBuf pcCompText; pcCompText.setSize(ulCompSize+5); if (textfp[testmt-1]->read(pcCompText.getRawData(), ulCompSize)<(long)ulCompSize) { - printf ("Error reading compressed text\n"); + fprintf(stderr, "Error reading compressed text\n"); return; } pcCompText.setSize(ulCompSize); @@ -335,7 +337,7 @@ void zVerse::doSetText(char testmt, long idxoff, const char *buf, long len) { } -void zVerse::flushCache() { +void zVerse::flushCache() const { if (dirtyCache) { __u32 idxoff; __u32 start, outstart; @@ -469,15 +471,15 @@ char zVerse::createModule(const char *ipath, int blockBound, const char *v11n) VerseKey vk; vk.setVersificationSystem(v11n); - vk.Headings(1); + vk.setIntros(true); __s32 offset = 0; __s16 size = 0; offset = archtosword32(offset); size = archtosword16(size); - for (vk = TOP; !vk.Error(); vk++) { - if (vk.Testament() < 2) { + for (vk = TOP; !vk.popError(); vk++) { + if (vk.getTestament() < 2) { fd->write(&offset, 4); //compBufIdxOffset fd->write(&offset, 4); fd->write(&size, 2); diff --git a/src/modules/filters/Makefile.am b/src/modules/filters/Makefile.am index 80e65d9..a3d1154 100644 --- a/src/modules/filters/Makefile.am +++ b/src/modules/filters/Makefile.am @@ -5,6 +5,7 @@ libsword_la_SOURCES += $(filtersdir)/swoptfilter.cpp GBFFIL = $(filtersdir)/gbfhtml.cpp GBFFIL += $(filtersdir)/gbfhtmlhref.cpp +GBFFIL += $(filtersdir)/gbfxhtml.cpp GBFFIL += $(filtersdir)/gbfwebif.cpp GBFFIL += $(filtersdir)/gbfplain.cpp GBFFIL += $(filtersdir)/gbfrtf.cpp @@ -26,12 +27,14 @@ THMLFIL += $(filtersdir)/thmlgbf.cpp THMLFIL += $(filtersdir)/thmlrtf.cpp THMLFIL += $(filtersdir)/thmlhtml.cpp THMLFIL += $(filtersdir)/thmlhtmlhref.cpp +THMLFIL += $(filtersdir)/thmlxhtml.cpp THMLFIL += $(filtersdir)/thmlwebif.cpp THMLFIL += $(filtersdir)/thmlwordjs.cpp TEIFIL = $(filtersdir)/teiplain.cpp TEIFIL += $(filtersdir)/teirtf.cpp TEIFIL += $(filtersdir)/teihtmlhref.cpp +TEIFIL += $(filtersdir)/teixhtml.cpp CONVFIL = $(filtersdir)/gbfthml.cpp CONVFIL += $(filtersdir)/gbfosis.cpp @@ -42,6 +45,7 @@ CONVFIL += $(filtersdir)/osisosis.cpp OSISFIL = $(filtersdir)/osisheadings.cpp OSISFIL += $(filtersdir)/osisfootnotes.cpp OSISFIL += $(filtersdir)/osishtmlhref.cpp +OSISFIL += $(filtersdir)/osisxhtml.cpp OSISFIL += $(filtersdir)/osiswebif.cpp OSISFIL += $(filtersdir)/osismorph.cpp OSISFIL += $(filtersdir)/osisstrongs.cpp @@ -53,7 +57,10 @@ OSISFIL += $(filtersdir)/osisscripref.cpp OSISFIL += $(filtersdir)/osisvariants.cpp OSISFIL += $(filtersdir)/osiswordjs.cpp OSISFIL += $(filtersdir)/osismorphsegmentation.cpp -OSISFIL += $(filtersdir)/osisruby.cpp +OSISFIL += $(filtersdir)/osisglosses.cpp +OSISFIL += $(filtersdir)/osisenum.cpp +OSISFIL += $(filtersdir)/osisxlit.cpp +OSISFIL += $(filtersdir)/osisreferencelinks.cpp libsword_la_SOURCES += $(filtersdir)/latin1utf8.cpp libsword_la_SOURCES += $(filtersdir)/latin1utf16.cpp @@ -61,6 +68,8 @@ libsword_la_SOURCES += $(filtersdir)/utf8utf16.cpp libsword_la_SOURCES += $(filtersdir)/utf16utf8.cpp libsword_la_SOURCES += $(filtersdir)/utf8html.cpp libsword_la_SOURCES += $(filtersdir)/utf8latin1.cpp +libsword_la_SOURCES += $(filtersdir)/unicodertf.cpp +libsword_la_SOURCES += $(filtersdir)/scsuutf8.cpp libsword_la_SOURCES += $(filtersdir)/utf8cantillation.cpp libsword_la_SOURCES += $(filtersdir)/utf8hebrewpoints.cpp @@ -70,10 +79,7 @@ libsword_la_SOURCES += $(filtersdir)/utf8greekaccents.cpp libsword_la_SOURCES += $(filtersdir)/cipherfil.cpp PLFIL = $(filtersdir)/rtfhtml.cpp -PLFIL += $(filtersdir)/plainfootnotes.cpp -PLFIL += $(filtersdir)/plainhtml.cpp PLFIL += $(filtersdir)/greeklexattribs.cpp -PLFIL += $(filtersdir)/unicodertf.cpp PLFIL += $(filtersdir)/papyriplain.cpp diff --git a/src/modules/filters/cipherfil.cpp b/src/modules/filters/cipherfil.cpp index 34d0465..e5422f3 100644 --- a/src/modules/filters/cipherfil.cpp +++ b/src/modules/filters/cipherfil.cpp @@ -1,8 +1,11 @@ /****************************************************************************** * - * cipherfil - SWFilter descendant to decipher a module + * cipherfil.cpp - CipherFilter, a SWFilter descendant to decipher + * a module * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: cipherfil.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,8 +27,10 @@ #include #include + SWORD_NAMESPACE_START + CipherFilter::CipherFilter(const char *key) { cipher = new SWCipher((unsigned char *)key); } @@ -58,4 +63,6 @@ char CipherFilter::processText(SWBuf &text, const SWKey *key, const SWModule *mo return 0; } + SWORD_NAMESPACE_END + diff --git a/src/modules/filters/gbffootnotes.cpp b/src/modules/filters/gbffootnotes.cpp index a5384cb..7b867f1 100644 --- a/src/modules/filters/gbffootnotes.cpp +++ b/src/modules/filters/gbffootnotes.cpp @@ -1,9 +1,11 @@ /****************************************************************************** * - * gbffootnotes - SWFilter descendant to hide or show footnotes - * in a GBF module. + * gbffootnotes.cpp - SWFilter descendant to hide or show footnotes + * in a GBF module * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbffootnotes.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,17 +30,23 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Footnotes"; -const char oTip[] = "Toggles Footnotes On and Off if they exist"; +namespace { + + static const char oName[] = "Footnotes"; + static const char oTip[] = "Toggles Footnotes On and Off if they exist"; -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -GBFFootnotes::GBFFootnotes() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +GBFFootnotes::GBFFootnotes() : SWOptionFilter(oName, oTip, oValues()) { } @@ -86,7 +94,7 @@ char GBFFootnotes::processText (SWBuf &text, const SWKey *key, const SWModule *m if (module->isProcessEntryAttributes()) { //tag = token; - if((tagText.length() == 1) || !strcmp(module->Name(), "IGNT")) { + if((tagText.length() == 1) || !strcmp(module->getName(), "IGNT")) { if (option) { // for ASV marks text in verse then put explanation at end of verse text.append(" ["); text.append(tagText); diff --git a/src/modules/filters/gbfheadings.cpp b/src/modules/filters/gbfheadings.cpp index 122445e..7e19ea1 100644 --- a/src/modules/filters/gbfheadings.cpp +++ b/src/modules/filters/gbfheadings.cpp @@ -1,9 +1,11 @@ /****************************************************************************** * - * gbfheadings - SWFilter descendant to hide or show headings - * in a GBF module. + * gbfheadings.cpp - SWFilter descendant to hide or show headings + * in a GBF module * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfheadings.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -19,20 +21,27 @@ * */ + #include #include + SWORD_NAMESPACE_START +namespace { -const char oName[] = "Headings"; -const char oTip[] = "Toggles Headings On and Off if they exist"; + static const char oName[] = "Headings"; + static const char oTip[] = "Toggles Headings On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -GBFHeadings::GBFHeadings() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +GBFHeadings::GBFHeadings() : SWOptionFilter(oName, oTip, oValues()) { } @@ -40,7 +49,7 @@ GBFHeadings::~GBFHeadings() { } -char GBFHeadings::processText (SWBuf &text, const SWKey *key, const SWModule *module) { +char GBFHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { // if we don't want headings char token[2048]; // cheese. Fix. int tokpos = 0; diff --git a/src/modules/filters/gbfhtml.cpp b/src/modules/filters/gbfhtml.cpp index 2467e36..542c4c9 100644 --- a/src/modules/filters/gbfhtml.cpp +++ b/src/modules/filters/gbfhtml.cpp @@ -1,10 +1,10 @@ /*************************************************************************** - * gbfhtml.cpp - GBF to HTML filter - * ------------------- - * begin : 2001-09-03 - * copyright : 2001 by CrossWire Bible Society * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * gbfhtml.cpp - GBF to HTML filter + * + * $Id: gbfhtml.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -54,7 +54,7 @@ GBFHTML::GBFHTML() { addTokenSubstitute("Pp", ""); addTokenSubstitute("Fn", ""); // font end addTokenSubstitute("CL", "
"); // new line - addTokenSubstitute("CM", "
"); // paragraph is a non showing comment that can be changed in the front end to

if desired + addTokenSubstitute("CM", "

"); // two new-lines addTokenSubstitute("CG", ""); // ??? addTokenSubstitute("CT", ""); // ??? addTokenSubstitute("JR", "

"); // right align begin diff --git a/src/modules/filters/gbfhtmlhref.cpp b/src/modules/filters/gbfhtmlhref.cpp index 3f25e3a..6df038e 100644 --- a/src/modules/filters/gbfhtmlhref.cpp +++ b/src/modules/filters/gbfhtmlhref.cpp @@ -1,11 +1,10 @@ /*************************************************************************** - * gbfhtmlhref.cpp - GBF to HTML filter with hrefs - * for strongs and morph tags - * ------------------- - * begin : 2001-09-03 - * copyright : 2001 by CrossWire Bible Society * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * gbfhtmlhref.cpp - GBF to HTML filter with hrefs + * + * $Id: gbfhtmlhref.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -34,7 +33,7 @@ SWORD_NAMESPACE_START GBFHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { if (module) { - version = module->Name(); + version = module->getName(); } } @@ -73,7 +72,8 @@ GBFHTMLHREF::GBFHTMLHREF() { addTokenSubstitute("JR", "
"); // right align begin addTokenSubstitute("JC", "
"); // center align begin addTokenSubstitute("JL", "
"); // align end - + + renderNoteNumbers = false; } @@ -231,6 +231,7 @@ bool GBFHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData else if (!strcmp(tag.getName(), "RF")) { SWBuf type = tag.getAttribute("type"); SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); VerseKey *vkey = NULL; // see if we have a VerseKey * or descendant SWTRY { @@ -240,10 +241,11 @@ bool GBFHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData if (vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. //char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); - buf.appendFormatted("*n ", + buf.appendFormatted("*n%s ", URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey->getText()).c_str()); + URL::encode(vkey->getText()).c_str(), + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str(): "")); } u->suspendTextPassThru = true; } diff --git a/src/modules/filters/gbfmorph.cpp b/src/modules/filters/gbfmorph.cpp index d7c8ab4..3399ae8 100644 --- a/src/modules/filters/gbfmorph.cpp +++ b/src/modules/filters/gbfmorph.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * gbfmorph - SWFilter descendant to hide or show morph tags - * in a GBF module. + * gbfmorph.cpp - SWFilter descendant to hide or show morph tags + * in a GBF module * + * $Id: gbfmorph.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,16 +24,23 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Morphological Tags"; -const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; +namespace { + + static const char oName[] = "Morphological Tags"; + static const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -GBFMorph::GBFMorph() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +GBFMorph::GBFMorph() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/gbfosis.cpp b/src/modules/filters/gbfosis.cpp index 526167a..9333f62 100644 --- a/src/modules/filters/gbfosis.cpp +++ b/src/modules/filters/gbfosis.cpp @@ -1,10 +1,10 @@ /****************************************************************************** * - * gbfstrongs - SWFilter descendant to hide or show strongs number - * in a GBF module. + * gbfosis.cpp - GBF to OSIS filter * + * $Id: gbfosis.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -29,8 +29,10 @@ #include #include + SWORD_NAMESPACE_START + GBFOSIS::GBFOSIS() { } @@ -347,7 +349,7 @@ char GBFOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module) VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey) { SWBuf ref = ""; - if (vkey->Verse()) { + if (vkey->getVerse()) { ref.appendFormatted("\t\t", vkey->getOSISRef()); } @@ -355,24 +357,24 @@ char GBFOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module) text = ref + text; - if (vkey->Verse()) { + if (vkey->getVerse()) { VerseKey *tmp = (VerseKey *)vkey->clone(); *tmp = *vkey; - tmp->AutoNormalize(0); - tmp->Headings(1); + tmp->setAutoNormalize(false); + tmp->setIntros(true); text += ""; *tmp = MAXVERSE; if (*vkey == *tmp) { - tmp->Verse(0); + tmp->setVerse(0); // sprintf(ref, "\t
"); // pushString(&to, ref); *tmp = MAXCHAPTER; *tmp = MAXVERSE; if (*vkey == *tmp) { - tmp->Chapter(0); - tmp->Verse(0); + tmp->setChapter(0); + tmp->setVerse(0); // sprintf(ref, "\t
"); // pushString(&to, ref); /* diff --git a/src/modules/filters/gbfplain.cpp b/src/modules/filters/gbfplain.cpp index e90bf94..b2a1ae4 100644 --- a/src/modules/filters/gbfplain.cpp +++ b/src/modules/filters/gbfplain.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * gbfplain - SWFilter descendant to strip out all GBF tags or convert to - * ASCII rendered symbols. + * gbfplain.cpp - SWFilter descendant to strip out all GBF tags or + * convert to ASCII rendered symbols * + * $Id: gbfplain.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,8 +25,10 @@ #include #include + SWORD_NAMESPACE_START + GBFPlain::GBFPlain() { } @@ -109,4 +112,6 @@ char GBFPlain::processText (SWBuf &text, const SWKey *key, const SWModule *modul return 0; } + SWORD_NAMESPACE_END + diff --git a/src/modules/filters/gbfredletterwords.cpp b/src/modules/filters/gbfredletterwords.cpp index 7397781..cac3cd9 100644 --- a/src/modules/filters/gbfredletterwords.cpp +++ b/src/modules/filters/gbfredletterwords.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * GBFRedLetterWords - SWFilter descendant to toggle red coloring of words of - * Christ in a GBF module. + * gbfredletterwords.cpp - SWFilter descendant to toggle red coloring of + * words of Christ in a GBF module * + * $Id: gbfredletterwords.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,16 +26,23 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Words of Christ in Red"; -const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; +namespace { + + static const char oName[] = "Words of Christ in Red"; + static const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -GBFRedLetterWords::GBFRedLetterWords() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +GBFRedLetterWords::GBFRedLetterWords() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/gbfrtf.cpp b/src/modules/filters/gbfrtf.cpp index 7471d0b..8a8e1b1 100644 --- a/src/modules/filters/gbfrtf.cpp +++ b/src/modules/filters/gbfrtf.cpp @@ -1,9 +1,10 @@ /****************************************************************************** * - * gbfrtf - SWFilter descendant to convert all GBF tags to RTF tags + * gbfrtf.cpp - SWFilter descendant to convert all GBF tags to RTF tags * + * $Id: gbfrtf.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -42,7 +43,6 @@ char GBFRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module) SWBuf strongnum; SWBuf strongtense; bool hideText = false; - int wordLen = 0; int wordCount = 0; const char *from; @@ -50,7 +50,6 @@ char GBFRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module) from = orig.c_str(); for (text = ""; *from; from++) { if (*from == '<') { - wordLen = wordCount; wordCount = 0; intoken = true; tokpos = 0; diff --git a/src/modules/filters/gbfstrongs.cpp b/src/modules/filters/gbfstrongs.cpp index c7cf6c5..dd4e167 100644 --- a/src/modules/filters/gbfstrongs.cpp +++ b/src/modules/filters/gbfstrongs.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * gbfstrongs - SWFilter descendant to hide or show strongs number - * in a GBF module. + * gbfstrongs.cpp - SWFilter descendant to hide or show Strong's number + * in a GBF module * + * $Id: gbfstrongs.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -26,16 +27,23 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Strong's Numbers"; -const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; +namespace { + + static const char oName[] = "Strong's Numbers"; + static const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -GBFStrongs::GBFStrongs() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +GBFStrongs::GBFStrongs() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/gbfthml.cpp b/src/modules/filters/gbfthml.cpp index 4feb1fa..303b240 100644 --- a/src/modules/filters/gbfthml.cpp +++ b/src/modules/filters/gbfthml.cpp @@ -1,10 +1,10 @@ /*************************************************************************** - * gbfthml.cpp - GBF to ThML filter - * ------------------- - * begin : 1999-10-27 - * copyright : 2001 by CrossWire Bible Society * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * gbfthml.cpp - GBF to ThML filter + * + * $Id: gbfthml.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,8 +24,10 @@ #include #include + SWORD_NAMESPACE_START + GBFThML::GBFThML() { } @@ -218,5 +220,4 @@ char GBFThML::processText(SWBuf &text, const SWKey *key, const SWModule *module) } - SWORD_NAMESPACE_END diff --git a/src/modules/filters/gbfwebif.cpp b/src/modules/filters/gbfwebif.cpp index b5ff798..b7b8a0f 100644 --- a/src/modules/filters/gbfwebif.cpp +++ b/src/modules/filters/gbfwebif.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * GBFWEBIF.cpp - GBF to HTML filter with hrefs - * for strongs and morph tags - * ------------------- - * begin : 2001-09-03 - * copyright : 2001 by CrossWire Bible Society * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * gbfwebif.cpp - GBF to HTML filter with hrefs for strongs and morph + * tags + * + * $Id: gbfwebif.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -29,9 +29,6 @@ SWORD_NAMESPACE_START GBFWEBIF::GBFWEBIF() : baseURL(""), passageStudyURL(baseURL + "passagestudy.jsp") { -//all is done in GBFHTMLHREF since it inherits form this class - addTokenSubstitute("FR", ""); // words of Jesus begin - addTokenSubstitute("Fr", ""); } bool GBFWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { @@ -189,7 +186,7 @@ bool GBFWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *u } else { - return GBFHTMLHREF::handleToken(buf, token, userData); + return GBFXHTML::handleToken(buf, token, userData); } } return true; diff --git a/src/modules/filters/gbfwordjs.cpp b/src/modules/filters/gbfwordjs.cpp index c3ab166..c9d1bd3 100644 --- a/src/modules/filters/gbfwordjs.cpp +++ b/src/modules/filters/gbfwordjs.cpp @@ -1,10 +1,10 @@ /****************************************************************************** * - * gbfstrongs - SWFilter descendant to hide or show strongs number - * in a GBF module. + * gbfwordjs.cpp - SWFilter descendant for ??? * + * $Id: gbfwordjs.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,17 +28,23 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Word Javascript"; -const char oTip[] = "Toggles Word Javascript data"; +namespace { + + static const char oName[] = "Word Javascript"; + static const char oTip[] = "Toggles Word Javascript data"; -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -GBFWordJS::GBFWordJS() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +GBFWordJS::GBFWordJS() : SWOptionFilter(oName, oTip, oValues()) { defaultGreekLex = 0; defaultHebLex = 0; @@ -57,7 +63,6 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul char token[2112]; // cheese. Fix. int tokpos = 0; bool intoken = false; - bool lastspace = false; int word = 1; char val[128]; char wordstr[5]; @@ -66,7 +71,7 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul bool newText = false; bool needWordOut = false; AttributeValue *wordAttrs = 0; - SWBuf modName = (module)?module->Name():""; + SWBuf modName = (module)?module->getName():""; SWBuf wordSrcPrefix = modName; const SWBuf orig = text; @@ -146,7 +151,7 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul gh = isdigit(strong[0]) ? 0:strong[0]; if (!gh) { if (vkey) { - gh = vkey->Testament() ? 'H' : 'G'; + gh = vkey->getTestament() ? 'H' : 'G'; } } else strong << 1; @@ -165,7 +170,7 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul if (sLex) { // we can pass the real lex name in, but we have some // aliases in the javascript to optimize bandwidth - lexName = sLex->Name(); + lexName = sLex->getName(); if (lexName == "StrongsGreek") lexName = "G"; if (lexName == "StrongsHebrew") @@ -174,7 +179,7 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul SWBuf wordID; if (vkey) { // optimize for bandwidth and use only the verse as the unique entry id - wordID.appendFormatted("%d", vkey->Verse()); + wordID.appendFormatted("%d", vkey->getVerse()); } else { wordID = key->getText(); @@ -192,10 +197,11 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul + if (!sMorph) sMorph = 0; // to pass unused warning for now /* if (sMorph) { SWBuf popMorph = "%s", sMorph->Name(), morph.c_str(), wordID.c_str(), morph.c_str()); + popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s", sMorph->getName(), morph.c_str(), wordID.c_str(), morph.c_str()); morph = popMorph; } */ @@ -223,7 +229,6 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul } else { text += *from; - lastspace = (*from == ' '); } } @@ -241,7 +246,7 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul gh = isdigit(strong[0]) ? 0:strong[0]; if (!gh) { if (vkey) { - gh = vkey->Testament() ? 'H' : 'G'; + gh = vkey->getTestament() ? 'H' : 'G'; } } else strong << 1; @@ -257,7 +262,7 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul if (sLex) { // we can pass the real lex name in, but we have some // aliases in the javascript to optimize bandwidth - lexName = sLex->Name(); + lexName = sLex->getName(); if (lexName == "StrongsGreek") lexName = "G"; if (lexName == "StrongsHebrew") @@ -266,7 +271,7 @@ char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modul SWBuf wordID; if (vkey) { // optimize for bandwidth and use only the verse as the unique entry id - wordID.appendFormatted("%d", vkey->Verse()); + wordID.appendFormatted("%d", vkey->getVerse()); } else { wordID = key->getText(); diff --git a/src/modules/filters/gbfxhtml.cpp b/src/modules/filters/gbfxhtml.cpp new file mode 100644 index 0000000..56d7663 --- /dev/null +++ b/src/modules/filters/gbfxhtml.cpp @@ -0,0 +1,236 @@ +/****************************************************************************** + * + * gbfxhtml.cpp - GBF to classed XHTML + * + * $Id: gbfxhtml.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + + +#include +#include +#include +#include +#include +#include +#include + +SWORD_NAMESPACE_START + +const char *GBFXHTML::getHeader() const { + return "\ + .wordsOfJesus {\ + color: red;\ + }\ + "; +} + +GBFXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + if (module) { + version = module->getName(); + } +} + +GBFXHTML::GBFXHTML() { + setTokenStart("<"); + setTokenEnd(">"); + + setTokenCaseSensitive(true); + + //addTokenSubstitute("Rf", ")"); + addTokenSubstitute("FA", ""); // for ASV footnotes to mark text + addTokenSubstitute("Rx", ""); + addTokenSubstitute("FI", ""); // italics begin + addTokenSubstitute("Fi", ""); + addTokenSubstitute("FB", ""); // bold begin + addTokenSubstitute("Fb", ""); + addTokenSubstitute("FR", ""); // words of Jesus begin + addTokenSubstitute("Fr", ""); + addTokenSubstitute("FU", ""); // underline begin + addTokenSubstitute("Fu", ""); + addTokenSubstitute("FO", ""); // Old Testament quote begin + addTokenSubstitute("Fo", ""); + addTokenSubstitute("FS", ""); // Superscript begin// Subscript begin + addTokenSubstitute("Fs", ""); + addTokenSubstitute("FV", ""); // Subscript begin + addTokenSubstitute("Fv", ""); + addTokenSubstitute("TT", ""); // Book title begin + addTokenSubstitute("Tt", ""); + addTokenSubstitute("PP", ""); // poetry begin + addTokenSubstitute("Pp", ""); + addTokenSubstitute("Fn", ""); // font end + addTokenSubstitute("CL", "
"); // new line + addTokenSubstitute("CM", "
"); // paragraph is a non showing comment that can be changed in the front end to

if desired + addTokenSubstitute("CG", ""); // ??? + addTokenSubstitute("CT", ""); // ??? + addTokenSubstitute("JR", "

"); // right align begin + addTokenSubstitute("JC", "
"); // center align begin + addTokenSubstitute("JL", "
"); // align end + + renderNoteNumbers = false; +} + + +bool GBFXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { + const char *tok; + MyUserData *u = (MyUserData *)userData; + + if (!substituteToken(buf, token)) { + XMLTag tag(token); + + if (!strncmp(token, "WG", 2)) { // strong's numbers + //buf += " <<"; + for (tok = token + 2; *tok; tok++) + //if(token[i] != '\"') + buf += *tok; + buf += ">"; + } + else if (!strncmp(token, "WH", 2)) { // strong's numbers + //buf += " <<"; + for (tok = token + 2; *tok; tok++) + //if(token[i] != '\"') + buf += *tok; + buf += ">"; + } + else if (!strncmp(token, "WTG", 3)) { // strong's numbers tense + //buf += " (("; + for (tok = token + 3; *tok; tok++) + if(*tok != '\"') + buf += *tok; + buf += ")"; + } + else if (!strncmp(token, "WTH", 3)) { // strong's numbers tense + //buf += " (("; + for (tok = token + 3; *tok; tok++) + if(*tok != '\"') + buf += *tok; + buf += ")"; + } + + else if (!strncmp(token, "WT", 2) && strncmp(token, "WTH", 3) && strncmp(token, "WTG", 3)) { // morph tags + //buf += " (("; + for (tok = token + 2; *tok; tok++) + if(*tok != '\"') + buf += *tok; + buf += ")"; + } + + else if (!strcmp(tag.getName(), "RX")) { + buf += ""; + } + else if (!strcmp(tag.getName(), "RF")) { + SWBuf type = tag.getAttribute("type"); + SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); + VerseKey *vkey = NULL; + // see if we have a VerseKey * or descendant + SWTRY { + vkey = SWDYNAMIC_CAST(VerseKey, u->key); + } + SWCATCH ( ... ) { } + if (vkey) { + // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. + //char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); + buf.appendFormatted("*n%s ", + URL::encode(footnoteNumber.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str(), + URL::encode(vkey->getText()).c_str(), + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str(): "")); + } + u->suspendTextPassThru = true; + } + else if (!strcmp(tag.getName(), "Rf")) { + u->suspendTextPassThru = false; + } +/* + else if (!strncmp(token, "RB", 2)) { + buf += " "; + u->hasFootnotePreTag = true; + } + + else if (!strncmp(token, "Rf", 2)) { + buf += " lastTextNode.c_str(); + buf += "\">"; + buf += "*n "; + // let's let text resume to output again + u->suspendTextPassThru = false; + } + + else if (!strncmp(token, "RF", 2)) { + if (u->hasFootnotePreTag) { + u->hasFootnotePreTag = false; + buf += " "; + } + u->suspendTextPassThru = true; + } +*/ + else if (!strncmp(token, "FN", 2)) { + buf += ""; + } + + else if (!strncmp(token, "CA", 2)) { // ASCII value + buf += (char)atoi(&token[2]); + } + + else { + return false; + } + } + return true; +} + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/greeklexattribs.cpp b/src/modules/filters/greeklexattribs.cpp index e1a60a2..1c2533d 100644 --- a/src/modules/filters/greeklexattribs.cpp +++ b/src/modules/filters/greeklexattribs.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * greeklexattribs - SWFilter descendant to set entry attributes for greek - * lexicons + * greeklexattribs.cpp - SWFilter descendant to set entry attributes + * for greek lexicons * + * $Id: greeklexattribs.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/filters/latin1utf16.cpp b/src/modules/filters/latin1utf16.cpp index bf2f3f8..ef27245 100644 --- a/src/modules/filters/latin1utf16.cpp +++ b/src/modules/filters/latin1utf16.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * Latin1UTF16 - SWFilter descendant to convert a Latin-1 character to UTF-16 + * latin1utf16.cpp - SWFilter descendant Latin1UTF16 to convert a Latin-1 + * character to UTF-16 * + * $Id: latin1utf16.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/filters/latin1utf8.cpp b/src/modules/filters/latin1utf8.cpp index 784aafe..a784893 100644 --- a/src/modules/filters/latin1utf8.cpp +++ b/src/modules/filters/latin1utf8.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * Latin1UTF8 - SWFilter descendant to convert a Latin-1 character to UTF-8 + * latin1utf8.cpp - SWFilter descendant Latin1UTF8 to convert a Latin-1 + * character to UTF-8 * + * $Id: latin1utf8.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,8 +26,10 @@ #include #include + SWORD_NAMESPACE_START + Latin1UTF8::Latin1UTF8() { } @@ -35,7 +38,7 @@ char Latin1UTF8::processText(SWBuf &text, const SWKey *key, const SWModule *modu { const unsigned char *from; - if ((unsigned long)key < 2) // hack, we're en(1)/de(0)ciphering + if ((unsigned long)key < 2) // hack, we're en(1)/de(0)ciphering return (char)-1; SWBuf orig = text; @@ -185,4 +188,5 @@ char Latin1UTF8::processText(SWBuf &text, const SWKey *key, const SWModule *modu return 0; } + SWORD_NAMESPACE_END diff --git a/src/modules/filters/osisenum.cpp b/src/modules/filters/osisenum.cpp new file mode 100644 index 0000000..db433b0 --- /dev/null +++ b/src/modules/filters/osisenum.cpp @@ -0,0 +1,99 @@ +/****************************************************************************** + * + * osisenum.cpp - SWFilter descendant to hide or show word enumations + * in an OSIS module + * + * $Id: osisenum.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include +#include + + +SWORD_NAMESPACE_START + +namespace { + + static const char oName[] = "Enumerations"; + static const char oTip[] = "Toggles Enumerations On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} + + +OSISEnum::OSISEnum() : SWOptionFilter(oName, oTip, oValues()) { +} + + +OSISEnum::~OSISEnum() { +} + + +char OSISEnum::processText(SWBuf &text, const SWKey *key, const SWModule *module) { + SWBuf token; + bool intoken = false; + + const SWBuf orig = text; + const char * from = orig.c_str(); + + if (!option) { + for (text = ""; *from; ++from) { + if (*from == '<') { + intoken = true; + token = ""; + continue; + } + if (*from == '>') { // process tokens + intoken = false; + if (token.startsWith("w ")) { // Word + XMLTag wtag(token); + const char *l = wtag.getAttribute("n"); + if (l) { + wtag.setAttribute("n", 0); + token = wtag; + token.trim(); + // drop <> + token << 1; + token--; + } + } + + // keep token in text + text.append('<'); + text.append(token); + text.append('>'); + + continue; + } + if (intoken) { + token += *from; + } + else { + text.append(*from); + } + } + } + return 0; +} + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/osisfootnotes.cpp b/src/modules/filters/osisfootnotes.cpp index 3d0d2d4..8008d5c 100644 --- a/src/modules/filters/osisfootnotes.cpp +++ b/src/modules/filters/osisfootnotes.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * osisfootnotes - SWFilter descendant to hide or show footnotes - * in an OSIS module. + * osisfootnotes.cpp - SWFilter descendant to hide or show footnotes + * in an OSIS module * + * $Id: osisfootnotes.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -29,17 +30,23 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Footnotes"; -const char oTip[] = "Toggles Footnotes On and Off if they exist"; +namespace { + + static const char oName[] = "Footnotes"; + static const char oTip[] = "Toggles Footnotes On and Off if they exist"; -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -OSISFootnotes::OSISFootnotes() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +OSISFootnotes::OSISFootnotes() : SWOptionFilter(oName, oTip, oValues()) { } @@ -56,7 +63,7 @@ char OSISFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *m SWBuf refs = ""; int footnoteNum = 1; char buf[254]; - SWKey *p = (module) ? module->CreateKey() : (key) ? key->clone() : new VerseKey(); + SWKey *p = (module) ? module->createKey() : (key) ? key->clone() : new VerseKey(); VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p); if (!parser) { delete p; @@ -122,7 +129,7 @@ char OSISFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *m startTag.setAttribute("swordFootnote", buf); if ((startTag.getAttribute("type")) && (!strcmp(startTag.getAttribute("type"), "crossReference"))) { if (!refs.length()) - refs = parser->ParseVerseList(tagText.c_str(), *parser, true).getRangeText(); + refs = parser->parseVerseList(tagText.c_str(), *parser, true).getRangeText(); module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str(); } } diff --git a/src/modules/filters/osisglosses.cpp b/src/modules/filters/osisglosses.cpp new file mode 100644 index 0000000..d232acc --- /dev/null +++ b/src/modules/filters/osisglosses.cpp @@ -0,0 +1,99 @@ +/****************************************************************************** + * + * osisglosses.cpp - SWFilter descendant to hide or show glosses + * in an OSIS module + * + * $Id: osisglosses.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include +#include + + +SWORD_NAMESPACE_START + +namespace { + + static const char oName[] = "Glosses"; + static const char oTip[] = "Toggles Glosses On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} + + +OSISGlosses::OSISGlosses() : SWOptionFilter(oName, oTip, oValues()) { +} + + +OSISGlosses::~OSISGlosses() { +} + + +char OSISGlosses::processText(SWBuf &text, const SWKey *key, const SWModule *module) { + SWBuf token; + bool intoken = false; + + const SWBuf orig = text; + const char * from = orig.c_str(); + + if (!option) { + for (text = ""; *from; ++from) { + if (*from == '<') { + intoken = true; + token = ""; + continue; + } + if (*from == '>') { // process tokens + intoken = false; + if (token.startsWith("w ")) { // Word + XMLTag wtag(token); + const char *l = wtag.getAttribute("gloss"); + if (l) { + wtag.setAttribute("gloss", 0); + token = wtag; + token.trim(); + // drop <> + token << 1; + token--; + } + } + + // keep token in text + text.append('<'); + text.append(token); + text.append('>'); + + continue; + } + if (intoken) { + token += *from; + } + else { + text.append(*from); + } + } + } + return 0; +} + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/osisheadings.cpp b/src/modules/filters/osisheadings.cpp index 8872f24..783fa81 100644 --- a/src/modules/filters/osisheadings.cpp +++ b/src/modules/filters/osisheadings.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - *osisheadings - SWFilter descendant to hide or show headings - * in an OSIS module. + * osisheadings.cpp - SWFilter descendant to hide or show headings + * in an OSIS module * + * $Id: osisheadings.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -27,151 +28,120 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Headings"; -const char oTip[] = "Toggles Headings On and Off if they exist"; +namespace { + + static const char oName[] = "Headings"; + static const char oTip[] = "Toggles Headings On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } + -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); + class MyUserData : public BasicFilterUserData { + public: + SWBuf currentHeadingName; + XMLTag currentHeadingTag; + const char *sID; + SWBuf heading; + int depth; + int headerNum; -OSISHeadings::OSISHeadings() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); + MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + clear(); + } + void clear() { + currentHeadingName = ""; + currentHeadingTag = ""; + sID = 0; + heading = ""; + depth = 0; + headerNum = 0; + } + }; } -OSISHeadings::~OSISHeadings() { +BasicFilterUserData *OSISHeadings::createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); } -char OSISHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) { - SWBuf token; - bool intoken = false; - bool hide = false; - bool preverse = false; - bool withinTitle = false; - bool withinPreverseDiv = false; - SWBuf preverseDivID = ""; - const char *pvDID = 0; - bool canonical = false; - SWBuf header; - int headerNum = 0; - int pvHeaderNum = 0; - char buf[254]; - XMLTag startTag; - - SWBuf orig = text; - const char *from = orig.c_str(); - - XMLTag tag; - - for (text = ""; *from; ++from) { - if (*from == '<') { - intoken = true; - token = ""; - - continue; - } - if (*from == '>') { // process tokens - intoken = false; - tag = token; - - //
(
## when in previous) - if ( (!withinPreverseDiv && !strcmp(tag.getName(), "title")) || - (!strcmp(tag.getName(), "div") && - ((withinPreverseDiv && (tag.isEndTag(pvDID))) || - (tag.getAttribute("subType") && !strcmp(tag.getAttribute("subType"), "x-preverse"))) - )) { - - withinTitle = (!tag.isEndTag(pvDID)); - if (!strcmp(tag.getName(), "div")) { - withinPreverseDiv = (!tag.isEndTag(pvDID)); - if (!pvDID) { - preverseDivID = tag.getAttribute("sID"); - pvDID = (preverseDivID.length())? preverseDivID.c_str() : 0; - } - } - - if (!tag.isEndTag(pvDID)) { //start tag - if (!tag.isEmpty() || pvDID) { - startTag = tag; - } - } - - if ( !tag.isEndTag(pvDID) && (withinPreverseDiv - || (tag.getAttribute("subType") && !stricmp(tag.getAttribute("subType"), "x-preverse")) - || (tag.getAttribute("subtype") && !stricmp(tag.getAttribute("subtype"), "x-preverse")) // deprecated - )) { - hide = true; - preverse = true; - header = ""; - canonical = (tag.getAttribute("canonical") && (!stricmp(tag.getAttribute("canonical"), "true"))); - continue; - } - if (!tag.isEndTag(pvDID)) { //start tag - hide = true; - header = ""; - if (option || canonical) { // we want the tag in the text - text.append('<'); - text.append(token); - text.append('>'); - } - continue; - } - if (hide && tag.isEndTag(pvDID)) { - if (module->isProcessEntryAttributes() && ((option || canonical) || (!preverse))) { - if (preverse) { - sprintf(buf, "%i", pvHeaderNum++); - module->getEntryAttributes()["Heading"]["Preverse"][buf] = header; - } - else { - sprintf(buf, "%i", headerNum++); - module->getEntryAttributes()["Heading"]["Interverse"][buf] = header; - if (option || canonical) { // we want the tag in the text - text.append(header); - } - } - - StringList attributes = startTag.getAttributeNames(); +OSISHeadings::OSISHeadings() : SWOptionFilter(oName, oTip, oValues()) { + setPassThruUnknownToken(true); +} + + +bool OSISHeadings::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { + + MyUserData *u = (MyUserData *)userData; + XMLTag tag(token); + SWBuf name = tag.getName(); + + // we only care about titles and divs or if we're already in a heading + // + // are we currently in a heading? + if (u->currentHeadingName.size()) { + u->heading.append(u->lastTextNode); + if (name == u->currentHeadingName) { + if (tag.isEndTag(u->sID)) { + if (!u->depth-- || u->sID) { + // we've just finished a heading. It's all stored up in u->heading + bool canonical = (SWBuf("true") == u->currentHeadingTag.getAttribute("canonical")); + bool preverse = (SWBuf("x-preverse") == u->currentHeadingTag.getAttribute("subType") || SWBuf("x-preverse") == u->currentHeadingTag.getAttribute("subtype")); + + // do we want to put anything in EntryAttributes? + if (u->module->isProcessEntryAttributes() && (option || canonical || !preverse)) { + SWBuf buf; buf.appendFormatted("%i", u->headerNum++); + u->module->getEntryAttributes()["Heading"][(preverse)?"Preverse":"Interverse"][buf] = u->heading; + + StringList attributes = u->currentHeadingTag.getAttributeNames(); for (StringList::const_iterator it = attributes.begin(); it != attributes.end(); it++) { - module->getEntryAttributes()["Heading"][buf][it->c_str()] = startTag.getAttribute(it->c_str()); + u->module->getEntryAttributes()["Heading"][buf][it->c_str()] = u->currentHeadingTag.getAttribute(it->c_str()); } } - - hide = false; - if (!(option || canonical) || preverse) { // we don't want the tag in the text anymore - preverse = false; - continue; - } - preverse = false; - pvDID = 0; - } - } - if (withinTitle) { - header.append('<'); - header.append(token); - header.append('>'); - } else { - // if not a heading token, keep token in text - if (!hide) { - text.append('<'); - text.append(token); - text.append('>'); + // do we want the heading in the body? + if (!preverse && (option || canonical)) { + buf.append(u->currentHeadingTag); + buf.append(u->heading); + buf.append(tag); + } + u->suspendTextPassThru = false; + u->clear(); } } - continue; + else u->depth++; } - if (intoken) { //copy token - token.append(*from); - } - else if (!hide) { //copy text which is not inside a token - text.append(*from); - } - else header.append(*from); + u->heading.append(tag); + return true; } - return 0; + + // are we a title or a preverse div? + else if ( name == "title" + || (name == "div" + && ( SWBuf("x-preverse") == tag.getAttribute("subType") + || SWBuf("x-preverse") == tag.getAttribute("subtype")))) { + + u->currentHeadingName = name; + u->currentHeadingTag = tag; + u->heading = ""; + u->sID = u->currentHeadingTag.getAttribute("sID"); + u->depth = 0; + u->suspendTextPassThru = true; + + return true; + } + + return false; } + + SWORD_NAMESPACE_END diff --git a/src/modules/filters/osishtmlhref.cpp b/src/modules/filters/osishtmlhref.cpp index 3406e1b..74b2da7 100644 --- a/src/modules/filters/osishtmlhref.cpp +++ b/src/modules/filters/osishtmlhref.cpp @@ -1,11 +1,10 @@ /*************************************************************************** - * osishtmlhref.cpp - OSIS to HTML with hrefs filter - * ------------------- - * begin : 2003-06-24 - * copyright : 2003 by CrossWire Bible Society + * + * osishtmlhref.cpp - OSIS to HTML with hrefs filter * + * $Id: osishtmlhref.cpp 3005 2014-01-09 04:06:11Z greg.hellings $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -36,60 +35,6 @@ SWORD_NAMESPACE_START namespace { typedef std::stack TagStack; -} - -// TODO: this bridge pattern is to preserve binary compat on 1.6.x -class OSISHTMLHREF::TagStacks { -public: - TagStack quoteStack; - TagStack hiStack; -}; - -OSISHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { - inXRefNote = false; - suspendLevel = 0; - tagStacks = new TagStacks(); - wordsOfChristStart = " "; - wordsOfChristEnd = " "; - if (module) { - osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false"))); - version = module->Name(); - BiblicalText = (!strcmp(module->Type(), "Biblical Texts")); - } - else { - osisQToTick = true; // default - version = ""; - } -} - -OSISHTMLHREF::MyUserData::~MyUserData() { - delete tagStacks; -} - -OSISHTMLHREF::OSISHTMLHREF() { - setTokenStart("<"); - setTokenEnd(">"); - - setEscapeStart("&"); - setEscapeEnd(";"); - - setEscapeStringCaseSensitive(true); - setPassThruNumericEscapeString(true); - - addAllowedEscapeString("quot"); - addAllowedEscapeString("apos"); - addAllowedEscapeString("amp"); - addAllowedEscapeString("lt"); - addAllowedEscapeString("gt"); - - setTokenCaseSensitive(true); - - // addTokenSubstitute("lg", "
"); - // addTokenSubstitute("/lg", "
"); - - morphFirst = false; -} - // though this might be slightly slower, possibly causing an extra bool check, this is a renderFilter // so speed isn't the absolute highest priority, and this is a very minor possible hit static inline void outText(const char *t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; } @@ -157,6 +102,61 @@ void processMorph(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) { //} } } +} // end anonymous namespace + +// TODO: this bridge pattern is to preserve binary compat on 1.6.x +class OSISHTMLHREF::TagStacks { +public: + TagStack quoteStack; + TagStack hiStack; +}; + +OSISHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + inXRefNote = false; + suspendLevel = 0; + tagStacks = new TagStacks(); + wordsOfChristStart = " "; + wordsOfChristEnd = " "; + if (module) { + osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false"))); + version = module->getName(); + BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + } + else { + osisQToTick = true; // default + version = ""; + } +} + +OSISHTMLHREF::MyUserData::~MyUserData() { + delete tagStacks; +} + +OSISHTMLHREF::OSISHTMLHREF() { + setTokenStart("<"); + setTokenEnd(">"); + + setEscapeStart("&"); + setEscapeEnd(";"); + + setEscapeStringCaseSensitive(true); + setPassThruNumericEscapeString(true); + + addAllowedEscapeString("quot"); + addAllowedEscapeString("apos"); + addAllowedEscapeString("amp"); + addAllowedEscapeString("lt"); + addAllowedEscapeString("gt"); + + setTokenCaseSensitive(true); + + // addTokenSubstitute("lg", "
"); + // addTokenSubstitute("/lg", "
"); + + morphFirst = false; + renderNoteNumbers = false; +} + bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { MyUserData *u = (MyUserData *)userData; @@ -240,6 +240,7 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat if (!strongsMarkup) { // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); VerseKey *vkey = NULL; char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); @@ -251,25 +252,14 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat vkey = SWDYNAMIC_CAST(VerseKey, u->key); } SWCATCH ( ... ) { } - if (vkey) { - //printf("URL = %s\n",URL::encode(vkey->getText()).c_str()); - buf.appendFormatted("*%c", - ch, - URL::encode(footnoteNumber.c_str()).c_str(), - URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey->getText()).c_str(), - ch, - ch); - } - else { - buf.appendFormatted("*%c", - ch, - URL::encode(footnoteNumber.c_str()).c_str(), - URL::encode(u->version.c_str()).c_str(), - URL::encode(u->key->getText()).c_str(), - ch, - ch); - } + buf.appendFormatted("*%c%s", + ch, + URL::encode(footnoteNumber.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str(), + URL::encode(vkey ? vkey->getText() : u->key->getText()).c_str(), + ch, + ch, + (renderNoteNumbers ? noteName.c_str() : "")); } } u->suspendTextPassThru = (++u->suspendLevel); @@ -381,7 +371,7 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat } // - else if (!strcmp(tag.getName(), "lb")) { + else if (!strcmp(tag.getName(), "lb") && (!tag.getAttribute("type") || strcmp(tag.getAttribute("type"), "x-optional"))) { outText("
", buf, u); userData->supressAdjacentWhitespace = true; } @@ -485,10 +475,15 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat // text highlighting else if (!strcmp(tag.getName(), "hi")) { SWBuf type = tag.getAttribute("type"); + // handle tei rend attribute + if (!type.length()) type = tag.getAttribute("rend"); if ((!tag.isEndTag()) && (!tag.isEmpty())) { if (type == "bold" || type == "b" || type == "x-b") { outText("", buf, u); } + else if (type == "ol") { + outText("", buf, u); + } else { // all other types outText("", buf, u); } @@ -500,10 +495,14 @@ bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat XMLTag tag(u->tagStacks->hiStack.top()); u->tagStacks->hiStack.pop(); type = tag.getAttribute("type"); + if (!type.length()) type = tag.getAttribute("rend"); } if (type == "bold" || type == "b" || type == "x-b") { outText("", buf, u); } + else if (type == "ol") { + outText("", buf, u); + } else outText("", buf, u); } } diff --git a/src/modules/filters/osislemma.cpp b/src/modules/filters/osislemma.cpp index 7b56024..cf5d8f4 100644 --- a/src/modules/filters/osislemma.cpp +++ b/src/modules/filters/osislemma.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * osislemma - SWFilter descendant to hide or show lemmata - * in a OSIS module. + * osislemma.cpp - SWFilter descendant to hide or show lemmata + * in a OSIS module * + * $Id: osislemma.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,16 +25,23 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Lemmas"; -const char oTip[] = "Toggles Lemmas On and Off if they exist"; +namespace { + + static const char oName[] = "Lemmas"; + static const char oTip[] = "Toggles Lemmas On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -OSISLemma::OSISLemma() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +OSISLemma::OSISLemma() : SWOptionFilter(oName, oTip, oValues()) { } @@ -44,7 +52,6 @@ OSISLemma::~OSISLemma() { char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) { SWBuf token; bool intoken = false; - bool lastspace = false; const SWBuf orig = text; const char * from = orig.c_str(); @@ -90,7 +97,6 @@ char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *modul } else { text.append(*from); - lastspace = (*from == ' '); } } } diff --git a/src/modules/filters/osismorph.cpp b/src/modules/filters/osismorph.cpp index 7ceec79..71de8e5 100644 --- a/src/modules/filters/osismorph.cpp +++ b/src/modules/filters/osismorph.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * osismorph - SWFilter descendant to hide or show morph tags - * in a OSIS module. + * osismorph.cpp - SWFilter descendant to hide or show morph tags + * in a OSIS module * + * $Id: osismorph.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,14 +26,20 @@ SWORD_NAMESPACE_START -const char oName[] = "Morphological Tags"; -const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; +namespace { -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const char oName[] = "Morphological Tags"; + static const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; -OSISMorph::OSISMorph() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } + +} + +OSISMorph::OSISMorph() : SWOptionFilter(oName, oTip, oValues()) { } @@ -45,7 +52,6 @@ char OSISMorph::processText(SWBuf &text, const SWKey *key, const SWModule *modul char token[2048]; // cheese. Fix. int tokpos = 0; bool intoken = false; - bool lastspace = false; SWBuf orig = text; const char *from = orig.c_str(); @@ -90,7 +96,6 @@ char OSISMorph::processText(SWBuf &text, const SWKey *key, const SWModule *modul } else { text.append(*from); - lastspace = (*from == ' '); } } } diff --git a/src/modules/filters/osismorphsegmentation.cpp b/src/modules/filters/osismorphsegmentation.cpp index fef7af7..9afc0a1 100644 --- a/src/modules/filters/osismorphsegmentation.cpp +++ b/src/modules/filters/osismorphsegmentation.cpp @@ -1,10 +1,12 @@ /****************************************************************************** * - * osismorphsegmentation - SWFilter descendant to toggle splitting of morphemes - * (for morpheme segmented Hebrew in the WLC) + * osismorphsegmentation.cpp - SWFilter descendant to toggle splitting of + * morphemes (for morpheme segmented Hebrew in + * the WLC) * + * $Id: osismorphsegmentation.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -26,16 +28,23 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Morpheme Segmentation"; -const char oTip[] = "Toggles Morpheme Segmentation On and Off, when present"; +namespace { + + static const char oName[] = "Morpheme Segmentation"; + static const char oTip[] = "Toggles Morpheme Segmentation On and Off, when present"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -OSISMorphSegmentation::OSISMorphSegmentation() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +OSISMorphSegmentation::OSISMorphSegmentation() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/osisosis.cpp b/src/modules/filters/osisosis.cpp index 82a6bfc..2bc5cbb 100644 --- a/src/modules/filters/osisosis.cpp +++ b/src/modules/filters/osisosis.cpp @@ -1,10 +1,10 @@ /*************************************************************************** - * osisosis.cpp - internal OSIS to public OSIS filter - * ------------------- - * begin : 2004-03-13 - * copyright : 2003 by CrossWire Bible Society * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * osisosis.cpp - internal OSIS to public OSIS filter + * + * $Id: osisosis.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -59,7 +59,7 @@ char OSISOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey) { SWBuf ref = ""; - if (vkey->Verse()) { + if (vkey->getVerse()) { ref.appendFormatted("\t\t", vkey->getOSISRef()); } @@ -67,24 +67,24 @@ char OSISOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module text = ref + text; - if (vkey->Verse()) { + if (vkey->getVerse()) { VerseKey *tmp = (VerseKey *)vkey->clone(); *tmp = *vkey; - tmp->AutoNormalize(0); - tmp->Headings(1); + tmp->setAutoNormalize(false); + tmp->setIntros(true); text += ""; *tmp = MAXVERSE; if (*vkey == *tmp) { - tmp->Verse(0); + tmp->setVerse(0); // sprintf(ref, "\t
"); // pushString(&to, ref); *tmp = MAXCHAPTER; *tmp = MAXVERSE; if (*vkey == *tmp) { - tmp->Chapter(0); - tmp->Verse(0); + tmp->setChapter(0); + tmp->setVerse(0); // sprintf(ref, "\t
"); // pushString(&to, ref); } diff --git a/src/modules/filters/osisplain.cpp b/src/modules/filters/osisplain.cpp index 57105f0..6e583a4 100644 --- a/src/modules/filters/osisplain.cpp +++ b/src/modules/filters/osisplain.cpp @@ -1,10 +1,10 @@ /****************************************************************************** - * osisplain.cpp - An SWFilter - * impl that provides stripping of OSIS tags * - * $Id: osisplain.cpp 2334 2009-04-24 00:14:12Z scribe $ + * osisplain.cpp - An SWFilter that provides stripping of OSIS tags * - * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisplain.cpp 2984 2013-09-20 12:18:45Z scribe $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,17 +28,21 @@ SWORD_NAMESPACE_START + namespace { -class MyUserData : public BasicFilterUserData { -public: - SWBuf w; - XMLTag tag; - VerseKey *vk; - char testament; - MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {} -}; + + class MyUserData : public BasicFilterUserData { + public: + SWBuf w; + XMLTag tag; + VerseKey *vk; + char testament; + SWBuf hiType; + MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {} + }; } + OSISPlain::OSISPlain() { setTokenStart("<"); setTokenEnd(">"); @@ -65,7 +69,7 @@ OSISPlain::OSISPlain() { BasicFilterUserData *OSISPlain::createUserData(const SWModule *module, const SWKey *key) { MyUserData *u = new MyUserData(module, key); u->vk = SWDYNAMIC_CAST(VerseKey, u->key); - u->testament = (u->vk) ? u->vk->Testament() : 2; // default to NT + u->testament = (u->vk) ? u->vk->getTestament() : 2; // default to NT return u; } @@ -202,6 +206,40 @@ bool OSISPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * end += buf.size() - u->lastTextNode.size(); toupperstr(end); } + else if (!strncmp(token, "hi", 2)) { + + // handle both OSIS 'type' and TEI 'rend' attributes + // there is no officially supported OSIS overline attribute, + // thus either TEI overline or OSIS x-overline would be best, + // but we have used "ol" in the past, as well. Once a valid + // OSIS overline attribute is made available, these should all + // eventually be deprecated and never documented that they are supported. + if (strstr(token, "rend=\"ol\"") || strstr(token, "rend=\"x-overline\"") || strstr(token, "rend=\"overline\"") + || strstr(token, "type=\"ol\"") || strstr(token, "type=\"x-overline\"") || strstr(token, "type=\"overline\"")) { + u->hiType = "overline"; + } + else u->hiType = ""; + u->suspendTextPassThru = true; + } + else if (!strncmp(token, "/hi", 3)) { + if (u->hiType == "overline") { + const unsigned char *b = (const unsigned char *)u->lastTextNode.c_str(); + while (*b) { + const unsigned char *o = b; + if (getUniCharFromUTF8(&b)) { + while (o != b) buf.append(*(o++)); + buf.append((unsigned char)0xCC); + buf.append((unsigned char)0x85); + } + } + } + else { + buf.append("*"); + buf.append(u->lastTextNode); + buf.append("*"); + } + u->suspendTextPassThru = false; + } // else if (!strncmp(token, "milestone", 9)) { diff --git a/src/modules/filters/osisredletterwords.cpp b/src/modules/filters/osisredletterwords.cpp index 9075fd8..e7c921c 100644 --- a/src/modules/filters/osisredletterwords.cpp +++ b/src/modules/filters/osisredletterwords.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * OSISRedLetterWords - SWFilter descendant to toggle red coloring for words - * of Christ in an OSIS module. + * osisredletterwords.cpp - SWFilter descendant to toggle red coloring for + * words of Christ in an OSIS module * + * $Id: osisredletterwords.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -27,14 +28,20 @@ SWORD_NAMESPACE_START -const char oName[] = "Words of Christ in Red"; -const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; +namespace { -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const char oName[] = "Words of Christ in Red"; + static const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; -OSISRedLetterWords::OSISRedLetterWords() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("On"); + static const StringList *oValues() { + static const SWBuf choices[3] = {"On", "Off", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} + + +OSISRedLetterWords::OSISRedLetterWords() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/osisreferencelinks.cpp b/src/modules/filters/osisreferencelinks.cpp new file mode 100644 index 0000000..83308e4 --- /dev/null +++ b/src/modules/filters/osisreferencelinks.cpp @@ -0,0 +1,114 @@ +/****************************************************************************** + * + * osisreferencelinks.cpp - SWFilter descendant to toggle OSIS reference + * links with specified type/subType + * + * $Id: osisreferencelinks.cpp 2995 2013-12-28 06:32:26Z greg.hellings $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include +#include +#include + + +SWORD_NAMESPACE_START + + +namespace { + + static const StringList *oValues() { + static const SWBuf choices[3] = {"On", "Off", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} + + +OSISReferenceLinks::OSISReferenceLinks(const char *optionName, const char *optionTip, const char *type, const char *subType, const char *defaultValue) + : SWOptionFilter(), + optionName(optionName), + optionTip(optionTip), + type(type), + subType(subType) { + + optName = this->optionName.c_str(); + optTip = this->optionTip.c_str(); + optValues = oValues(); + setOptionValue(defaultValue); +} + + +OSISReferenceLinks::~OSISReferenceLinks() { +} + + +char OSISReferenceLinks::processText(SWBuf &text, const SWKey *key, const SWModule *module) { + if (option) return 0; + + SWBuf token; + bool intoken = false; + bool stripThisToken = false; + + SWBuf orig = text; + const char *from = orig.c_str(); + + for (text = ""; *from; ++from) { + if (*from == '<') { + intoken = true; + token = ""; + continue; + } + else if (*from == '>') { // process tokens + intoken = false; + if (strncmp(token, "reference", 9) && strncmp(token.c_str(), "/reference", 10)) { + text.append('<'); + text.append(token); + text.append('>'); + } + else { + XMLTag tag; + tag = token; + if (!tag.isEndTag() && type == tag.getAttribute("type") && (!subType.size() || subType == tag.getAttribute("subType"))) { + stripThisToken = true; + continue; + } + else if (tag.isEndTag() && stripThisToken) { + stripThisToken = false; + continue; + } + text.append('<'); + text.append(token); + text.append('>'); + } + continue; + } + + if (intoken) { //copy token + token.append(*from); + } + else { //copy text which is not inside a token + text.append(*from); + } + } + return 0; +} + +SWORD_NAMESPACE_END + + diff --git a/src/modules/filters/osisrtf.cpp b/src/modules/filters/osisrtf.cpp index b8cf30c..291aa08 100644 --- a/src/modules/filters/osisrtf.cpp +++ b/src/modules/filters/osisrtf.cpp @@ -1,11 +1,10 @@ /*************************************************************************** - * osisrtf.cpp - OSIS to RTF filter - * ------------------- - * begin : 2003-02-15 - * copyright : 2003 by CrossWire Bible Society * + * osisrtf.cpp - OSIS to RTF filter * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osisrtf.cpp 3005 2014-01-09 04:06:11Z greg.hellings $ * + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -53,8 +52,8 @@ namespace { BiblicalText = false; suspendLevel = 0; if (module) { - version = module->Name(); - BiblicalText = (!strcmp(module->Type(), "Biblical Texts")); + version = module->getName(); + BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false"))); } @@ -68,9 +67,11 @@ namespace { delete [] tagData; } } -static inline void outText(const char *t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; } -static inline void outText(char t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; } -}; + + static inline void outText(const char *t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; } + static inline void outText(char t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; } + +} OSISRTF::OSISRTF() { @@ -251,7 +252,7 @@ bool OSISRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us SWCATCH ( ... ) { } if (vkey) { char ch = ((!strcmp(type.c_str(), "crossReference")) || (!strcmp(type.c_str(), "x-cross-ref"))) ? 'x':'n'; - scratch.setFormatted("{\\super *%c%i.%s} ", ch, vkey->Verse(), footnoteNumber.c_str()); + scratch.setFormatted("{\\super *%c%i.%s} ", ch, vkey->getVerse(), footnoteNumber.c_str()); outText(scratch.c_str(), buf, u); u->inXRefNote = (ch == 'x'); } @@ -325,7 +326,7 @@ bool OSISRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us } // or - else if ((!strcmp(tag.getName(), "lb")) || ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line")))) { + else if ((!strcmp(tag.getName(), "lb") && (!tag.getAttribute("type") || strcmp(tag.getAttribute("type"), "x-optional"))) || ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line")))) { outText("{\\par}", buf, u); userData->supressAdjacentWhitespace = true; } diff --git a/src/modules/filters/osisruby.cpp b/src/modules/filters/osisruby.cpp deleted file mode 100644 index c17ea43..0000000 --- a/src/modules/filters/osisruby.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/****************************************************************************** - * - * osisruby - SWFilter descendant to hide or show ruby - * in a OSIS module. - * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include -#include -#include - -SWORD_NAMESPACE_START - -const char oName[] = "Ruby"; -const char oTip[] = "Toggles Ruby On and Off if they exist"; - -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); - -OSISRuby::OSISRuby() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); -} - - -OSISRuby::~OSISRuby() { -} - - -char OSISRuby::processText(SWBuf &text, const SWKey *key, const SWModule *module) { - SWBuf token; - bool intoken = false; - bool lastspace = false; - - const SWBuf orig = text; - const char * from = orig.c_str(); - - if (!option) { - for (text = ""; *from; ++from) { - if (*from == '<') { - intoken = true; - token = ""; - continue; - } - if (*from == '>') { // process tokens - intoken = false; - if (token.startsWith("w ")) { // Word - XMLTag wtag(token); - const char *l = wtag.getAttribute("gloss"); - if (l) { - wtag.setAttribute("gloss", 0); - token = wtag; - token.trim(); - // drop <> - token << 1; - token--; - } - } - - // keep token in text - text.append('<'); - text.append(token); - text.append('>'); - - continue; - } - if (intoken) { - token += *from; - } - else { - text.append(*from); - lastspace = (*from == ' '); - } - } - } - return 0; -} - -SWORD_NAMESPACE_END diff --git a/src/modules/filters/osisscripref.cpp b/src/modules/filters/osisscripref.cpp index 73c7309..2bb7d15 100644 --- a/src/modules/filters/osisscripref.cpp +++ b/src/modules/filters/osisscripref.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * OSISScripref - SWFilter descendant to hide or show scripture references - * in an OSIS module. + * osisscripref.cpp - SWFilter descendant to hide or show scripture + * references in an OSIS module * + * $Id: osisscripref.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,16 +26,23 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Cross-references"; -const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; +namespace { + + static const char oName[] = "Cross-references"; + static const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"On", "Off", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -OSISScripref::OSISScripref() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("On"); +OSISScripref::OSISScripref() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/osisstrongs.cpp b/src/modules/filters/osisstrongs.cpp index 8c06b07..b937883 100644 --- a/src/modules/filters/osisstrongs.cpp +++ b/src/modules/filters/osisstrongs.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * osisstrongs - SWFilter descendant to hide or show strongs number - * in a OSIS module. + * osisstrongs.cpp - SWFilter descendant to hide or show Strong's number + * in a OSIS module * + * $Id: osisstrongs.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,17 +29,23 @@ #include #include + SWORD_NAMESPACE_START -const char oName[] = "Strong's Numbers"; -const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; +namespace { + + static const char oName[] = "Strong's Numbers"; + static const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -OSISStrongs::OSISStrongs() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +OSISStrongs::OSISStrongs() : SWOptionFilter(oName, oTip, oValues()) { } @@ -49,7 +56,6 @@ OSISStrongs::~OSISStrongs() { char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) { SWBuf token; bool intoken = false; - bool lastspace = false; int wordNum = 1; char wordstr[5]; const char *wordStart = 0; @@ -151,7 +157,7 @@ char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod if ((lClass == "x-Strongs") || (lClass == "strong") || (lClass == "Strong")) { if (isdigit(attrib[0])) { if (vkey) { - gh = vkey->Testament() ? 'H' : 'G'; + gh = vkey->getTestament() ? 'H' : 'G'; } } else { @@ -280,7 +286,6 @@ char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *mod } else { text.append(*from); - lastspace = (*from == ' '); } } return 0; diff --git a/src/modules/filters/osisvariants.cpp b/src/modules/filters/osisvariants.cpp index 16e0cfb..6cd3eda 100644 --- a/src/modules/filters/osisvariants.cpp +++ b/src/modules/filters/osisvariants.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * osisvariants - SWFilter descendant to hide or show textual variants - * in an OSIS module. + * osisvariants.cpp - SWFilter descendant to hide or show textual variants + * in an OSIS module * + * $Id: osisvariants.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,51 +24,41 @@ #include #include #include +#include -SWORD_NAMESPACE_START -const char OSISVariants::primary[] = "Primary Reading"; -const char OSISVariants::secondary[] = "Secondary Reading"; -const char OSISVariants::all[] = "All Readings"; +SWORD_NAMESPACE_START -const char OSISVariants::optName[] = "Textual Variants"; -const char OSISVariants::optTip[] = "Switch between Textual Variants modes"; +namespace { + static const char oName[] = "Textual Variants"; + static const char oTip[] = "Switch between Textual Variants modes"; + static const char *choices[4] = { "Primary Reading", "Secondary Reading", "All Readings", "" }; -OSISVariants::OSISVariants() { - option = false; - options.push_back(primary); - options.push_back(secondary); - options.push_back(all); + static const StringList *oValues() { + static const StringList oVals(&choices[0], &choices[3]); + return &oVals; + } } -OSISVariants::~OSISVariants() { +OSISVariants::OSISVariants() : SWOptionFilter(oName, oTip, oValues()) { } -void OSISVariants::setOptionValue(const char *ival) -{ - if (!stricmp(ival, primary)) option = 0; - else if (!stricmp(ival, secondary)) option = 1; - else option = 2; -} -const char *OSISVariants::getOptionValue() -{ - if (option == 0) { - return primary; - } - else if (option == 1) { - return secondary; - } - else { - return all; - } +OSISVariants::~OSISVariants() { } + char OSISVariants::processText(SWBuf &text, const SWKey *key, const SWModule *module) { - if (option == 0 || option == 1) { //we want primary or variant only + + int option = 0; + if (optionValue == choices[0]) option = 0; + else if (optionValue == choices[1]) option = 1; + else option = 2; + + if (option == 0 || option == 1) { //we want primary or variant only bool intoken = false; bool hide = false; bool invar = false; @@ -75,9 +66,10 @@ char OSISVariants::processText(SWBuf &text, const SWKey *key, const SWModule *mo SWBuf token; SWBuf orig = text; const char *from = orig.c_str(); + XMLTag tag; //we use a fixed comparision string to make sure the loop is as fast as the original two blocks with almost the same code - //const char* variantCompareString = (option == 0) ? "div type=\"variant\" class=\"1\"" : "div type=\"variant\" class=\"2\""; + const char* variantChoice = (option == 0) ? "x-2" : "x-1"; for (text = ""; *from; from++) { if (*from == '<') { @@ -88,16 +80,16 @@ char OSISVariants::processText(SWBuf &text, const SWKey *key, const SWModule *mo else if (*from == '>') { // process tokens intoken = false; - if (!strncmp(token.c_str(), "seg ", 4)) { //only one of the variants - invar = true; - hide = true; - continue; - } - if (!strncmp(token.c_str(), "div type=\"variant\"", 18)) { - invar = true; - continue; + if (!strncmp(token.c_str(), "seg", 3)) { + tag = token; + + if (tag.getAttribute("type") && !strcmp("x-variant", tag.getAttribute("type")) && tag.getAttribute("subType") && !strcmp(variantChoice, tag.getAttribute("subType"))) { + invar = true; + hide = true; + continue; + } } - if (!strncmp(token.c_str(), "/div", 4)) { + if (!strncmp(token.c_str(), "/seg", 4)) { hide = false; if (invar) { invar = false; @@ -126,8 +118,4 @@ char OSISVariants::processText(SWBuf &text, const SWKey *key, const SWModule *mo } - - - - SWORD_NAMESPACE_END diff --git a/src/modules/filters/osiswebif.cpp b/src/modules/filters/osiswebif.cpp index e313836..2cbca0b 100644 --- a/src/modules/filters/osiswebif.cpp +++ b/src/modules/filters/osiswebif.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * OSISWEBIF.cpp - OSIS to HTML filter with hrefs - * for strongs and morph tags - * ------------------- - * begin : 2003-10-23 - * copyright : 2003 by CrossWire Bible Society * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * osiswebif.cpp - OSIS to HTML filter with hrefs for strongs and + * morph tags + * + * $Id: osiswebif.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -37,20 +37,13 @@ OSISWEBIF::OSISWEBIF() : baseURL(""), passageStudyURL(baseURL + "passagestudy.js } -BasicFilterUserData *OSISWEBIF::createUserData(const SWModule *module, const SWKey *key) { - MyUserData *u = new MyUserData(module, key); - u->wordsOfChristStart = " "; - u->wordsOfChristEnd = " "; - return u; -} - - bool OSISWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { MyUserData *u = (MyUserData *)userData; SWBuf scratch; bool sub = (u->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token); if (!sub) { - // manually process if it wasn't a simple substitution + + // manually process if it wasn't a simple substitution XMLTag tag(token); // tag @@ -143,7 +136,7 @@ bool OSISWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * if (!tag.isEmpty()) { if (!strongsMarkup) { // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); - SWBuf modName = (u->module) ? u->module->Name() : ""; + SWBuf modName = (u->module) ? u->module->getName() : ""; VerseKey *vkey = NULL; // see if we have a VerseKey * or descendant SWTRY { @@ -165,43 +158,10 @@ bool OSISWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * } } - // - else if (!strcmp(tag.getName(), "title")) { - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf += "<h3>"; - } - else if (tag.isEndTag()) { - buf += "</h3>"; - } - } - - // Milestoned paragraphs, created by osis2mod - // <div type="paragraph" sID.../> - // <div type="paragraph" eID.../> - else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "paragraph")) { - // This is properly handled by base class. - return OSISHTMLHREF::handleToken(buf, token, userData); - } - - // ok to leave these in - else if (!strcmp(tag.getName(), "div")) { - buf += tag; - } - else if (!strcmp(tag.getName(), "span")) { - buf += tag; - } - else if (!strcmp(tag.getName(), "br")) { - buf += tag; - } // handled appropriately in base class - // <catchWord> & <rdg> tags (italicize) - // <hi> text highlighting - // <q> quote - // <milestone type="cQuote" marker="x"/> - // <transChange> else { - return OSISHTMLHREF::handleToken(buf, token, userData); + return OSISXHTML::handleToken(buf, token, userData); } } return true; diff --git a/src/modules/filters/osiswordjs.cpp b/src/modules/filters/osiswordjs.cpp index da573d3..75946a8 100644 --- a/src/modules/filters/osiswordjs.cpp +++ b/src/modules/filters/osiswordjs.cpp @@ -1,10 +1,10 @@ /****************************************************************************** * - * osisstrongs - SWFilter descendant to hide or show strongs number - * in a OSIS module. + * osiswordjs.cpp - SWFilter descendant for ??? * + * $Id: osiswordjs.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,17 +30,23 @@ #include <versekey.h> #include <stdio.h> + SWORD_NAMESPACE_START -const char oName[] = "Word Javascript"; -const char oTip[] = "Toggles Word Javascript data"; +namespace { + + static const char oName[] = "Word Javascript"; + static const char oTip[] = "Toggles Word Javascript data"; -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -OSISWordJS::OSISWordJS() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +OSISWordJS::OSISWordJS() : SWOptionFilter(oName, oTip, oValues()) { defaultGreekLex = 0; defaultHebLex = 0; @@ -59,10 +65,9 @@ char OSISWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu char token[2112]; // cheese. Fix. int tokpos = 0; bool intoken = false; - bool lastspace = false; int wordNum = 1; char wordstr[5]; - SWBuf modName = (module)?module->Name():""; + SWBuf modName = (module)?module->getName():""; // add TR to w src in KJV then remove this next line SWBuf wordSrcPrefix = (modName == "KJV")?SWBuf("TR"):modName; @@ -135,10 +140,10 @@ char OSISWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu // we can pass the real lex name in, but we have some // aliases in the javascript to optimize bandwidth if ((gh == 'G') && (defaultGreekLex)) { - lexName = (!strcmp(defaultGreekLex->Name(), "StrongsGreek"))?"G":defaultGreekLex->Name(); + lexName = (!strcmp(defaultGreekLex->getName(), "StrongsGreek"))?"G":defaultGreekLex->getName(); } else if ((gh == 'H') && (defaultHebLex)) { - lexName = (!strcmp(defaultHebLex->Name(), "StrongsHebrew"))?"H":defaultHebLex->Name(); + lexName = (!strcmp(defaultHebLex->getName(), "StrongsHebrew"))?"H":defaultHebLex->getName(); } SWBuf xlit = wtag.getAttribute("xlit"); @@ -151,7 +156,7 @@ char OSISWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu SWBuf wordID; if (vkey) { // optimize for bandwidth and use only the verse as the unique entry id - wordID.appendFormatted("%d", vkey->Verse()); + wordID.appendFormatted("%d", vkey->getVerse()); } else { wordID = key->getText(); @@ -186,7 +191,6 @@ char OSISWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu } else { text.append(*from); - lastspace = (*from == ' '); } } } diff --git a/src/modules/filters/osisxhtml.cpp b/src/modules/filters/osisxhtml.cpp new file mode 100644 index 0000000..b1040a9 --- /dev/null +++ b/src/modules/filters/osisxhtml.cpp @@ -0,0 +1,772 @@ +/****************************************************************************** + * + * osisxhtml.cpp - Render filter for classed XHTML of an OSIS module + * + * $Id: osisxhtml.cpp 3005 2014-01-09 04:06:11Z greg.hellings $ + * + * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include <stdlib.h> +#include <ctype.h> +#include <osisxhtml.h> +#include <utilxml.h> +#include <utilstr.h> +#include <versekey.h> +#include <swmodule.h> +#include <url.h> +#include <stringmgr.h> +#include <stack> + +SWORD_NAMESPACE_START + +const char *OSISXHTML::getHeader() const { + const static char *header = "\ + .divineName { font-variant: small-caps; }\n\ + .wordsOfJesus { color: red; }\n\ + .transChangeSupplied { font-style: italic; }\n\ + .small, .sub, .sup { font-size: .83em }\n\ + .sub { vertical-align: sub }\n\ + .sup { vertical-align: super }\n\ + .indent1 { margin-left: 10px }\n\ + .indent2 { margin-left: 20px }\n\ + .indent3 { margin-left: 30px }\n\ + .indent4 { margin-left: 40px }\n\ + "; + return header; +} + + +namespace { + +// though this might be slightly slower, possibly causing an extra bool check, this is a renderFilter +// so speed isn't the absolute highest priority, and this is a very minor possible hit +static inline void outText(const char *t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; } +static inline void outText(char t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; } + +void processLemma(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) { + const char *attrib; + const char *val; + if ((attrib = tag.getAttribute("lemma"))) { + int count = tag.getAttributePartCount("lemma", ' '); + int i = (count > 1) ? 0 : -1; // -1 for whole value cuz it's faster, but does the same thing as 0 + do { + attrib = tag.getAttribute("lemma", i, ' '); + if (i < 0) i = 0; // to handle our -1 condition + val = strchr(attrib, ':'); + val = (val) ? (val + 1) : attrib; + SWBuf gh; + if(*val == 'G') + gh = "Greek"; + if(*val == 'H') + gh = "Hebrew"; + const char *val2 = val; + if ((strchr("GH", *val)) && (isdigit(val[1]))) + val2++; + //if ((!strcmp(val2, "3588")) && (lastText.length() < 1)) + // show = false; + //else { + if (!suspendTextPassThru) { + buf.appendFormatted("<small><em class=\"strongs\"><<a href=\"passagestudy.jsp?action=showStrongs&type=%s&value=%s\" class=\"strongs\">%s</a>></em></small>", + (gh.length()) ? gh.c_str() : "", + URL::encode(val2).c_str(), + val2); + } + //} + + } while (++i < count); + } +} + + + +void processMorph(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) { + const char * attrib; + const char *val; + if ((attrib = tag.getAttribute("morph"))) { // && (show)) { + SWBuf savelemma = tag.getAttribute("savlm"); + //if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1)) + // show = false; + //if (show) { + int count = tag.getAttributePartCount("morph", ' '); + int i = (count > 1) ? 0 : -1; // -1 for whole value cuz it's faster, but does the same thing as 0 + do { + attrib = tag.getAttribute("morph", i, ' '); + if (i < 0) i = 0; // to handle our -1 condition + val = strchr(attrib, ':'); + val = (val) ? (val + 1) : attrib; + const char *val2 = val; + if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2]))) + val2+=2; + if (!suspendTextPassThru) { + buf.appendFormatted("<small><em class=\"morph\">(<a href=\"passagestudy.jsp?action=showMorph&type=%s&value=%s\" class=\"morph\">%s</a>)</em></small>", + URL::encode(tag.getAttribute("morph")).c_str(), + URL::encode(val).c_str(), + val2); + } + } while (++i < count); + //} + } +} + + +} // end anonymous namespace + +BasicFilterUserData *OSISXHTML::createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); +} + + +OSISXHTML::OSISXHTML() { + setTokenStart("<"); + setTokenEnd(">"); + + setEscapeStart("&"); + setEscapeEnd(";"); + + setEscapeStringCaseSensitive(true); + setPassThruNumericEscapeString(true); + + addAllowedEscapeString("quot"); + addAllowedEscapeString("apos"); + addAllowedEscapeString("amp"); + addAllowedEscapeString("lt"); + addAllowedEscapeString("gt"); + + setTokenCaseSensitive(true); + + // addTokenSubstitute("lg", "<br />"); + // addTokenSubstitute("/lg", "<br />"); + + morphFirst = false; + renderNoteNumbers = false; +} + +class OSISXHTML::TagStack : public std::stack<SWBuf> { +}; + +OSISXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key), quoteStack(new TagStack()), hiStack(new TagStack()), titleStack(new TagStack()), lineStack(new TagStack()) { + inXRefNote = false; + suspendLevel = 0; + wordsOfChristStart = "<span class=\"wordsOfJesus\"> "; + wordsOfChristEnd = "</span> "; + if (module) { + osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false"))); + version = module->getName(); + BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + } + else { + osisQToTick = true; // default + version = ""; + } + consecutiveNewlines = 0; +} + +OSISXHTML::MyUserData::~MyUserData() { + delete quoteStack; + delete hiStack; + delete titleStack; + delete lineStack; +} + +void OSISXHTML::MyUserData::outputNewline(SWBuf &buf) { + if (++consecutiveNewlines <= 2) { + outText("<br />\n", buf, this); + supressAdjacentWhitespace = true; + } +} +bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { + MyUserData *u = (MyUserData *)userData; + SWBuf scratch; + bool sub = (u->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token); + if (!sub) { + // manually process if it wasn't a simple substitution + XMLTag tag(token); + + // <w> tag + if (!strcmp(tag.getName(), "w")) { + + // start <w> tag + if ((!tag.isEmpty()) && (!tag.isEndTag())) { + u->w = token; + } + + // end or empty <w> tag + else { + bool endTag = tag.isEndTag(); + SWBuf lastText; + //bool show = true; // to handle unplaced article in kjv2003-- temporary till combined + + if (endTag) { + tag = u->w.c_str(); + lastText = u->lastTextNode.c_str(); + } + else lastText = "stuff"; + + const char *attrib; + const char *val; + if ((attrib = tag.getAttribute("xlit"))) { + val = strchr(attrib, ':'); + val = (val) ? (val + 1) : attrib; + outText(" ", buf, u); + outText(val, buf, u); + } + if ((attrib = tag.getAttribute("gloss"))) { + // I'm sure this is not the cleanest way to do it, but it gets the job done + // for rendering ruby chars properly ^_^ + buf -= lastText.length(); + + outText("<ruby><rb>", buf, u); + outText(lastText, buf, u); + val = strchr(attrib, ':'); + val = (val) ? (val + 1) : attrib; + outText("</rb><rp>(</rp><rt>", buf, u); + outText(val, buf, u); + outText("</rt><rp>)</rp></ruby>", buf, u); + } + if (!morphFirst) { + processLemma(u->suspendTextPassThru, tag, buf); + processMorph(u->suspendTextPassThru, tag, buf); + } + else { + processMorph(u->suspendTextPassThru, tag, buf); + processLemma(u->suspendTextPassThru, tag, buf); + } + if ((attrib = tag.getAttribute("POS"))) { + val = strchr(attrib, ':'); + val = (val) ? (val + 1) : attrib; + outText(" ", buf, u); + outText(val, buf, u); + } + + /*if (endTag) + buf += "}";*/ + } + } + + // <note> tag + else if (!strcmp(tag.getName(), "note")) { + if (!tag.isEndTag()) { + SWBuf type = tag.getAttribute("type"); + bool strongsMarkup = (type == "x-strongsMarkup" || type == "strongsMarkup"); // the latter is deprecated + if (strongsMarkup) { + tag.setEmpty(false); // handle bug in KJV2003 module where some note open tags were <note ... /> + } + + if (!tag.isEmpty()) { + + if (!strongsMarkup) { // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off + SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); + VerseKey *vkey = NULL; + char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); + + u->inXRefNote = true; // Why this change? Ben Morgan: Any note can have references in, so we need to set this to true for all notes +// u->inXRefNote = (ch == 'x'); + + // see if we have a VerseKey * or descendant + SWTRY { + vkey = SWDYNAMIC_CAST(VerseKey, u->key); + } + SWCATCH ( ... ) { } + if (vkey) { + //printf("URL = %s\n",URL::encode(vkey->getText()).c_str()); + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", + ch, + URL::encode(footnoteNumber.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str(), + URL::encode(vkey->getText()).c_str(), + ch, + ch, + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); + } + else { + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", + ch, + URL::encode(footnoteNumber.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str(), + URL::encode(u->key->getText()).c_str(), + ch, + ch, + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); + } + } + } + u->suspendTextPassThru = (++u->suspendLevel); + } + if (tag.isEndTag()) { + u->suspendTextPassThru = (--u->suspendLevel); + u->inXRefNote = false; + u->lastSuspendSegment = ""; // fix/work-around for nasb devineName in note bug + } + } + + // <p> paragraph and <lg> linegroup tags + else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { // non-empty start tag + u->outputNewline(buf); + } + else if (tag.isEndTag()) { // end tag + u->outputNewline(buf); + } + else { // empty paragraph break marker + u->outputNewline(buf); + } + } + + // Milestoned paragraphs, created by osis2mod + // <div type="paragraph" sID.../> + // <div type="paragraph" eID.../> + else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "paragraph")) { + // <div type="paragraph" sID... /> + if (tag.getAttribute("sID")) { // non-empty start tag + u->outputNewline(buf); + } + // <div type="paragraph" eID... /> + else if (tag.getAttribute("eID")) { + u->outputNewline(buf); + } + } + + // <reference> tag + else if (!strcmp(tag.getName(), "reference")) { + if (!u->inXRefNote) { // only show these if we're not in an xref note + if (!tag.isEndTag()) { + SWBuf target; + SWBuf work; + SWBuf ref; + bool is_scripRef = false; + + target = tag.getAttribute("osisRef"); + const char* the_ref = strchr(target, ':'); + + if(!the_ref) { + // No work + ref = target; + is_scripRef = true; + } + else { + // Compensate for starting : + ref = the_ref + 1; + + int size = target.size() - ref.size() - 1; + work.setSize(size); + strncpy(work.getRawData(), target, size); + + // For Bible:Gen.3.15 or Bible.vulgate:Gen.3.15 + if(!strncmp(work, "Bible", 5)) + is_scripRef = true; + } + + if(is_scripRef) + { + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=\">", + URL::encode(ref.c_str()).c_str() +// (work.size()) ? URL::encode(work.c_str()).c_str() : "") + ); + } + else + { + // Dictionary link, or something + buf.appendFormatted("<a href=\"sword://%s/%s\">", + URL::encode(work.c_str()).c_str(), + URL::encode(ref.c_str()).c_str() + ); + } + } + else { + outText("</a>", buf, u); + } + } + } + + // <l> poetry, etc + else if (!strcmp(tag.getName(), "l")) { + // start line marker + if (tag.getAttribute("sID") || (!tag.isEndTag() && !tag.isEmpty())) { + // nested lines plus if the line itself has an x-indent type attribute value + outText(SWBuf("<span class=\"line indent").appendFormatted("%d\">", u->lineStack->size() + (SWBuf("x-indent") == tag.getAttribute("type")?1:0)).c_str(), buf, u); + u->lineStack->push(tag.toString()); + } + // end line marker + else if (tag.getAttribute("eID") || tag.isEndTag()) { + outText("</span>", buf, u); + u->outputNewline(buf); + if (u->lineStack->size()) u->lineStack->pop(); + } + // <l/> without eID or sID + // Note: this is improper osis. This should be <lb/> + else if (tag.isEmpty() && !tag.getAttribute("sID")) { + u->outputNewline(buf); + } + } + + // <lb.../> + else if (!strcmp(tag.getName(), "lb") && (!tag.getAttribute("type") || strcmp(tag.getAttribute("type"), "x-optional"))) { + u->outputNewline(buf); + } + // <milestone type="line"/> + // <milestone type="x-p"/> + // <milestone type="cQuote" marker="x"/> + else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type"))) { + if (!strcmp(tag.getAttribute("type"), "line")) { + u->outputNewline(buf); + if (tag.getAttribute("subType") && !strcmp(tag.getAttribute("subType"), "x-PM")) { + u->outputNewline(buf); + } + } + else if (!strcmp(tag.getAttribute("type"),"x-p")) { + if (tag.getAttribute("marker")) + outText(tag.getAttribute("marker"), buf, u); + else outText("<!p>", buf, u); + } + else if (!strcmp(tag.getAttribute("type"), "cQuote")) { + const char *tmp = tag.getAttribute("marker"); + bool hasMark = tmp; + SWBuf mark = tmp; + tmp = tag.getAttribute("level"); + int level = (tmp) ? atoi(tmp) : 1; + + // first check to see if we've been given an explicit mark + if (hasMark) + outText(mark, buf, u); + // finally, alternate " and ', if config says we should supply a mark + else if (u->osisQToTick) + outText((level % 2) ? '\"' : '\'', buf, u); + } + } + + // <title> + else if (!strcmp(tag.getName(), "title")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, u->key); + if (vkey && !vkey->getVerse()) { + if (!vkey->getChapter()) { + if (!vkey->getBook()) { + if (!vkey->getTestament()) { + buf += "<h1 class=\"moduleHeader\">"; + tag.setAttribute("pushed", "h1"); + } + else { + buf += "<h1 class=\"testamentHeader\">"; + tag.setAttribute("pushed", "h1"); + } + } + else { + buf += "<h1 class=\"bookHeader\">"; + tag.setAttribute("pushed", "h1"); + } + } + else { + buf += "<h2 class=\"chapterHeader\">"; + tag.setAttribute("pushed", "h2"); + } + } + else { + buf += "<h3>"; + tag.setAttribute("pushed", "h3"); + } + u->titleStack->push(tag.toString()); + } + else if (tag.isEndTag()) { + if (!u->titleStack->empty()) { + XMLTag tag(u->titleStack->top()); + if (u->titleStack->size()) u->titleStack->pop(); + SWBuf pushed = tag.getAttribute("pushed"); + if (pushed.size()) { + buf += (SWBuf)"</" + pushed + ">\n\n"; + } + else { + buf += "</h3>\n\n"; + } + ++u->consecutiveNewlines; + u->supressAdjacentWhitespace = true; + } + } + } + + // <list> + else if (!strcmp(tag.getName(), "list")) { + if((!tag.isEndTag()) && (!tag.isEmpty())) { + outText("<ul>\n", buf, u); + } + else if (tag.isEndTag()) { + outText("</ul>\n", buf, u); + ++u->consecutiveNewlines; + u->supressAdjacentWhitespace = true; + } + } + + // <item> + else if (!strcmp(tag.getName(), "item")) { + if((!tag.isEndTag()) && (!tag.isEmpty())) { + outText("\t<li>", buf, u); + } + else if (tag.isEndTag()) { + outText("</li>\n", buf, u); + ++u->consecutiveNewlines; + u->supressAdjacentWhitespace = true; + } + } + // <catchWord> & <rdg> tags (italicize) + else if (!strcmp(tag.getName(), "rdg") || !strcmp(tag.getName(), "catchWord")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + outText("<i>", buf, u); + } + else if (tag.isEndTag()) { + outText("</i>", buf, u); + } + } + + // divineName + else if (!strcmp(tag.getName(), "divineName")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + u->suspendTextPassThru = (++u->suspendLevel); + } + else if (tag.isEndTag()) { + SWBuf lastText = u->lastSuspendSegment.c_str(); + u->suspendTextPassThru = (--u->suspendLevel); + if (lastText.size()) { + scratch.setFormatted("<span class=\"divineName\">%s</span>", lastText.c_str()); + outText(scratch.c_str(), buf, u); + } + } + } + + // <hi> text highlighting + else if (!strcmp(tag.getName(), "hi")) { + SWBuf type = tag.getAttribute("type"); + + // handle tei rend attribute if type doesn't exist + if (!type.length()) type = tag.getAttribute("rend"); + + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + if (type == "bold" || type == "b" || type == "x-b") { + outText("<b>", buf, u); + } + + // there is no officially supported OSIS overline attribute, + // thus either TEI overline or OSIS x-overline would be best, + // but we have used "ol" in the past, as well. Once a valid + // OSIS overline attribute is made available, these should all + // eventually be deprecated and never documented that they are supported. + else if (type == "ol" || type == "overline" || type == "x-overline") { + outText("<span style=\"text-decoration:overline\">", buf, u); + } + + else if (type == "super") { + outText("<span class=\"sup\">", buf, u); + } + else if (type == "sub") { + outText("<span class=\"sub\">", buf, u); + } + else { // all other types + outText("<i>", buf, u); + } + u->hiStack->push(tag.toString()); + } + else if (tag.isEndTag()) { + SWBuf type = ""; + if (!u->hiStack->empty()) { + XMLTag tag(u->hiStack->top()); + if (u->hiStack->size()) u->hiStack->pop(); + type = tag.getAttribute("type"); + if (!type.length()) type = tag.getAttribute("rend"); + } + if (type == "bold" || type == "b" || type == "x-b") { + outText("</b>", buf, u); + } + else if ( type == "ol" + || type == "super" + || type == "sub") { + outText("</span>", buf, u); + } + else outText("</i>", buf, u); + } + } + + // <q> quote + // Rules for a quote element: + // If the tag is empty with an sID or an eID then use whatever it specifies for quoting. + // Note: empty elements without sID or eID are ignored. + // If the tag is <q> then use it's specifications and push it onto a stack for </q> + // If the tag is </q> then use the pushed <q> for specification + // If there is a marker attribute, possibly empty, this overrides osisQToTick. + // If osisQToTick, then output the marker, using level to determine the type of mark. + else if (!strcmp(tag.getName(), "q")) { + SWBuf type = tag.getAttribute("type"); + SWBuf who = tag.getAttribute("who"); + const char *tmp = tag.getAttribute("level"); + int level = (tmp) ? atoi(tmp) : 1; + tmp = tag.getAttribute("marker"); + bool hasMark = tmp; + SWBuf mark = tmp; + + // open <q> or <q sID... /> + if ((!tag.isEmpty() && !tag.isEndTag()) || (tag.isEmpty() && tag.getAttribute("sID"))) { + // if <q> then remember it for the </q> + if (!tag.isEmpty()) { + u->quoteStack->push(tag.toString()); + } + + // Do this first so quote marks are included as WoC + if (who == "Jesus") + outText(u->wordsOfChristStart, buf, u); + + // first check to see if we've been given an explicit mark + if (hasMark) + outText(mark, buf, u); + //alternate " and ' + else if (u->osisQToTick) + outText((level % 2) ? '\"' : '\'', buf, u); + } + // close </q> or <q eID... /> + else if ((tag.isEndTag()) || (tag.isEmpty() && tag.getAttribute("eID"))) { + // if it is </q> then pop the stack for the attributes + if (tag.isEndTag() && !u->quoteStack->empty()) { + XMLTag qTag(u->quoteStack->top()); + if (u->quoteStack->size()) u->quoteStack->pop(); + + type = qTag.getAttribute("type"); + who = qTag.getAttribute("who"); + tmp = qTag.getAttribute("level"); + level = (tmp) ? atoi(tmp) : 1; + tmp = qTag.getAttribute("marker"); + hasMark = tmp; + mark = tmp; + } + + // first check to see if we've been given an explicit mark + if (hasMark) + outText(mark, buf, u); + // finally, alternate " and ', if config says we should supply a mark + else if (u->osisQToTick) + outText((level % 2) ? '\"' : '\'', buf, u); + + // Do this last so quote marks are included as WoC + if (who == "Jesus") + outText(u->wordsOfChristEnd, buf, u); + } + } + + // <transChange> + else if (!strcmp(tag.getName(), "transChange")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + SWBuf type = tag.getAttribute("type"); + u->lastTransChange = type; + + // just do all transChange tags this way for now + if ((type == "added") || (type == "supplied")) + outText("<span class=\"transChangeSupplied\">", buf, u); + else if (type == "tenseChange") + buf += "*"; + } + else if (tag.isEndTag()) { + SWBuf type = u->lastTransChange; + if ((type == "added") || (type == "supplied")) + outText("</span>", buf, u); + } + else { // empty transChange marker? + } + } + + // image + else if (!strcmp(tag.getName(), "figure")) { + const char *src = tag.getAttribute("src"); + if (src) { // assert we have a src attribute + SWBuf filepath; + if (userData->module) { + filepath = userData->module->getConfigEntry("AbsoluteDataPath"); + if ((filepath.size()) && (filepath[filepath.size()-1] != '/') && (src[0] != '/')) + filepath += '/'; + } + filepath += src; + + // images become clickable, if the UI supports showImage. + outText("<a href=\"passagestudy.jsp?action=showImage&value=", buf, u); + outText(URL::encode(filepath.c_str()).c_str(), buf, u); + outText("&module=", buf, u); + outText(URL::encode(u->version.c_str()).c_str(), buf, u); + outText("\">", buf, u); + + outText("<img src=\"file:", buf, u); + outText(filepath, buf, u); + outText("\" border=\"0\" />", buf, u); + + outText("</a>", buf, u); + } + } + + // ok to leave these in + else if (!strcmp(tag.getName(), "div")) { + SWBuf type = tag.getAttribute("type"); + if (type == "bookGroup") { + } + else if (type == "book") { + } + else if (type == "section") { + } + else if (type == "majorSection") { + } + else { + buf += tag; + } + } + else if (!strcmp(tag.getName(), "span")) { + buf += tag; + } + else if (!strcmp(tag.getName(), "br")) { + buf += tag; + } + else if (!strcmp(tag.getName(), "table")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "<table><tbody>\n"; + } + else if (tag.isEndTag()) { + buf += "</tbody></table>\n"; + ++u->consecutiveNewlines; + u->supressAdjacentWhitespace = true; + } + + } + else if (!strcmp(tag.getName(), "row")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "\t<tr>"; + } + else if (tag.isEndTag()) { + buf += "</tr>\n"; + } + + } + else if (!strcmp(tag.getName(), "cell")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "<td>"; + } + else if (tag.isEndTag()) { + buf += "</td>"; + } + } + else { + if (!u->supressAdjacentWhitespace) u->consecutiveNewlines = 0; + return false; // we still didn't handle token + } + } + if (!u->supressAdjacentWhitespace) u->consecutiveNewlines = 0; + return true; +} + + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/osisxlit.cpp b/src/modules/filters/osisxlit.cpp new file mode 100644 index 0000000..d5ccbe4 --- /dev/null +++ b/src/modules/filters/osisxlit.cpp @@ -0,0 +1,99 @@ +/****************************************************************************** + * + * osisxlit.cpp - SWFilter descendant to hide or show xlit values + * (encoded transliterations) in an OSIS module + * + * $Id: osisxlit.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include <stdlib.h> +#include <osisxlit.h> +#include <utilxml.h> + + +SWORD_NAMESPACE_START + +namespace { + + static const char oName[] = "Transliterated Forms"; + static const char oTip[] = "Toggles transliterated forms On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} + + +OSISXlit::OSISXlit() : SWOptionFilter(oName, oTip, oValues()) { +} + + +OSISXlit::~OSISXlit() { +} + + +char OSISXlit::processText(SWBuf &text, const SWKey *key, const SWModule *module) { + SWBuf token; + bool intoken = false; + + const SWBuf orig = text; + const char * from = orig.c_str(); + + if (!option) { + for (text = ""; *from; ++from) { + if (*from == '<') { + intoken = true; + token = ""; + continue; + } + if (*from == '>') { // process tokens + intoken = false; + if (token.startsWith("w ")) { // Word + XMLTag wtag(token); + const char *l = wtag.getAttribute("xlit"); + if (l) { + wtag.setAttribute("xlit", 0); + token = wtag; + token.trim(); + // drop <> + token << 1; + token--; + } + } + + // keep token in text + text.append('<'); + text.append(token); + text.append('>'); + + continue; + } + if (intoken) { + token += *from; + } + else { + text.append(*from); + } + } + } + return 0; +} + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/papyriplain.cpp b/src/modules/filters/papyriplain.cpp index 782b52a..bf6c9dd 100644 --- a/src/modules/filters/papyriplain.cpp +++ b/src/modules/filters/papyriplain.cpp @@ -1,9 +1,10 @@ /****************************************************************************** * - * papyriplain - SWFilter descendant to strip out all Papyri tags + * papyriplain.cpp - SWFilter descendant to strip out all Papyri tags * + * $Id: papyriplain.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,6 +25,7 @@ SWORD_NAMESPACE_START + PapyriPlain::PapyriPlain() { } diff --git a/src/modules/filters/plainfootnotes.cpp b/src/modules/filters/plainfootnotes.cpp deleted file mode 100644 index 449f7da..0000000 --- a/src/modules/filters/plainfootnotes.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/*************************************************************************** - * plainfootnotes.cpp - description - * ------------------- - * begin : Wed Oct 13 1999 - * copyright : (C) 1999 by The team of BibleTime - * email : info@bibletime.de - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include <plainfootnotes.h> -#include <swkey.h> - -#include <stdlib.h> - -SWORD_NAMESPACE_START - -const char oName[] = "Footnotes"; -const char oTip[] = "Toggles Footnotes On and Off In Bible Texts If They Exist"; - -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); - -PLAINFootnotes::PLAINFootnotes() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); -} - -PLAINFootnotes::~PLAINFootnotes(){ -} - - -char PLAINFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) { - if (!option) { // if we don't want footnotes - //char token[2048]; - //SWBuf token; - //int tokpos = 0; - //bool intoken = false; - //bool lastspace = false; - - bool hide = false; - - SWBuf orig = text; - const char *from = orig.c_str(); - for (text = ""; *from; from++) { - if (*from == '{') // Footnote start - { - hide = true; - continue; - } - else if (*from == '}') // Footnote end - { - hide = false; - continue; - } - - //if (intoken) { - //if (tokpos < 2045) - // token += *from; - // token[tokpos+2] = 0; - //} - //else { - if (!hide) { - text = *from; - //lastspace = (*from == ' '); - } - //} - } - } - return 0; -} - -SWORD_NAMESPACE_END diff --git a/src/modules/filters/plainhtml.cpp b/src/modules/filters/plainhtml.cpp deleted file mode 100644 index 3f989fa..0000000 --- a/src/modules/filters/plainhtml.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/*************************************************************************** - * plainhtml.cpp - description - * ------------------- - * begin : Thu Jun 24 1999 - * copyright : (C) 1999 by Torsten Uhlmann - * email : TUhlmann@gmx.de - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include <plainhtml.h> -#include <swbuf.h> - -SWORD_NAMESPACE_START - -PLAINHTML::PLAINHTML() -{ -} - - -char PLAINHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) -{ - int count = 0; - - SWBuf orig = text; - const char *from = orig.c_str(); - for (text = ""; *from; from++) - { - if ((*from == '\n') && (from[1] == '\n')) // two newlinea are a paragraph - { - text += "<P>"; - from++; - continue; - } else { - if ((*from == '\n')) // && (from[1] != '\n')) // only one new line - { - text += "<BR>"; - continue; - } - } - - if (*from == '{') { //footnote start - text += "<FONT COLOR=\"#80000\"><SMALL> ("; - continue; - } - else if (*from == '}') //footnote end - { - text += ") </SMALL></FONT>"; - continue; - } - else if (*from == '<') { - text += "<"; - continue; - } - else if (*from == '>') { - text += ">"; - continue; - } - else if (*from == '&') { - text += "&"; - continue; - } - else if ((*from == ' ') && (count > 5000)) - { - text += "<WBR>"; - count = 0; - continue; - } - - text += *from; - count++; - } - return 0; -} - -SWORD_NAMESPACE_END diff --git a/src/modules/filters/rtfhtml.cpp b/src/modules/filters/rtfhtml.cpp index 7b55721..df02f38 100644 --- a/src/modules/filters/rtfhtml.cpp +++ b/src/modules/filters/rtfhtml.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * rtfhtml.cpp - description - * ------------------- - * begin : Wed Oct 13 1999 - * copyright : (C) 1999 by The team of BibleTime - * email : info@bibletime.de * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * rtfhtml.cpp - filter to convert RTF to HTML + * + * $Id: rtfhtml.cpp 2981 2013-09-15 00:05:26Z scribe $ + * + * Copyright 1999 The team of Bibletime (info@bibletime.de) + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,11 +24,14 @@ #include <stdlib.h> #include <rtfhtml.h> #include <swbuf.h> +#include <utilstr.h> +#include <ctype.h> +#include <sysdata.h> SWORD_NAMESPACE_START -RTFHTML::RTFHTML() { - +RTFHTML::RTFHTML() +{ } @@ -43,12 +46,25 @@ char RTFHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (*from == '\\') // a RTF command { + // \u12345? + if ( *(from+1) == 'u' && (*(from+2) == '-' || isdigit(*(from+2)))) { + from += 2; + const char *end = from; + while (isdigit(*++end)); + SWBuf num; + num.append(from, end-from); + __s16 n = atoi(num.c_str()); + __u32 u = (__u16)n; + text.append(getUTF8FromUniChar(u)); + from += (end-from); + continue; + } if ( !strncmp(from+1, "pard", 4) ) //(from[1] == 'p') && (from[2] == 'a') && (from[3] == 'r') && (from[4] == 'd')) { // switch all modifiers off if (center) { - text += "</CENTER>"; + text += "</center>"; center = false; } from += 4; @@ -57,7 +73,7 @@ char RTFHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) if ( !strncmp(from+1, "par", 3) ) //(from[1] == 'p') && (from[2] == 'a') && (from[3] == 'r')) { - text += "<P>\n"; + text += "<p/>\n"; from += 3; continue; } @@ -71,7 +87,7 @@ char RTFHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!center) { - text += "<CENTER>"; + text += "<center>"; center = true; } from += 2; diff --git a/src/modules/filters/scsuutf8.cpp b/src/modules/filters/scsuutf8.cpp new file mode 100644 index 0000000..c68ea1f --- /dev/null +++ b/src/modules/filters/scsuutf8.cpp @@ -0,0 +1,246 @@ +/****************************************************************************** + * + * scsuutf8.cpp - SWFilter descendant to convert a SCSU character to + * UTF-8 + * + * $Id: scsuutf8.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +/* This class is based on: + * http://czyborra.com/scsu/scsu.c written by Roman Czyborra@dds.nl + * on Andrea's balcony in North Amsterdam on 1998-08-04 + * Thanks to Richard Verhoeven <rcb5@win.tue.nl> for his suggestion + * to correct the haphazard "if" after UQU to "else if" on 1998-10-01 + * + * This is a deflator to UTF-8 output for input compressed in SCSU, + * the (Reuters) Standard Compression Scheme for Unicode as described + * in http://www.unicode.org/unicode/reports/tr6.html + */ + +#include <stdlib.h> +#include <stdio.h> +#include <swmodule.h> + +#include <scsuutf8.h> + + +SWORD_NAMESPACE_START + + +SCSUUTF8::SCSUUTF8() { +} + + +unsigned char* SCSUUTF8::UTF8Output(unsigned long uchar, unsigned char* text) +{ + /* join UTF-16 surrogates without any pairing sanity checks */ + + static int d; + + if (uchar >= 0xd800 && uchar <= 0xdbff) { d = uchar & 0x3f; return text; } + if (uchar >= 0xdc00 && uchar <= 0xdfff) { uchar = uchar + 0x2400 + d * 0x400; } + + /* output one character as UTF-8 multibyte sequence */ + + if (uchar < 0x80) { + *text++ = c; + } + else if (uchar < 0x800) { + *text++ = 0xc0 | uchar >> 6; + *text++ = 0x80 | (uchar & 0x3f); + } + else if (uchar < 0x10000) { + *text++ = 0xe0 | uchar >> 12; + *text++ = 0x80 | (uchar >> 6 & 0x3f); + *text++ = 0x80 | (uchar & 0x3f); + } + else if (uchar < 0x200000) { + *text++ = 0xf0 | uchar >> 18; + *text++ = 0x80 | (uchar >> 12 & 0x3f); + *text++ = 0x80 | (uchar >> 6 & 0x3f); + *text++ = 0x80 | (uchar & 0x3f); + } + + return text; +} + + +char SCSUUTF8::processText(SWBuf &text, const SWKey *key, const SWModule *module) { +/* + unsigned char *to, *from; + unsigned long buflen = len * FILTERPAD; + char active = 0, mode = 0; + if ((unsigned long)key < 2) // hack, we're en(1)/de(0)ciphering + return -1; + + static unsigned short start[8] = {0x0000,0x0080,0x0100,0x0300,0x2000,0x2080,0x2100,0x3000}; + static unsigned short slide[8] = {0x0080,0x00C0,0x0400,0x0600,0x0900,0x3040,0x30A0,0xFF00}; + static unsigned short win[256] = { + 0x0000, 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380, + 0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, + 0x0800, 0x0880, 0x0900, 0x0980, 0x0A00, 0x0A80, 0x0B00, 0x0B80, + 0x0C00, 0x0C80, 0x0D00, 0x0D80, 0x0E00, 0x0E80, 0x0F00, 0x0F80, + 0x1000, 0x1080, 0x1100, 0x1180, 0x1200, 0x1280, 0x1300, 0x1380, + 0x1400, 0x1480, 0x1500, 0x1580, 0x1600, 0x1680, 0x1700, 0x1780, + 0x1800, 0x1880, 0x1900, 0x1980, 0x1A00, 0x1A80, 0x1B00, 0x1B80, + 0x1C00, 0x1C80, 0x1D00, 0x1D80, 0x1E00, 0x1E80, 0x1F00, 0x1F80, + 0x2000, 0x2080, 0x2100, 0x2180, 0x2200, 0x2280, 0x2300, 0x2380, + 0x2400, 0x2480, 0x2500, 0x2580, 0x2600, 0x2680, 0x2700, 0x2780, + 0x2800, 0x2880, 0x2900, 0x2980, 0x2A00, 0x2A80, 0x2B00, 0x2B80, + 0x2C00, 0x2C80, 0x2D00, 0x2D80, 0x2E00, 0x2E80, 0x2F00, 0x2F80, + 0x3000, 0x3080, 0x3100, 0x3180, 0x3200, 0x3280, 0x3300, 0x3800, + 0xE000, 0xE080, 0xE100, 0xE180, 0xE200, 0xE280, 0xE300, 0xE380, + 0xE400, 0xE480, 0xE500, 0xE580, 0xE600, 0xE680, 0xE700, 0xE780, + 0xE800, 0xE880, 0xE900, 0xE980, 0xEA00, 0xEA80, 0xEB00, 0xEB80, + 0xEC00, 0xEC80, 0xED00, 0xED80, 0xEE00, 0xEE80, 0xEF00, 0xEF80, + 0xF000, 0xF080, 0xF100, 0xF180, 0xF200, 0xF280, 0xF300, 0xF380, + 0xF400, 0xF480, 0xF500, 0xF580, 0xF600, 0xF680, 0xF700, 0xF780, + 0xF800, 0xF880, 0xF900, 0xF980, 0xFA00, 0xFA80, 0xFB00, 0xFB80, + 0xFC00, 0xFC80, 0xFD00, 0xFD80, 0xFE00, 0xFE80, 0xFF00, 0xFF80, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00C0, 0x0250, 0x0370, 0x0530, 0x3040, 0x30A0, 0xFF60 + }; + + if (!len) + return 0; + + memmove(&text[buflen - len], text, len); + from = (unsigned char*)&text[buflen - len]; + to = (unsigned char *)text; + + // ------------------------------- + + for (int i = 0; i < len;) { + + + if (i >= len) break; + c = from[i++]; + + if (c >= 0x80) + { + to = UTF8Output (c - 0x80 + slide[active], to); + } + else if (c >= 0x20 && c <= 0x7F) + { + to = UTF8Output (c, to); + } + else if (c == 0x0 || c == 0x9 || c == 0xA || c == 0xC || c == 0xD) + { + to = UTF8Output (c, to); + } + else if (c >= 0x1 && c <= 0x8) // SQn + { + if (i >= len) break; + d = from[i++]; // single quote + + to = UTF8Output (d < 0x80 ? d + start [c - 0x1] : + d - 0x80 + slide [c - 0x1], to); + } + else if (c >= 0x10 && c <= 0x17) // SCn + { + active = c - 0x10; // change window + } + else if (c >= 0x18 && c <= 0x1F) // SDn + { + active = c - 0x18; // define window + if (i >= len) break; + slide [active] = win [from[i++]]; + } + else if (c == 0xB) // SDX + { + if (i >= len) break; + c = from[i++]; + + if (i >= len) break; + d = from[i++]; + + slide [active = c>>5] = 0x10000 + (((c & 0x1F) << 8 | d) << 7); + } + else if (c == 0xE) // SQU + { + if (i >= len) break; + c = from[i++]; // SQU + + if (i >= len) break; + to = UTF8Output (c << 8 | from[i++], to); + } + else if (c == 0xF) // SCU + { + mode = 1; // change to Unicode mode + + while (mode) + { + if (i >= len) break; + c = from[i++]; + + if (c <= 0xDF || c >= 0xF3) + { + if (i >= len) break; + to = UTF8Output (c << 8 | from[i++], to); + } + else if (c == 0xF0) // UQU + { + if (i >= len) break; + c = from[i++]; + + if (i >= len) break; + to = UTF8Output (c << 8 | from[i++], to); + } + else if (c >= 0xE0 && c <= 0xE7) // UCn + { + active = c - 0xE0; mode = 0; + } + else if (c >= 0xE8 && c <= 0xEF) // UDn + { + if (i >= len) break; + slide [active=c-0xE8] = win [from[i++]]; mode = 0; + } + else if (c == 0xF1) // UDX + { + if (i >= len) break; + c = from[i++]; + + if (i >= len) break; + d = from[i++]; + + slide [active = c>>5] = + 0x10000 + (((c & 0x1F) << 8 | d) << 7); mode = 0; + } + } + } + + + } + + *to++ = 0; + *to = 0; +*/ + return 0; +} + + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/swbasicfilter.cpp b/src/modules/filters/swbasicfilter.cpp index ef10e45..e66017e 100644 --- a/src/modules/filters/swbasicfilter.cpp +++ b/src/modules/filters/swbasicfilter.cpp @@ -1,12 +1,13 @@ /****************************************************************************** - * swbasicfilter.h - definition of class SWBasicFilter. An SWFilter - * impl that provides some basic methods that - * many filters will need and can use as a starting - * point. * - * $Id: swbasicfilter.cpp 2167 2008-05-16 23:23:39Z scribe $ + * swbasicfilter.cpp - definition of class SWBasicFilter. An SWFilter + * impl that provides some basic methods that + * many filters will need and can use as a starting + * point. * - * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swbasicfilter.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -33,9 +34,11 @@ SWORD_NAMESPACE_START + typedef std::map<SWBuf, SWBuf> DualStringMap; typedef std::set<SWBuf> StringSet; + // I hate bridge patterns but this isolates std::map from a ton of filters class SWBasicFilter::Private { public: @@ -44,11 +47,13 @@ public: StringSet escPassSet; }; + const char SWBasicFilter::INITIALIZE = 1; const char SWBasicFilter::PRECHAR = 2; const char SWBasicFilter::POSTCHAR = 4; const char SWBasicFilter::FINALIZE = 8; + SWBasicFilter::SWBasicFilter() { p = new Private; @@ -98,6 +103,7 @@ void SWBasicFilter::setPassThruUnknownEscapeString(bool val) { passThruUnknownEsc = val; } + void SWBasicFilter::setPassThruNumericEscapeString(bool val) { passThruUnknownEsc = val; } @@ -132,6 +138,7 @@ void SWBasicFilter::removeTokenSubstitute(const char *findString) { } } + void SWBasicFilter::addAllowedEscapeString(const char *findString) { char *buf = 0; @@ -144,12 +151,14 @@ void SWBasicFilter::addAllowedEscapeString(const char *findString) { else p->escPassSet.insert(StringSet::value_type(findString)); } + void SWBasicFilter::removeAllowedEscapeString(const char *findString) { if (p->escPassSet.find(findString) != p->escPassSet.end()) { p->escPassSet.erase( p->escPassSet.find(findString) ); } } + void SWBasicFilter::addEscapeStringSubstitute(const char *findString, const char *replaceString) { char *buf = 0; @@ -162,12 +171,14 @@ void SWBasicFilter::addEscapeStringSubstitute(const char *findString, const char else p->escSubMap.insert(DualStringMap::value_type(findString, replaceString)); } + void SWBasicFilter::removeEscapeStringSubstitute(const char *findString) { if (p->escSubMap.find(findString) != p->escSubMap.end()) { p->escSubMap.erase( p->escSubMap.find(findString) ); } } + bool SWBasicFilter::substituteToken(SWBuf &buf, const char *token) { DualStringMap::iterator it; @@ -187,12 +198,14 @@ bool SWBasicFilter::substituteToken(SWBuf &buf, const char *token) { return false; } + void SWBasicFilter::appendEscapeString(SWBuf &buf, const char *escString) { buf += escStart; buf += escString; buf += escEnd; } + bool SWBasicFilter::passAllowedEscapeString(SWBuf &buf, const char *escString) { StringSet::iterator it; @@ -213,6 +226,7 @@ bool SWBasicFilter::passAllowedEscapeString(SWBuf &buf, const char *escString) { return false; } + bool SWBasicFilter::handleNumericEscapeString(SWBuf &buf, const char *escString) { if (passThruNumericEsc) { appendEscapeString(buf, escString); @@ -221,6 +235,7 @@ bool SWBasicFilter::handleNumericEscapeString(SWBuf &buf, const char *escString) return false; } + bool SWBasicFilter::substituteEscapeString(SWBuf &buf, const char *escString) { DualStringMap::iterator it; @@ -403,4 +418,5 @@ char SWBasicFilter::processText(SWBuf &text, const SWKey *key, const SWModule *m return 0; } + SWORD_NAMESPACE_END diff --git a/src/modules/filters/swoptfilter.cpp b/src/modules/filters/swoptfilter.cpp index 9d6dac4..5c205f5 100644 --- a/src/modules/filters/swoptfilter.cpp +++ b/src/modules/filters/swoptfilter.cpp @@ -1,9 +1,11 @@ /****************************************************************************** * - * swoptfilter - SWFilter descendant and base class for all option filters + * swoptfilter.cpp - SWFilter descendant and base class for all option + * filters * + * $Id: swoptfilter.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -33,10 +35,13 @@ SWOptionFilter::SWOptionFilter() { optValues = ∅ } + SWOptionFilter::SWOptionFilter(const char *oName, const char *oTip, const StringList *oValues) { optName = oName; optTip = oTip; optValues = oValues; + if (optValues->begin() != optValues->end()) setOptionValue(*(optValues->begin())); + isBooleanVal = optValues->size() == 2 && (optionValue == "On" || optionValue == "Off"); } diff --git a/src/modules/filters/teihtmlhref.cpp b/src/modules/filters/teihtmlhref.cpp index 47bb7b9..43fe584 100644 --- a/src/modules/filters/teihtmlhref.cpp +++ b/src/modules/filters/teihtmlhref.cpp @@ -1,10 +1,10 @@ /*************************************************************************** - * teirtf.cpp - TEI to HTMLHREF filter - * ------------------- - * begin : 2006-07-03 - * copyright : 2006 by CrossWire Bible Society * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * teihtmlhref.cpp - TEI to HTML with hrefs filter + * + * $Id: teihtmlhref.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -35,8 +35,8 @@ SWORD_NAMESPACE_START TEIHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { BiblicalText = false; if (module) { - version = module->Name(); - BiblicalText = (!strcmp(module->Type(), "Biblical Texts")); + version = module->getName(); + BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } } @@ -57,6 +57,8 @@ TEIHTMLHREF::TEIHTMLHREF() { addAllowedEscapeString("gt"); setTokenCaseSensitive(true); + + renderNoteNumbers = false; } bool TEIHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { @@ -259,11 +261,13 @@ bool TEIHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData } if (tag.isEndTag()) { SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); - buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=n&value=%s&module=%s&passage=%s\"><small><sup class=\"n\">*n</sup></small></a>", + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=n&value=%s&module=%s&passage=%s\"><small><sup class=\"n\">*n%s</sup></small></a>", URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(u->key->getText()).c_str()); + URL::encode(u->key->getText()).c_str(), + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); u->suspendTextPassThru = false; } diff --git a/src/modules/filters/teiplain.cpp b/src/modules/filters/teiplain.cpp index 90b7c7c..954beb4 100644 --- a/src/modules/filters/teiplain.cpp +++ b/src/modules/filters/teiplain.cpp @@ -1,10 +1,10 @@ /*************************************************************************** - * teiplain.cpp - TEI to Plaintext filter - * ------------------- - * begin : 2006-07-05 - * copyright : 2006 by CrossWire Bible Society * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * teiplain.cpp - TEI to Plaintext filter + * + * $Id: teiplain.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/filters/teirtf.cpp b/src/modules/filters/teirtf.cpp index 8e135b5..979e4a6 100644 --- a/src/modules/filters/teirtf.cpp +++ b/src/modules/filters/teirtf.cpp @@ -1,208 +1,208 @@ -/*************************************************************************** - * teirtf.cpp - TEI to RTF filter - * ------------------- - * begin : 2006-07-03 - * copyright : 2006 by CrossWire Bible Society - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include <stdlib.h> -#include <ctype.h> -#include <teirtf.h> -#include <utilxml.h> -#include <swmodule.h> -#include <versekey.h> - -SWORD_NAMESPACE_START - - -TEIRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { - BiblicalText = false; - inOsisRef = false; - if (module) { - version = module->Name(); - BiblicalText = (!strcmp(module->Type(), "Biblical Texts")); - } -} - - -TEIRTF::TEIRTF() { - setTokenStart("<"); - setTokenEnd(">"); - - setEscapeStart("&"); - setEscapeEnd(";"); - - setEscapeStringCaseSensitive(true); - - addEscapeStringSubstitute("amp", "&"); - addEscapeStringSubstitute("apos", "'"); - addEscapeStringSubstitute("lt", "<"); - addEscapeStringSubstitute("gt", ">"); - addEscapeStringSubstitute("quot", "\""); - - setTokenCaseSensitive(true); -} - - -bool TEIRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { - // manually process if it wasn't a simple substitution - if (!substituteToken(buf, token)) { - MyUserData *u = (MyUserData *)userData; - XMLTag tag(token); - - // <p> paragraph tag - if (!strcmp(tag.getName(), "p")) { - if (!tag.isEndTag()) { // non-empty start tag - buf += "{\\sb100\\fi200\\par}"; - } - } - - // <hi> - else if (!strcmp(tag.getName(), "hi") || !strcmp(tag.getName(), "emph")) { - SWBuf rend = tag.getAttribute("rend"); - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - if (rend == "ital" || rend == "italic") - buf += "{\\i1 "; - else if (rend == "bold") - buf += "{\\b1 "; - else if (rend == "sup") - buf += "{\\super "; - - } - else if (tag.isEndTag()) { - buf += "}"; - } - } - - // <entryFree> - else if (!strcmp(tag.getName(), "entryFree")) { - SWBuf n = tag.getAttribute("n"); - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - if (n != "") { - buf += "{\\b1 "; - buf += n; - buf += ". }"; } - } - } - - // <sense> - else if (!strcmp(tag.getName(), "sense")) { - SWBuf n = tag.getAttribute("n"); - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - if (n != "") { - buf += "{\\sb100\\par\\b1 "; - buf += n; - buf += ". }"; - } - } - } - - // <div> - else if (!strcmp(tag.getName(), "div")) { - - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf.append("{\\pard\\sa300}"); - } - else if (tag.isEndTag()) { - } - } - - // <pos>, <gen>, <case>, <gram>, <number>, <mood> - else if (!strcmp(tag.getName(), "pos") || !strcmp(tag.getName(), "gen") || !strcmp(tag.getName(), "case") || !strcmp(tag.getName(), "gram") || !strcmp(tag.getName(), "number") || !strcmp(tag.getName(), "mood")) { - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf += "{\\i1 "; - } - else if (tag.isEndTag()) { - buf += "}"; - } - } - - // <tr> - else if (!strcmp(tag.getName(), "tr")) { - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf += "{\\i1 "; - } - else if (tag.isEndTag()) { - buf += "}"; - } - } - - // <etym> - else if (!strcmp(tag.getName(), "etym")) { - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - buf += "["; - } - else if (tag.isEndTag()) { - buf += "]"; - } - } - - // <note> tag - else if (!strcmp(tag.getName(), "note")) { - if (!tag.isEndTag()) { - if (!tag.isEmpty()) { - SWBuf type = tag.getAttribute("type"); - - SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); - VerseKey *vkey = 0; - // see if we have a VerseKey * or descendant - SWTRY { - vkey = SWDYNAMIC_CAST(VerseKey, u->key); - } - SWCATCH ( ... ) { } - if (vkey) { - buf.appendFormatted("{\\super <a href=\"\">*%s</a>} ", footnoteNumber.c_str()); - } - u->suspendTextPassThru = true; - } - } - if (tag.isEndTag()) { - u->suspendTextPassThru = false; - } - } - - // <lb/> tag - else if (!strcmp(tag.getName(), "lb")) { - buf += "{\\par}"; - userData->supressAdjacentWhitespace = true; - } - - // <ref> tag - else if (!strcmp(tag.getName(), "ref")) { - if (!tag.isEndTag() && tag.getAttribute("osisRef")) { - buf += "{<a href=\"\">"; - u->inOsisRef = true; - } - else if (tag.isEndTag() && u->inOsisRef) { - buf += "</a>}"; - u->inOsisRef = false; - } - } - - - else { - return false; // we still didn't handle token - } - - } - return true; -} - - -SWORD_NAMESPACE_END - +/*************************************************************************** + * + * teirtf.cpp - TEI to RTF filter + * + * $Id: teirtf.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include <stdlib.h> +#include <ctype.h> +#include <teirtf.h> +#include <utilxml.h> +#include <swmodule.h> +#include <versekey.h> + +SWORD_NAMESPACE_START + + +TEIRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + BiblicalText = false; + inOsisRef = false; + if (module) { + version = module->getName(); + BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + } +} + + +TEIRTF::TEIRTF() { + setTokenStart("<"); + setTokenEnd(">"); + + setEscapeStart("&"); + setEscapeEnd(";"); + + setEscapeStringCaseSensitive(true); + + addEscapeStringSubstitute("amp", "&"); + addEscapeStringSubstitute("apos", "'"); + addEscapeStringSubstitute("lt", "<"); + addEscapeStringSubstitute("gt", ">"); + addEscapeStringSubstitute("quot", "\""); + + setTokenCaseSensitive(true); +} + + +bool TEIRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { + // manually process if it wasn't a simple substitution + if (!substituteToken(buf, token)) { + MyUserData *u = (MyUserData *)userData; + XMLTag tag(token); + + // <p> paragraph tag + if (!strcmp(tag.getName(), "p")) { + if (!tag.isEndTag()) { // non-empty start tag + buf += "{\\sb100\\fi200\\par}"; + } + } + + // <hi> + else if (!strcmp(tag.getName(), "hi") || !strcmp(tag.getName(), "emph")) { + SWBuf rend = tag.getAttribute("rend"); + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + if (rend == "ital" || rend == "italic") + buf += "{\\i1 "; + else if (rend == "bold") + buf += "{\\b1 "; + else if (rend == "sup") + buf += "{\\super "; + + } + else if (tag.isEndTag()) { + buf += "}"; + } + } + + // <entryFree> + else if (!strcmp(tag.getName(), "entryFree")) { + SWBuf n = tag.getAttribute("n"); + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + if (n != "") { + buf += "{\\b1 "; + buf += n; + buf += ". }"; } + } + } + + // <sense> + else if (!strcmp(tag.getName(), "sense")) { + SWBuf n = tag.getAttribute("n"); + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + if (n != "") { + buf += "{\\sb100\\par\\b1 "; + buf += n; + buf += ". }"; + } + } + } + + // <div> + else if (!strcmp(tag.getName(), "div")) { + + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf.append("{\\pard\\sa300}"); + } + else if (tag.isEndTag()) { + } + } + + // <pos>, <gen>, <case>, <gram>, <number>, <mood> + else if (!strcmp(tag.getName(), "pos") || !strcmp(tag.getName(), "gen") || !strcmp(tag.getName(), "case") || !strcmp(tag.getName(), "gram") || !strcmp(tag.getName(), "number") || !strcmp(tag.getName(), "mood")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "{\\i1 "; + } + else if (tag.isEndTag()) { + buf += "}"; + } + } + + // <tr> + else if (!strcmp(tag.getName(), "tr")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "{\\i1 "; + } + else if (tag.isEndTag()) { + buf += "}"; + } + } + + // <etym> + else if (!strcmp(tag.getName(), "etym")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "["; + } + else if (tag.isEndTag()) { + buf += "]"; + } + } + + // <note> tag + else if (!strcmp(tag.getName(), "note")) { + if (!tag.isEndTag()) { + if (!tag.isEmpty()) { + SWBuf type = tag.getAttribute("type"); + + SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + VerseKey *vkey = 0; + // see if we have a VerseKey * or descendant + SWTRY { + vkey = SWDYNAMIC_CAST(VerseKey, u->key); + } + SWCATCH ( ... ) { } + if (vkey) { + buf.appendFormatted("{\\super <a href=\"\">*%s</a>} ", footnoteNumber.c_str()); + } + u->suspendTextPassThru = true; + } + } + if (tag.isEndTag()) { + u->suspendTextPassThru = false; + } + } + + // <lb/> tag + else if (!strcmp(tag.getName(), "lb")) { + buf += "{\\par}"; + userData->supressAdjacentWhitespace = true; + } + + // <ref> tag + else if (!strcmp(tag.getName(), "ref")) { + if (!tag.isEndTag() && tag.getAttribute("osisRef")) { + buf += "{<a href=\"\">"; + u->inOsisRef = true; + } + else if (tag.isEndTag() && u->inOsisRef) { + buf += "</a>}"; + u->inOsisRef = false; + } + } + + + else { + return false; // we still didn't handle token + } + + } + return true; +} + + +SWORD_NAMESPACE_END + diff --git a/src/modules/filters/teixhtml.cpp b/src/modules/filters/teixhtml.cpp new file mode 100644 index 0000000..6a390a1 --- /dev/null +++ b/src/modules/filters/teixhtml.cpp @@ -0,0 +1,290 @@ +/*************************************************************************** + * + * teixhtml.cpp - TEI to XHTML filter + * + * $Id: teixhtml.cpp 2984 2013-09-20 12:18:45Z scribe $ + * + * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include <stdlib.h> +#include <ctype.h> +#include <teixhtml.h> +#include <utilxml.h> +#include <swmodule.h> +#include <url.h> +#include <iostream> + + +SWORD_NAMESPACE_START + + +TEIXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + BiblicalText = false; + if (module) { + version = module->getName(); + BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + } +} + + +TEIXHTML::TEIXHTML() { + setTokenStart("<"); + setTokenEnd(">"); + + setEscapeStart("&"); + setEscapeEnd(";"); + + setEscapeStringCaseSensitive(true); + + addAllowedEscapeString("quot"); + addAllowedEscapeString("apos"); + addAllowedEscapeString("amp"); + addAllowedEscapeString("lt"); + addAllowedEscapeString("gt"); + + setTokenCaseSensitive(true); + + renderNoteNumbers = false; +} + +bool TEIXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { + // manually process if it wasn't a simple substitution + if (!substituteToken(buf, token)) { + MyUserData *u = (MyUserData *)userData; + XMLTag tag(token); + + if (!strcmp(tag.getName(), "p")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { // non-empty start tag + buf += "<!P><br />"; + } + else if (tag.isEndTag()) { // end tag + buf += "<!/P><br />"; + //userData->supressAdjacentWhitespace = true; + } + else { // empty paragraph break marker + buf += "<!P><br />"; + //userData->supressAdjacentWhitespace = true; + } + } + + // <hi> + else if (!strcmp(tag.getName(), "hi")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + SWBuf rend = tag.getAttribute("rend"); + + u->lastHi = rend; + if (rend == "ital") + buf += "<i>"; + else if (rend == "italic") + buf += "<i>"; + else if (rend == "bold") + buf += "<b>"; + else if (rend == "sup") + buf += "<small><sup>"; + else if (rend == "overline") + buf += "<span style=\"text-decoration:overline\">"; + + } + else if (tag.isEndTag()) { + SWBuf rend = u->lastHi; + if (rend == "ital") + buf += "</i>"; + else if (rend == "italic") + buf += "</i>"; + else if (rend == "bold") + buf += "</b>"; + else if (rend == "sup") + buf += "</sup></small>"; + else if (rend == "overline") + buf += "</span>"; + } + } + + // <entryFree> + else if (!strcmp(tag.getName(), "entryFree")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + SWBuf n = tag.getAttribute("n"); + if (n != "") { + buf += "<b>"; + buf += n; + buf += "</b>"; + } + } + } + + // <sense> + else if (!strcmp(tag.getName(), "sense")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + SWBuf n = tag.getAttribute("n"); + if (n != "") { + buf += "<br /><b>"; + buf += n; + buf += "</b>"; + } + } + } + + // <div> + else if (!strcmp(tag.getName(), "div")) { + + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "<!P>"; + } + else if (tag.isEndTag()) { + } + } + + // <lb.../> + else if (!strcmp(tag.getName(), "lb")) { + buf += "<br />"; + } + + // <pos>, <gen>, <case>, <gram>, <number>, <mood>, <pron>, <def> + else if (!strcmp(tag.getName(), "pos") || + !strcmp(tag.getName(), "gen") || + !strcmp(tag.getName(), "case") || + !strcmp(tag.getName(), "gram") || + !strcmp(tag.getName(), "number") || + !strcmp(tag.getName(), "pron") /*|| + !strcmp(tag.getName(), "def")*/) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "<i>"; + } + else if (tag.isEndTag()) { + buf += "</i>"; + } + } + + // <tr> + else if (!strcmp(tag.getName(), "tr")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "<i>"; + } + else if (tag.isEndTag()) { + buf += "</i>"; + } + } + + // orth + else if (!strcmp(tag.getName(), "orth")) { + if ((!tag.isEndTag()) && (!tag.isEmpty())) { + buf += "<b>"; + } + else if (tag.isEndTag()) { + buf += "</b>"; + } + } + + // <etym>, <usg> + else if (!strcmp(tag.getName(), "etym") || + !strcmp(tag.getName(), "usg")) { + // do nothing here + } + else if (!strcmp(tag.getName(), "ref")) { + if (!tag.isEndTag()) { + u->suspendTextPassThru = true; + SWBuf target; + SWBuf work; + SWBuf ref; + + int was_osisref = false; + if(tag.getAttribute("osisRef")) + { + target += tag.getAttribute("osisRef"); + was_osisref=true; + } + else if(tag.getAttribute("target")) + target += tag.getAttribute("target"); + + if(target.size()) + { + const char* the_ref = strchr(target, ':'); + + if(!the_ref) { + // No work + ref = target; + } + else { + // Compensate for starting : + ref = the_ref + 1; + + int size = target.size() - ref.size() - 1; + work.setSize(size); + strncpy(work.getRawData(), target, size); + } + + if(was_osisref) + { + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=%s\">", + (ref) ? URL::encode(ref.c_str()).c_str() : "", + (work.size()) ? URL::encode(work.c_str()).c_str() : ""); + } + else + { + // Dictionary link, or something + buf.appendFormatted("<a href=\"sword://%s/%s\">", + (work.size()) ? URL::encode(work.c_str()).c_str() : u->version.c_str(), + (ref) ? URL::encode(ref.c_str()).c_str() : "" + ); + } + } + else + { + //std::cout << "TARGET WASN'T\n"; + } + + } + else { + buf += u->lastTextNode.c_str(); + buf += "</a>"; + + u->suspendTextPassThru = false; + } + } + + // <note> tag + else if (!strcmp(tag.getName(), "note")) { + if (!tag.isEndTag()) { + if (!tag.isEmpty()) { + u->suspendTextPassThru = true; + } + } + if (tag.isEndTag()) { + SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); + + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=n&value=%s&module=%s&passage=%s\"><small><sup class=\"n\">*n%s</sup></small></a>", + URL::encode(footnoteNumber.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str(), + URL::encode(u->key->getText()).c_str(), + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); + + u->suspendTextPassThru = false; + } + } + + else { + return false; // we still didn't handle token + } + + } + return true; +} + + +SWORD_NAMESPACE_END + diff --git a/src/modules/filters/thmlfootnotes.cpp b/src/modules/filters/thmlfootnotes.cpp index e75311a..566551f 100644 --- a/src/modules/filters/thmlfootnotes.cpp +++ b/src/modules/filters/thmlfootnotes.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * thmlfootnotes - SWFilter descendant to hide or show footnotes - * in a ThML module. + * thmlfootnotes.cpp - SWFilter descendant to hide or show footnotes + * in a ThML module * + * $Id: thmlfootnotes.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,16 +31,23 @@ #include <versekey.h> #include <utilxml.h> + SWORD_NAMESPACE_START -const char oName[] = "Footnotes"; -const char oTip[] = "Toggles Footnotes On and Off if they exist"; +namespace { + + static const char oName[] = "Footnotes"; + static const char oTip[] = "Toggles Footnotes On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -ThMLFootnotes::ThMLFootnotes() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +ThMLFootnotes::ThMLFootnotes() : SWOptionFilter(oName, oTip, oValues()) { } @@ -56,7 +64,7 @@ char ThMLFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *m SWBuf refs = ""; int footnoteNum = 1; char buf[254]; - SWKey *p = (module) ? module->CreateKey() : (key) ? key->clone() : new VerseKey(); + SWKey *p = (module) ? module->createKey() : (key) ? key->clone() : new VerseKey(); VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p); if (!parser) { delete p; @@ -101,7 +109,7 @@ char ThMLFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *m startTag.setAttribute("swordFootnote", buf); if ((startTag.getAttribute("type")) && (!strcmp(startTag.getAttribute("type"), "crossReference"))) { if (!refs.length()) - refs = parser->ParseVerseList(tagText.c_str(), *parser, true).getRangeText(); + refs = parser->parseVerseList(tagText.c_str(), *parser, true).getRangeText(); module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str(); } } diff --git a/src/modules/filters/thmlgbf.cpp b/src/modules/filters/thmlgbf.cpp index e2e8e1c..e85fdef 100644 --- a/src/modules/filters/thmlgbf.cpp +++ b/src/modules/filters/thmlgbf.cpp @@ -1,11 +1,10 @@ /*************************************************************************** - * thmlgbf.cpp - ThML to GBF filter - * ------------------- - * begin : 1999-10-28 - * copyright : 2001 by CrossWire Bible Society * + * thmlgbf.cpp - ThML to GBF filter * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlgbf.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/filters/thmlheadings.cpp b/src/modules/filters/thmlheadings.cpp index e2b7c97..46498d0 100644 --- a/src/modules/filters/thmlheadings.cpp +++ b/src/modules/filters/thmlheadings.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * thmlheadings - SWFilter descendant to hide or show headings - * in a ThML module. + * thmlheadings.cpp - SWFilter descendant to hide or show headings + * in a ThML module * + * $Id: thmlheadings.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,16 +29,23 @@ #include <swmodule.h> #include <stdio.h> + SWORD_NAMESPACE_START -const char oName[] = "Headings"; -const char oTip[] = "Toggles Headings On and Off if they exist"; +namespace { + + static const char oName[] = "Headings"; + static const char oTip[] = "Toggles Headings On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -ThMLHeadings::ThMLHeadings() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +ThMLHeadings::ThMLHeadings() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/thmlhtml.cpp b/src/modules/filters/thmlhtml.cpp index 4c66b87..b5f624e 100644 --- a/src/modules/filters/thmlhtml.cpp +++ b/src/modules/filters/thmlhtml.cpp @@ -1,11 +1,10 @@ /*************************************************************************** - * thmlhtml.cpp - ThML to HTML filter - * ------------------- - * begin : 1999-10-27 - * copyright : 2001 by CrossWire Bible Society * + * thmlhtml.cpp - ThML to HTML filter * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlhtml.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -26,8 +25,10 @@ #include <swmodule.h> #include <utilxml.h> + SWORD_NAMESPACE_START + ThMLHTML::ThMLHTML() { setTokenStart("<"); setTokenEnd(">"); diff --git a/src/modules/filters/thmlhtmlhref.cpp b/src/modules/filters/thmlhtmlhref.cpp index c0887f1..f72a93e 100644 --- a/src/modules/filters/thmlhtmlhref.cpp +++ b/src/modules/filters/thmlhtmlhref.cpp @@ -1,11 +1,10 @@ /*************************************************************************** - * thmlhtmlhref.cpp - ThML to HTML filter with hrefs - * ------------------- - * begin : 2001-09-03 - * copyright : 2001 by CrossWire Bible Society * + * thmlhtmlhref.cpp - ThML to HTML filter with hrefs * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlhtmlhref.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -29,13 +28,14 @@ #include <versekey.h> #include <url.h> + SWORD_NAMESPACE_START ThMLHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { if (module) { - version = module->Name(); - BiblicalText = (!strcmp(module->Type(), "Biblical Texts")); + version = module->getName(); + BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); SecHead = false; } } @@ -160,6 +160,8 @@ ThMLHTMLHREF::ThMLHTMLHREF() { setTokenCaseSensitive(true); // addTokenSubstitute("scripture", "<i> "); addTokenSubstitute("/scripture", "</i> "); + + renderNoteNumbers = false; } @@ -206,6 +208,7 @@ bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat if (!tag.isEmpty()) { SWBuf type = tag.getAttribute("type"); SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); VerseKey *vkey = NULL; // see if we have a VerseKey * or descendant SWTRY { @@ -215,23 +218,25 @@ bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat if (vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); - buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c</sup></small></a>", + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", ch, URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), URL::encode(vkey->getText()).c_str(), ch, - ch); + ch, + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); } else { char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); - buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c</sup></small></a>", + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", ch, URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), URL::encode(u->key->getText()).c_str(), ch, - ch); + ch, + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); } u->suspendTextPassThru = true; } @@ -265,6 +270,7 @@ bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat } else { SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); VerseKey *vkey = NULL; // see if we have a VerseKey * or descendant SWTRY { @@ -274,11 +280,11 @@ bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserDat if (vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. //buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", vkey->getText(), footnoteNumber.c_str()); - buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=x&value=%s&module=%s&passage=%s\"><small><sup class=\"x\">*x</sup></small></a>", + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=x&value=%s&module=%s&passage=%s\"><small><sup class=\"x\">*x%s</sup></small></a>", URL::encode(footnoteNumber.c_str()).c_str(), URL::encode(u->version.c_str()).c_str(), - URL::encode(vkey->getText()).c_str()); - + URL::encode(vkey->getText()).c_str(), + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); } } diff --git a/src/modules/filters/thmllemma.cpp b/src/modules/filters/thmllemma.cpp index 53eec58..acc324f 100644 --- a/src/modules/filters/thmllemma.cpp +++ b/src/modules/filters/thmllemma.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * thmllemma - SWFilter descendant to hide or show lemmas - * in a ThML module. + * thmllemma.cpp - SWFilter descendant to hide or show lemmas + * in a ThML module * + * $Id: thmllemma.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,16 +24,23 @@ #include <stdlib.h> #include <thmllemma.h> + SWORD_NAMESPACE_START -const char oName[] = "Lemmas"; -const char oTip[] = "Toggles Lemmas On and Off if they exist"; +namespace { + + static const char oName[] = "Lemmas"; + static const char oTip[] = "Toggles Lemmas On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -ThMLLemma::ThMLLemma() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +ThMLLemma::ThMLLemma() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/thmlmorph.cpp b/src/modules/filters/thmlmorph.cpp index d3cf597..3259acc 100644 --- a/src/modules/filters/thmlmorph.cpp +++ b/src/modules/filters/thmlmorph.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * thmlmorph - SWFilter descendant to hide or show morph tags - * in a ThML module. + * thmlmorph.cpp - SWFilter descendant to hide or show morph tags + * in a ThML module * + * $Id: thmlmorph.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,14 +26,20 @@ SWORD_NAMESPACE_START -const char oName[] = "Morphological Tags"; -const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; +namespace { -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const char oName[] = "Morphological Tags"; + static const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; -ThMLMorph::ThMLMorph() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} + + +ThMLMorph::ThMLMorph() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/thmlosis.cpp b/src/modules/filters/thmlosis.cpp index 25fdf23..3acd959 100644 --- a/src/modules/filters/thmlosis.cpp +++ b/src/modules/filters/thmlosis.cpp @@ -1,10 +1,10 @@ /****************************************************************************** * - * thmlstrongs - SWFilter descendant to hide or show strongs number - * in a ThML module. + * thmlosis.cpp - filter to convert ThML to OSIS * + * $Id: thmlosis.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -540,7 +540,7 @@ char ThMLOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey) { SWBuf ref = ""; - if (vkey->Verse()) { + if (vkey->getVerse()) { ref.appendFormatted("\t\t<verse osisID=\"%s\">", vkey->getOSISRef()); } @@ -548,24 +548,24 @@ char ThMLOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module text = ref + text; - if (vkey->Verse()) { + if (vkey->getVerse()) { VerseKey *tmp = (VerseKey *)vkey->clone(); *tmp = *vkey; - tmp->AutoNormalize(0); - tmp->Headings(1); + tmp->setAutoNormalize(false); + tmp->setIntros(true); text += "</verse>"; *tmp = MAXVERSE; if (*vkey == *tmp) { - tmp->Verse(0); + tmp->setVerse(0); // sprintf(ref, "\t</div>"); // pushString(&to, ref); *tmp = MAXCHAPTER; *tmp = MAXVERSE; if (*vkey == *tmp) { - tmp->Chapter(0); - tmp->Verse(0); + tmp->setChapter(0); + tmp->setVerse(0); // sprintf(ref, "\t</div>"); // pushString(&to, ref); /* @@ -578,7 +578,7 @@ char ThMLOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module } delete tmp; } -// else if (vkey->Chapter()) { +// else if (vkey->getChapter()) { // sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef()); // } // else sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef()); diff --git a/src/modules/filters/thmlplain.cpp b/src/modules/filters/thmlplain.cpp index 8c9358f..b9b9839 100644 --- a/src/modules/filters/thmlplain.cpp +++ b/src/modules/filters/thmlplain.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * thmlplain - SWFilter descendant to strip out all ThML tags or convert to - * ASCII rendered symbols. + * thmlplain.cpp - SWFilter descendant to strip out all ThML tags or + * convert to ASCII rendered symbols * + * $Id: thmlplain.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/filters/thmlrtf.cpp b/src/modules/filters/thmlrtf.cpp index fdb41df..dc50ae9 100644 --- a/src/modules/filters/thmlrtf.cpp +++ b/src/modules/filters/thmlrtf.cpp @@ -1,11 +1,10 @@ /*************************************************************************** - * thmlrtf.cpp - ThML to RTF filter - * ------------------- - * begin : 1999-10-27 - * copyright : 2001 by CrossWire Bible Society * + * thmlrtf.cpp - ThML to RTF filter * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlrtf.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -215,8 +214,8 @@ ThMLRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : Basi this->SecHead = false; XMLTag startTag = ""; if (module) { - version = module->Name(); - BiblicalText = (!strcmp(module->Type(), "Biblical Texts")); + version = module->getName(); + BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); } } @@ -263,7 +262,7 @@ bool ThMLRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us if (vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); - buf.appendFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->Verse(), footnoteNumber.c_str()); + buf.appendFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->getVerse(), footnoteNumber.c_str()); } u->suspendTextPassThru = true; } @@ -301,7 +300,7 @@ bool ThMLRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *us SWCATCH ( ... ) {} if (vkey) { // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. - buf.appendFormatted("{\\super <a href=\"\">*x%i.%s</a>} ", vkey->Verse(), footnoteNumber.c_str()); + buf.appendFormatted("{\\super <a href=\"\">*x%i.%s</a>} ", vkey->getVerse(), footnoteNumber.c_str()); } } diff --git a/src/modules/filters/thmlscripref.cpp b/src/modules/filters/thmlscripref.cpp index e46d679..1ea4a40 100644 --- a/src/modules/filters/thmlscripref.cpp +++ b/src/modules/filters/thmlscripref.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * thmlscripref - SWFilter descendant to hide or show scripture - * referebces in a ThML module. + * thmlscripref.cpp - SWFilter descendant to hide or show scripture + * referebces in a ThML module * + * $Id: thmlscripref.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -27,16 +28,23 @@ #include <versekey.h> #include <swmodule.h> + SWORD_NAMESPACE_START -const char oName[] = "Cross-references"; -const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; +namespace { + + static const char oName[] = "Cross-references"; + static const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"On", "Off", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -ThMLScripref::ThMLScripref() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("On"); +ThMLScripref::ThMLScripref() : SWOptionFilter(oName, oTip, oValues()) { } @@ -53,7 +61,7 @@ char ThMLScripref::processText(SWBuf &text, const SWKey *key, const SWModule *mo SWBuf refs = ""; int footnoteNum = 1; char buf[254]; - SWKey *p = (module) ? module->CreateKey() : (key) ? key->clone() : new VerseKey(); + SWKey *p = (module) ? module->createKey() : (key) ? key->clone() : new VerseKey(); VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p); if (!parser) { delete p; @@ -98,8 +106,8 @@ char ThMLScripref::processText(SWBuf &text, const SWKey *key, const SWModule *mo startTag.setAttribute("swordFootnote", buf); SWBuf passage = startTag.getAttribute("passage"); if (passage.length()) - refs = parser->ParseVerseList(passage.c_str(), *parser, true).getRangeText(); - else refs = parser->ParseVerseList(tagText.c_str(), *parser, true).getRangeText(); + refs = parser->parseVerseList(passage.c_str(), *parser, true).getRangeText(); + else refs = parser->parseVerseList(tagText.c_str(), *parser, true).getRangeText(); module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str(); } hide = false; diff --git a/src/modules/filters/thmlstrongs.cpp b/src/modules/filters/thmlstrongs.cpp index 457e28b..09658a9 100644 --- a/src/modules/filters/thmlstrongs.cpp +++ b/src/modules/filters/thmlstrongs.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * thmlstrongs - SWFilter descendant to hide or show strongs number - * in a ThML module. + * thmlstrongs.cpp - SWFilter descendant to hide or show Strong's number + * in a ThML module * + * $Id: thmlstrongs.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -27,16 +28,23 @@ #include <utilstr.h> #include <ctype.h> + SWORD_NAMESPACE_START -const char oName[] = "Strong's Numbers"; -const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; +namespace { + + static const char oName[] = "Strong's Numbers"; + static const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); -ThMLStrongs::ThMLStrongs() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +ThMLStrongs::ThMLStrongs() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/thmlvariants.cpp b/src/modules/filters/thmlvariants.cpp index 4f28dbe..1a57971 100644 --- a/src/modules/filters/thmlvariants.cpp +++ b/src/modules/filters/thmlvariants.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * thmlvariants - SWFilter descendant to hide or show textual variants - * in a ThML module. + * thmlvariants.cpp - SWFilter descendant to hide or show textual variants + * in a ThML module * + * $Id: thmlvariants.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,50 +25,39 @@ #include <thmlvariants.h> #include <utilstr.h> -SWORD_NAMESPACE_START -const char ThMLVariants::primary[] = "Primary Reading"; -const char ThMLVariants::secondary[] = "Secondary Reading"; -const char ThMLVariants::all[] = "All Readings"; +SWORD_NAMESPACE_START -const char ThMLVariants::optName[] = "Textual Variants"; -const char ThMLVariants::optTip[] = "Switch between Textual Variants modes"; +namespace { + static const char oName[] = "Textual Variants"; + static const char oTip[] = "Switch between Textual Variants modes"; + static const char *choices[4] = { "Primary Reading", "Secondary Reading", "All Readings", "" }; -ThMLVariants::ThMLVariants() { - option = false; - options.push_back(primary); - options.push_back(secondary); - options.push_back(all); + static const StringList *oValues() { + static const StringList oVals(&choices[0], &choices[3]); + return &oVals; + } } -ThMLVariants::~ThMLVariants() { +ThMLVariants::ThMLVariants() : SWOptionFilter(oName, oTip, oValues()) { } -void ThMLVariants::setOptionValue(const char *ival) -{ - if (!stricmp(ival, primary)) option = 0; - else if (!stricmp(ival, secondary)) option = 1; - else option = 2; -} -const char *ThMLVariants::getOptionValue() -{ - if (option == 0) { - return primary; - } - else if (option == 1) { - return secondary; - } - else { - return all; - } +ThMLVariants::~ThMLVariants() { } + char ThMLVariants::processText(SWBuf &text, const SWKey *key, const SWModule *module) { - if ( option == 0 || option == 1) { //we want primary or variant only + + int option = 0; + if (optionValue == choices[0]) option = 0; + else if (optionValue == choices[1]) option = 1; + else option = 2; + + if (option == 0 || option == 1) { //we want primary or variant only bool intoken = false; bool hide = false; bool invar = false; @@ -127,7 +117,4 @@ char ThMLVariants::processText(SWBuf &text, const SWKey *key, const SWModule *mo - - - SWORD_NAMESPACE_END diff --git a/src/modules/filters/thmlwebif.cpp b/src/modules/filters/thmlwebif.cpp index 0192703..29d9ef5 100644 --- a/src/modules/filters/thmlwebif.cpp +++ b/src/modules/filters/thmlwebif.cpp @@ -1,11 +1,10 @@ /*************************************************************************** - * ThMLWEBIF.cpp - ThML to HTML filter with hrefs - * ------------------- - * begin : 2001-09-03 - * copyright : 2001 by CrossWire Bible Society * + * thmlwebif.cpp - ThML to HTML filter with hrefs * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlwebif.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,10 +29,11 @@ SWORD_NAMESPACE_START + ThMLWEBIF::ThMLWEBIF() : baseURL(""), passageStudyURL(baseURL + "passagestudy.jsp") { - //all's done in ThMLHTMLHREF } + bool ThMLWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution @@ -100,7 +100,7 @@ bool ThMLWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData * } } else { - return ThMLHTMLHREF::handleToken(buf,token,userData); + return ThMLXHTML::handleToken(buf, token, userData); } } return true; diff --git a/src/modules/filters/thmlwordjs.cpp b/src/modules/filters/thmlwordjs.cpp index 12fbeb1..7d80a00 100644 --- a/src/modules/filters/thmlwordjs.cpp +++ b/src/modules/filters/thmlwordjs.cpp @@ -1,10 +1,10 @@ /****************************************************************************** * - * thmlstrongs - SWFilter descendant to hide or show strongs number - * in a ThML module. + * thmlwordjs.cpp - SWFilter descendant to ??? * + * $Id: thmlwordjs.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -29,17 +29,23 @@ #include <utilstr.h> #include <versekey.h> + SWORD_NAMESPACE_START -const char oName[] = "Word Javascript"; -const char oTip[] = "Toggles Word Javascript data"; +namespace { + + static const char oName[] = "Word Javascript"; + static const char oTip[] = "Toggles Word Javascript data"; -const SWBuf choices[3] = {"Off", "On", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -ThMLWordJS::ThMLWordJS() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +ThMLWordJS::ThMLWordJS() : SWOptionFilter(oName, oTip, oValues()) { defaultGreekLex = 0; defaultHebLex = 0; @@ -58,7 +64,6 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu char token[2112]; // cheese. Fix. int tokpos = 0; bool intoken = false; - bool lastspace = false; int word = 1; char val[128]; char *valto; @@ -69,7 +74,7 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu bool newText = false; bool needWordOut = false; AttributeValue *wordAttrs = 0; - SWBuf modName = (module)?module->Name():""; + SWBuf modName = (module)?module->getName():""; SWBuf wordSrcPrefix = modName; const SWBuf orig = text; @@ -160,7 +165,7 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu gh = isdigit(strong[0]) ? 0:strong[0]; if (!gh) { if (vkey) { - gh = vkey->Testament() ? 'H' : 'G'; + gh = vkey->getTestament() ? 'H' : 'G'; } } else strong << 1; @@ -179,7 +184,7 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu if (sLex) { // we can pass the real lex name in, but we have some // aliases in the javascript to optimize bandwidth - lexName = sLex->Name(); + lexName = sLex->getName(); if (lexName == "StrongsGreek") lexName = "G"; if (lexName == "StrongsHebrew") @@ -188,7 +193,7 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu SWBuf wordID; if (vkey) { // optimize for bandwidth and use only the verse as the unique entry id - wordID.appendFormatted("%d", vkey->Verse()); + wordID.appendFormatted("%d", vkey->getVerse()); } else { wordID = key->getText(); @@ -206,10 +211,11 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu + if (!sMorph) sMorph = 0; // avoid unused warnings for now /* if (sMorph) { SWBuf popMorph = "<a onclick=\""; - popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s</a>", sMorph->Name(), morph.c_str(), wordID.c_str(), morph.c_str()); + popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s</a>", sMorph->getName(), morph.c_str(), wordID.c_str(), morph.c_str()); morph = popMorph; } */ @@ -237,7 +243,6 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu } else { text += *from; - lastspace = (*from == ' '); } } @@ -255,7 +260,7 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu gh = isdigit(strong[0]) ? 0:strong[0]; if (!gh) { if (vkey) { - gh = vkey->Testament() ? 'H' : 'G'; + gh = vkey->getTestament() ? 'H' : 'G'; } } else strong << 1; @@ -271,7 +276,7 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu if (sLex) { // we can pass the real lex name in, but we have some // aliases in the javascript to optimize bandwidth - lexName = sLex->Name(); + lexName = sLex->getName(); if (lexName == "StrongsGreek") lexName = "G"; if (lexName == "StrongsHebrew") @@ -280,7 +285,7 @@ char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *modu SWBuf wordID; if (vkey) { // optimize for bandwidth and use only the verse as the unique entry id - wordID.appendFormatted("%d", vkey->Verse()); + wordID.appendFormatted("%d", vkey->getVerse()); } else { wordID = key->getText(); diff --git a/src/modules/filters/thmlxhtml.cpp b/src/modules/filters/thmlxhtml.cpp new file mode 100644 index 0000000..b17eb50 --- /dev/null +++ b/src/modules/filters/thmlxhtml.cpp @@ -0,0 +1,378 @@ +/****************************************************************************** + * + * thmlxhtml.cpp - ThML to classed XHTML + * + * $Id: thmlxhtml.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include <stdlib.h> +#include <thmlxhtml.h> +#include <swmodule.h> +#include <utilxml.h> +#include <utilstr.h> +#include <versekey.h> +#include <url.h> + +SWORD_NAMESPACE_START + + +const char *ThMLXHTML::getHeader() const { + return "\ + "; +} + + +ThMLXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) { + if (module) { + version = module->getName(); + BiblicalText = (!strcmp(module->getType(), "Biblical Texts")); + SecHead = false; + } +} + + +ThMLXHTML::ThMLXHTML() { + setTokenStart("<"); + setTokenEnd(">"); + + setEscapeStart("&"); + setEscapeEnd(";"); + + setEscapeStringCaseSensitive(true); + setPassThruNumericEscapeString(true); + + addAllowedEscapeString("quot"); + addAllowedEscapeString("amp"); + addAllowedEscapeString("lt"); + addAllowedEscapeString("gt"); + + addAllowedEscapeString("nbsp"); + addAllowedEscapeString("brvbar"); // "Å " + addAllowedEscapeString("sect"); // "§" + addAllowedEscapeString("copy"); // "©" + addAllowedEscapeString("laquo"); // "«" + addAllowedEscapeString("reg"); // "®" + addAllowedEscapeString("acute"); // "Ž" + addAllowedEscapeString("para"); // "¶" + addAllowedEscapeString("raquo"); // "»" + + addAllowedEscapeString("Aacute"); // "Ã" + addAllowedEscapeString("Agrave"); // "À" + addAllowedEscapeString("Acirc"); // "Â" + addAllowedEscapeString("Auml"); // "Ä" + addAllowedEscapeString("Atilde"); // "Ã" + addAllowedEscapeString("Aring"); // "Ã…" + addAllowedEscapeString("aacute"); // "á" + addAllowedEscapeString("agrave"); // "à" + addAllowedEscapeString("acirc"); // "â" + addAllowedEscapeString("auml"); // "ä" + addAllowedEscapeString("atilde"); // "ã" + addAllowedEscapeString("aring"); // "Ã¥" + addAllowedEscapeString("Eacute"); // "É" + addAllowedEscapeString("Egrave"); // "È" + addAllowedEscapeString("Ecirc"); // "Ê" + addAllowedEscapeString("Euml"); // "Ë" + addAllowedEscapeString("eacute"); // "é" + addAllowedEscapeString("egrave"); // "è" + addAllowedEscapeString("ecirc"); // "ê" + addAllowedEscapeString("euml"); // "ë" + addAllowedEscapeString("Iacute"); // "Ã" + addAllowedEscapeString("Igrave"); // "ÃŒ" + addAllowedEscapeString("Icirc"); // "ÃŽ" + addAllowedEscapeString("Iuml"); // "Ã" + addAllowedEscapeString("iacute"); // "í" + addAllowedEscapeString("igrave"); // "ì" + addAllowedEscapeString("icirc"); // "î" + addAllowedEscapeString("iuml"); // "ï" + addAllowedEscapeString("Oacute"); // "Ó" + addAllowedEscapeString("Ograve"); // "Ã’" + addAllowedEscapeString("Ocirc"); // "Ô" + addAllowedEscapeString("Ouml"); // "Ö" + addAllowedEscapeString("Otilde"); // "Õ" + addAllowedEscapeString("oacute"); // "ó" + addAllowedEscapeString("ograve"); // "ò" + addAllowedEscapeString("ocirc"); // "ô" + addAllowedEscapeString("ouml"); // "ö" + addAllowedEscapeString("otilde"); // "õ" + addAllowedEscapeString("Uacute"); // "Ú" + addAllowedEscapeString("Ugrave"); // "Ù" + addAllowedEscapeString("Ucirc"); // "Û" + addAllowedEscapeString("Uuml"); // "Ãœ" + addAllowedEscapeString("uacute"); // "ú" + addAllowedEscapeString("ugrave"); // "ù" + addAllowedEscapeString("ucirc"); // "û" + addAllowedEscapeString("uuml"); // "ü" + addAllowedEscapeString("Yacute"); // "Ã" + addAllowedEscapeString("yacute"); // "ý" + addAllowedEscapeString("yuml"); // "ÿ" + + addAllowedEscapeString("deg"); // "°" + addAllowedEscapeString("plusmn"); // "±" + addAllowedEscapeString("sup2"); // "²" + addAllowedEscapeString("sup3"); // "³" + addAllowedEscapeString("sup1"); // "¹" + addAllowedEscapeString("nbsp"); // "º" + addAllowedEscapeString("pound"); // "£" + addAllowedEscapeString("cent"); // "¢" + addAllowedEscapeString("frac14"); // "Å’" + addAllowedEscapeString("frac12"); // "Å“" + addAllowedEscapeString("frac34"); // "Ÿ" + addAllowedEscapeString("iquest"); // "¿" + addAllowedEscapeString("iexcl"); // "¡" + addAllowedEscapeString("ETH"); // "Ã" + addAllowedEscapeString("eth"); // "ð" + addAllowedEscapeString("THORN"); // "Þ" + addAllowedEscapeString("thorn"); // "þ" + addAllowedEscapeString("AElig"); // "Æ" + addAllowedEscapeString("aelig"); // "æ" + addAllowedEscapeString("Oslash"); // "Ø" + addAllowedEscapeString("curren"); // "€" + addAllowedEscapeString("Ccedil"); // "Ç" + addAllowedEscapeString("ccedil"); // "ç" + addAllowedEscapeString("szlig"); // "ß" + addAllowedEscapeString("Ntilde"); // "Ñ" + addAllowedEscapeString("ntilde"); // "ñ" + addAllowedEscapeString("yen"); // "Â¥" + addAllowedEscapeString("not"); // "¬" + addAllowedEscapeString("ordf"); // "ª" + addAllowedEscapeString("uml"); // "Å¡" + addAllowedEscapeString("shy"); // "­" + addAllowedEscapeString("macr"); // "¯" + + addAllowedEscapeString("micro"); // "µ" + addAllowedEscapeString("middot"); // "·" + addAllowedEscapeString("cedil"); // "ž" + addAllowedEscapeString("ordm"); // "º" + addAllowedEscapeString("times"); // "×" + addAllowedEscapeString("divide"); // "÷" + addAllowedEscapeString("oslash"); // "ø" + + setTokenCaseSensitive(true); +// addTokenSubstitute("scripture", "<i> "); + addTokenSubstitute("/scripture", "</i> "); + + renderNoteNumbers = false; +} + + +bool ThMLXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) { + if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution + MyUserData *u = (MyUserData *)userData; + + XMLTag tag(token); + if ((!tag.isEndTag()) && (!tag.isEmpty())) + u->startTag = tag; + + if (tag.getName() && !strcmp(tag.getName(), "sync")) { + SWBuf value = tag.getAttribute("value"); + if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")) { //> + if(value.length()) + buf.appendFormatted("<small><em class=\"morph\">(<a href=\"passagestudy.jsp?action=showMorph&type=Greek&value=%s\" class=\"morph\">%s</a>)</em></small>", + URL::encode(value.c_str()).c_str(), + value.c_str()); + } + else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "lemma")) { //> + if(value.length()) + // empty "type=" is deliberate. + buf.appendFormatted("<small><em class=\"strongs\"><<a href=\"passagestudy.jsp?action=showStrongs&type=&value=%s\" class=\"strongs\">%s</a>></em></small>", + URL::encode(value.c_str()).c_str(), + value.c_str()); + } + else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Strongs")) { + char ch = *value; + value<<1; + buf.appendFormatted("<small><em class=\"strongs\"><<a href=\"passagestudy.jsp?action=showStrongs&type=%s&value=%s\" class=\"strongs\">", + ((ch == 'H') ? "Hebrew" : "Greek"), + URL::encode(value.c_str()).c_str()); + buf += (value.length()) ? value.c_str() : ""; + buf += "</a>></em></small>"; + } + else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Dict")) { + buf += (tag.isEndTag() ? "</b>" : "<b>"); + } + + } + // <note> tag + else if (!strcmp(tag.getName(), "note")) { + if (!tag.isEndTag()) { + if (!tag.isEmpty()) { + SWBuf type = tag.getAttribute("type"); + SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); + VerseKey *vkey = NULL; + // see if we have a VerseKey * or descendant + SWTRY { + vkey = SWDYNAMIC_CAST(VerseKey, u->key); + } + SWCATCH ( ... ) { } + if (vkey) { + // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. + char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", + ch, + URL::encode(footnoteNumber.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str(), + URL::encode(vkey->getText()).c_str(), + ch, + ch, + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); + } + else { + char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'); + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", + ch, + URL::encode(footnoteNumber.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str(), + URL::encode(u->key->getText()).c_str(), + ch, + ch, + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); + } + u->suspendTextPassThru = true; + } + } + if (tag.isEndTag()) { + u->suspendTextPassThru = false; + } + } + else if (!strcmp(tag.getName(), "scripture")) { + buf += (tag.isEndTag() ? "</i>" : "<i>"); + } + // <scripRef> tag + else if (!strcmp(tag.getName(), "scripRef")) { + if (!tag.isEndTag()) { + if (!tag.isEmpty()) { + u->suspendTextPassThru = true; + } + } + if (tag.isEndTag()) { // </scripRef> + if (!u->BiblicalText) { + SWBuf refList = u->startTag.getAttribute("passage"); + if (!refList.length()) + refList = u->lastTextNode; + SWBuf version = tag.getAttribute("version"); + + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=%s\">", + (refList.length()) ? URL::encode(refList.c_str()).c_str() : "", + (version.length()) ? URL::encode(version.c_str()).c_str() : ""); + buf += u->lastTextNode.c_str(); + buf += "</a>"; + } + else { + SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote"); + SWBuf noteName = tag.getAttribute("n"); + VerseKey *vkey = NULL; + // see if we have a VerseKey * or descendant + SWTRY { + vkey = SWDYNAMIC_CAST(VerseKey, u->key); + } + SWCATCH ( ... ) {} + if (vkey) { + // leave this special osis type in for crossReference notes types? Might thml use this some day? Doesn't hurt. + //buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", vkey->getText(), footnoteNumber.c_str()); + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=x&value=%s&module=%s&passage=%s\"><small><sup class=\"x\">*x%s</sup></small></a>", + URL::encode(footnoteNumber.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str(), + URL::encode(vkey->getText()).c_str(), + (renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : "")); + } + } + + // let's let text resume to output again + u->suspendTextPassThru = false; + } + } + else if (tag.getName() && !strcmp(tag.getName(), "div")) { + if (tag.isEndTag() && u->SecHead) { + buf += "</i></b><br />"; + u->SecHead = false; + } + else if (tag.getAttribute("class")) { + if (!stricmp(tag.getAttribute("class"), "sechead")) { + u->SecHead = true; + buf += "<br /><b><i>"; + } + else if (!stricmp(tag.getAttribute("class"), "title")) { + u->SecHead = true; + buf += "<br /><b><i>"; + } + else { + buf += tag; + } + } + else { + buf += tag; + } + } + else if (tag.getName() && (!strcmp(tag.getName(), "img") || !strcmp(tag.getName(), "image"))) { + const char *src = strstr(token, "src"); + if (!src) // assert we have a src attribute + return false; + + const char *c, *d; + if (((c = strchr(src+3, '"')) == NULL) || + ((d = strchr( ++c , '"')) == NULL)) // identify endpoints. + return false; // abandon hope. + + SWBuf imagename = "file:"; + if (*c == '/') // as below, inside for loop. + imagename += userData->module->getConfigEntry("AbsoluteDataPath"); + while (c != d) // move bits into the name. + imagename += *(c++); + + // images become clickable, if the UI supports showImage. + buf.appendFormatted("<a href=\"passagestudy.jsp?action=showImage&value=%s&module=%s\"><", + URL::encode(imagename.c_str()).c_str(), + URL::encode(u->version.c_str()).c_str()); + + for (c = token; *c; c++) { + if ((*c == '/') && (*(c+1) == '\0')) + continue; + if (c == src) { + for (;((*c) && (*c != '"')); c++) + buf += *c; + + if (!*c) { c--; continue; } + + buf += '"'; + if (*(c+1) == '/') { + buf += "file:"; + buf += userData->module->getConfigEntry("AbsoluteDataPath"); + if (buf[buf.length()-2] == '/') + c++; // skip '/' + } + continue; + } + buf += *c; + } + buf += " border=0 /></a>"; + } + else { + buf += '<'; + /*for (const char *tok = token; *tok; tok++) + buf += *tok;*/ + buf += token; + buf += '>'; + //return false; // we still didn't handle token + } + } + return true; +} + + +SWORD_NAMESPACE_END diff --git a/src/modules/filters/unicodertf.cpp b/src/modules/filters/unicodertf.cpp index 768aecc..997597b 100644 --- a/src/modules/filters/unicodertf.cpp +++ b/src/modules/filters/unicodertf.cpp @@ -1,10 +1,10 @@ /****************************************************************************** * - * unicodertf - SWFilter descendant to convert a double byte unicode file - * to RTF tags + * unicodertf.cpp - SWFilter descendant to convert UTF-8 to RTF tags * + * $Id: unicodertf.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/filters/utf16utf8.cpp b/src/modules/filters/utf16utf8.cpp index a488e18..6356284 100644 --- a/src/modules/filters/utf16utf8.cpp +++ b/src/modules/filters/utf16utf8.cpp @@ -1,10 +1,10 @@ /****************************************************************************** * - * UTF16UTF8 - SWFilter descendant to convert UTF-16 to UTF-8 + * utf16utf8.cpp - SWFilter descendant to convert UTF-16 to UTF-8 * + * $Id: utf16utf8.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -27,8 +27,10 @@ #include <utf16utf8.h> #include <swbuf.h> + SWORD_NAMESPACE_START + UTF16UTF8::UTF16UTF8() { } @@ -102,6 +104,4 @@ char UTF16UTF8::processText(SWBuf &text, const SWKey *key, const SWModule *modul } - - SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf8arabicpoints.cpp b/src/modules/filters/utf8arabicpoints.cpp index bd3169b..42bfaa5 100644 --- a/src/modules/filters/utf8arabicpoints.cpp +++ b/src/modules/filters/utf8arabicpoints.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * UTF8ArabicPoints - SWFilter descendant to remove UTF-8 Arabic vowel points + * utf8arabicpoints.cpp - SWFilter descendant to remove UTF-8 + * Arabic vowel points * - * $Id: utf8arabicpoints.h 1688 2008-11-30 04:42:26Z refdoc $ + * $Id: utf8arabicpoints.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,36 +26,163 @@ #include <stdio.h> #include <utf8arabicpoints.h> + SWORD_NAMESPACE_START -const char oName[] = "Arabic Vowel Points"; -const char oTip[] = "Toggles Arabic Vowel Points"; +namespace { + + static const char oName[] = "Arabic Vowel Points"; + static const char oTip[] = "Toggles Arabic Vowel Points"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"On", "Off", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } + + + static char *nextMark(const char* from, int* mark_size) { + // Arabic vowel points currently targeted for elimination: + // Table entries excerpted from + // http://www.utf8-chartable.de/unicode-utf8-table.pl. + // Code UTF-8 Description + // point + // ----- --------- ----------- + // U+064B d9 8b ARABIC FATHATAN + // U+064C d9 8c ARABIC DAMMATAN + // U+064D d9 8d ARABIC KASRATAN + // U+064E d9 8e ARABIC FATHA + // U+064F d9 8f ARABIC DAMMA + // U+0650 d9 90 ARABIC KASRA + // U+0651 d9 91 ARABIC SHADDA + // U+0652 d9 92 ARABIC SUKUN + // U+0653 d9 93 ARABIC MADDAH ABOVE + // U+0654 d9 94 ARABIC HAMZA ABOVE + // U+0655 d9 95 ARABIC HAMZA BELOW + // + // U+FC5E ef b1 9e ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM + // U+FC5F ef b1 9f ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM + // U+FC60 ef b1 a0 ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM + // U+FC61 ef b1 a1 ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM + // U+FC62 ef b1 a2 ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM + // U+FC63 ef b1 a3 ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM + // + // U+FE70 ef b9 b0 ARABIC FATHATAN ISOLATED FORM + // U+FE71 ef b9 b1 ARABIC TATWEEL WITH FATHATAN ABOVE + // U+FE72 ef b9 b2 ARABIC DAMMATAN ISOLATED FORM + // U+FE73 ef b9 b3 ARABIC TAIL FRAGMENT + // U+FE74 ef b9 b4 ARABIC KASRATAN ISOLATED FORM + // U+FE75 ef b9 b5 ??? + // U+FE76 ef b9 b6 ARABIC FATHA ISOLATED FORM + // U+FE77 ef b9 b7 ARABIC FATHA MEDIAL FORM + // U+FE78 ef b9 b8 ARABIC DAMMA ISOLATED FORM + // U+FE79 ef b9 b9 ARABIC DAMMA MEDIAL FORM + // U+FE7A ef b9 ba ARABIC KASRA ISOLATED FORM + // U+FE7B ef b9 bb ARABIC KASRA MEDIAL FORM + // U+FE7C ef b9 bc ARABIC SHADDA ISOLATED FORM + // U+FE7D ef b9 bd ARABIC SHADDA MEDIAL FORM + // U+FE7E ef b9 be ARABIC SUKUN ISOLATED FORM + // U+FE7F ef b9 bf ARABIC SUKUN MEDIAL FORM + + unsigned char* byte = (unsigned char*) from; + for (; *byte; ++byte) { + if (byte[0] == 0xD9) { + if (byte[1] >= 0x8B && byte[1] <= 0x95) { + *mark_size = 2; + break; + } + continue; + } + if (byte[0] == 0xEF) { + if (byte[1] == 0xB1) { + if (byte[2] >= 0x9E && byte[2] <= 0xA3) { + *mark_size = 3; + break; + } + continue; + } + if (byte[1] == 0xB9) { + if (byte[2] >= 0xB0 && byte[2] <= 0xBF) { + *mark_size = 3; + break; + } + continue; + } + } + } + return (char*)byte; + } +} -const SWBuf choices[3] = {"On", "Off", ""}; -const StringList oValues(&choices[0], &choices[2]); -UTF8ArabicPoints::UTF8ArabicPoints() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("On"); +UTF8ArabicPoints::UTF8ArabicPoints() : SWOptionFilter(oName, oTip, oValues()) { } + UTF8ArabicPoints::~UTF8ArabicPoints(){}; -char UTF8ArabicPoints::processText(SWBuf &text, const SWKey *key, const SWModule *module) { - if (!option) { - //The UTF-8 range 0xFC 0xE5 to 0xFC 0x63 consist of Arabic vowel marks so block those out. - // Also ranges 0xFE70 til OxFE7F and 0x064b-0x0655 - SWBuf orig = text; - const unsigned char* from = (unsigned char*)orig.c_str(); - for (text = ""; *from; from++) { - if (((*from == 0xFC) && (*(from + 1) >= 0xE5 && *(from + 1) <= 0x63)) || ((*from == 0xFE) && (*(from + 1) >= 0x70 && *(from + 1) <= 0x7F)) || ((*from == 0x06) && (*(from + 1) >= 0x4B && *(from + 1) <= 0x55))){ - from++; - } - else { - text += *from; - } + +char UTF8ArabicPoints::processText(SWBuf &text, const SWKey *, const SWModule *) { + // A non-zero/true option setting means that setOptionValue("On") + // was called which apparently means that Arabic Vowel Marks are ENABLED, + // so the filter's actions are DISABLED. + if (option) + return 0; + + // Eliminate Arabic vowel marks from the text. + // The recognized marks are determined by the "nextMark" function. + + // If nextMark were polymorphic (a virtual function or a function + // pointer), this function could be generically used in any filter that + // only removed (vs. replaced) areas of text based on the arbitrary + // match criteria encapsulated in the specific nextMark + // implementation. + int mark_size = 0; + char* mark_pos = nextMark(text.c_str(), &mark_size); + + // Here and at the end of the loop, + // test BOTH mark_pos AND *mark_pos for safety and to give nextMark + // the option of returning either NULL or a pointer to the null + // terminator when done. + if (!mark_pos || !*mark_pos) + return 0; // no marks found. + + // Purposely granting write access into SWBuf internal buffer via + // "end_of_output" avoids a needless temporary SWBuf copy. + // Everything before the first mark is already in its final position + // and can be safely ignored. So start appending at the current mark. + char* end_of_output = mark_pos; + + // For consistency, input starts at (vs. after) the first mark as well + // -- not a problem since the mark itself gets skipped, anyway. + const char* start_of_input = mark_pos; + do { + // At this point, "mark_pos" and "mark_pos+mark_size" delimit + // the text to drop. + // "start_of_input" is either mark_pos or any text between the + // end of any previous mark and the current mark_pos. + // This text is now ready to be moved into the output. + int ready_size = mark_pos - start_of_input; + if (ready_size > 0) { + // Append the input text before the current mark to the + // output. + // Must use bcopy vs. strncpy because the final + // end_of_output may overtake the original + // start_of_input. + memmove(end_of_output, start_of_input, ready_size); + // Keep appending to end_of_output. + end_of_output += ready_size; } - } + // Ensure the mark never gets copied. + start_of_input = mark_pos + mark_size; + // Find the next mark. + mark_pos = nextMark(start_of_input, &mark_size); + + } while (mark_pos && *mark_pos); // No more marks. + + // Copy any trailing input text AND always the terminating null. + memmove(end_of_output, start_of_input, strlen(start_of_input)+1); return 0; } diff --git a/src/modules/filters/utf8arshaping.cpp b/src/modules/filters/utf8arshaping.cpp index 09d8973..04dea2d 100644 --- a/src/modules/filters/utf8arshaping.cpp +++ b/src/modules/filters/utf8arshaping.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * utf8arshaping - SWFilter descendant to perform Arabic shaping on - * UTF-8 text + * utf8arshaping.cpp - SWFilter descendant to perform Arabic shaping on + * UTF-8 text * + * $Id: utf8arshaping.cpp 2931 2013-07-31 13:07:26Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -31,7 +32,7 @@ SWORD_NAMESPACE_START -UTF8arShaping::UTF8arShaping() { +UTF8arShaping::UTF8arShaping() : err(U_ZERO_ERROR) { conv = ucnv_open("UTF-8", &err); } diff --git a/src/modules/filters/utf8bidireorder.cpp b/src/modules/filters/utf8bidireorder.cpp index 71dc804..b945a5b 100644 --- a/src/modules/filters/utf8bidireorder.cpp +++ b/src/modules/filters/utf8bidireorder.cpp @@ -1,10 +1,12 @@ /****************************************************************************** * - * utf8bidireorder - SWFilter descendant to perform reordering of UTF-8 - * text to visual order according to Unicode BiDi + * utf8bidireorder.cpp - SWFilter descendant to perform reordering of + * UTF-8 text to visual order according to the + * Unicode Bidirectional Algorithm (UBA) * + * $Id: utf8bidireorder.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -29,18 +31,22 @@ #include <utf8bidireorder.h> #include <swbuf.h> + SWORD_NAMESPACE_START -UTF8BiDiReorder::UTF8BiDiReorder() { + +UTF8BiDiReorder::UTF8BiDiReorder() : err(U_ZERO_ERROR) { conv = ucnv_open("UTF-8", &err); } + UTF8BiDiReorder::~UTF8BiDiReorder() { ucnv_close(conv); } + char UTF8BiDiReorder::processText(SWBuf &text, const SWKey *key, const SWModule *module) { UChar *ustr, *ustr2; @@ -72,5 +78,6 @@ char UTF8BiDiReorder::processText(SWBuf &text, const SWKey *key, const SWModule return 0; } + SWORD_NAMESPACE_END #endif diff --git a/src/modules/filters/utf8cantillation.cpp b/src/modules/filters/utf8cantillation.cpp index 73785b4..91ca58a 100644 --- a/src/modules/filters/utf8cantillation.cpp +++ b/src/modules/filters/utf8cantillation.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * UTF8Cantillation - SWFilter descendant to remove UTF-8 Hebrew cantillation + * utf8cantillation.cpp - SWFilter descendant to remove UTF-8 Hebrew + * cantillation * + * $Id: utf8cantillation.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,16 +25,23 @@ #include <stdio.h> #include <utf8cantillation.h> + SWORD_NAMESPACE_START -const char oName[] = "Hebrew Cantillation"; -const char oTip[] = "Toggles Hebrew Cantillation Marks"; +namespace { + + static const char oName[] = "Hebrew Cantillation"; + static const char oTip[] = "Toggles Hebrew Cantillation Marks"; + + static const StringList *oValues() { + static const SWBuf choices[3] = {"Off", "On", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } +} -const SWBuf choices[3] = {"On", "Off", ""}; -const StringList oValues(&choices[0], &choices[2]); -UTF8Cantillation::UTF8Cantillation() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); +UTF8Cantillation::UTF8Cantillation() : SWOptionFilter(oName, oTip, oValues()) { } diff --git a/src/modules/filters/utf8greekaccents.cpp b/src/modules/filters/utf8greekaccents.cpp index 5fdb047..039f9a4 100644 --- a/src/modules/filters/utf8greekaccents.cpp +++ b/src/modules/filters/utf8greekaccents.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * UTF8GreekAccents - SWFilter descendant to remove UTF-8 Greek accents + * utf8greekaccents.cpp - SWFilter descendant to remove UTF-8 Greek + * accents * + * $Id: utf8greekaccents.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,19 +31,27 @@ sword::UTF8NFKD decompose; #endif + SWORD_NAMESPACE_START -const char oName[] = "Greek Accents"; -const char oTip[] = "Toggles Greek Accents"; +namespace { -const SWBuf choices[3] = {"On", "Off", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const char oName[] = "Greek Accents"; + static const char oTip[] = "Toggles Greek Accents"; -UTF8GreekAccents::UTF8GreekAccents() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("On"); + static const StringList *oValues() { + static const SWBuf choices[3] = {"On", "Off", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } } -UTF8GreekAccents::~UTF8GreekAccents(){}; + +UTF8GreekAccents::UTF8GreekAccents() : SWOptionFilter(oName, oTip, oValues()) { +} + + +UTF8GreekAccents::~UTF8GreekAccents() {}; char UTF8GreekAccents::processText(SWBuf &text, const SWKey *key, const SWModule *module) { diff --git a/src/modules/filters/utf8hebrewpoints.cpp b/src/modules/filters/utf8hebrewpoints.cpp index ba7c746..ff53e4f 100644 --- a/src/modules/filters/utf8hebrewpoints.cpp +++ b/src/modules/filters/utf8hebrewpoints.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * UTF8HebrewPoints - SWFilter descendant to remove UTF-8 Hebrew vowel points + * utf8hebrewpoints.cpp - SWFilter descendant to remove UTF-8 Hebrew + * vowel points * + * $Id: utf8hebrewpoints.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,24 +25,32 @@ #include <stdio.h> #include <utf8hebrewpoints.h> + SWORD_NAMESPACE_START -const char oName[] = "Hebrew Vowel Points"; -const char oTip[] = "Toggles Hebrew Vowel Points"; +namespace { -const SWBuf choices[3] = {"On", "Off", ""}; -const StringList oValues(&choices[0], &choices[2]); + static const char oName[] = "Hebrew Vowel Points"; + static const char oTip[] = "Toggles Hebrew Vowel Points"; -UTF8HebrewPoints::UTF8HebrewPoints() : SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("On"); + static const StringList *oValues() { + static const SWBuf choices[3] = {"On", "Off", ""}; + static const StringList oVals(&choices[0], &choices[2]); + return &oVals; + } } + +UTF8HebrewPoints::UTF8HebrewPoints() : SWOptionFilter(oName, oTip, oValues()) { +} + + UTF8HebrewPoints::~UTF8HebrewPoints(){}; char UTF8HebrewPoints::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { - //The UTF-8 range 0xD6 0xB0 to 0xD6 0xBF excluding 0xD6 0x consist of Hebrew cantillation marks so block those out. + //The UTF-8 range 0xD6 0xB0 to 0xD6 0xBF excluding 0xD6 0xBE consist of Hebrew cantillation marks so block those out. SWBuf orig = text; const unsigned char* from = (unsigned char*)orig.c_str(); for (text = ""; *from; from++) { @@ -56,4 +65,5 @@ char UTF8HebrewPoints::processText(SWBuf &text, const SWKey *key, const SWModule return 0; } + SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf8html.cpp b/src/modules/filters/utf8html.cpp index 0d1dce3..1f05ac7 100644 --- a/src/modules/filters/utf8html.cpp +++ b/src/modules/filters/utf8html.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * utf8html - SWFilter descendant to convert a UTF-8 stream to HTML escapes + * utf8html.cpp - SWFilter descendant to convert a UTF-8 stream to + * HTML escapes * + * $Id: utf8html.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,8 +26,10 @@ #include <utf8html.h> #include <swbuf.h> + SWORD_NAMESPACE_START + UTF8HTML::UTF8HTML() { } @@ -34,14 +37,11 @@ UTF8HTML::UTF8HTML() { char UTF8HTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) { unsigned char *from; - int len; char digit[10]; unsigned long ch; if ((unsigned long)key < 2) // hack, we're en(1)/de(0)ciphering return (char)-1; - len = strlen(text.c_str()) + 2; // shift string to right of buffer - SWBuf orig = text; from = (unsigned char *)orig.c_str(); @@ -82,4 +82,6 @@ char UTF8HTML::processText(SWBuf &text, const SWKey *key, const SWModule *module return 0; } + SWORD_NAMESPACE_END + diff --git a/src/modules/filters/utf8latin1.cpp b/src/modules/filters/utf8latin1.cpp index 25df0c1..1bf8d3b 100644 --- a/src/modules/filters/utf8latin1.cpp +++ b/src/modules/filters/utf8latin1.cpp @@ -1,10 +1,10 @@ /****************************************************************************** * - * UTF8Latin1 - SWFilter descendant to convert UTF-8 to Latin-1 + * utf8latin1.cpp - SWFilter descendant to convert UTF-8 to Latin-1 * + * $Id: utf8latin1.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -26,8 +26,10 @@ #include <utf8latin1.h> #include <swbuf.h> + SWORD_NAMESPACE_START + UTF8Latin1::UTF8Latin1(char rchar) : replacementChar(rchar) { } @@ -36,14 +38,12 @@ char UTF8Latin1::processText(SWBuf &text, const SWKey *key, const SWModule *modu { unsigned char *from; - int len; unsigned long uchar; unsigned char significantFirstBits, subsequent; if ((unsigned long)key < 2) {// hack, we're en(1)/de(0)ciphering return (char)-1; } - len = strlen(text.c_str()) + 1; // shift string to right of buffer SWBuf orig = text; from = (unsigned char*)orig.c_str(); @@ -87,5 +87,6 @@ char UTF8Latin1::processText(SWBuf &text, const SWKey *key, const SWModule *modu return 0; } + SWORD_NAMESPACE_END diff --git a/src/modules/filters/utf8nfc.cpp b/src/modules/filters/utf8nfc.cpp index 82d404e..49f12bb 100644 --- a/src/modules/filters/utf8nfc.cpp +++ b/src/modules/filters/utf8nfc.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * utf8nfc - SWFilter descendant to perform NFC (canonical composition - * normalization) on UTF-8 text + * utf8nfc.cpp - SWFilter descendant to perform NFC (canonical + * composition normalization) on UTF-8 text * + * $Id: utf8nfc.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/src/modules/filters/utf8nfkd.cpp b/src/modules/filters/utf8nfkd.cpp index 1d6acf3..e4454d2 100644 --- a/src/modules/filters/utf8nfkd.cpp +++ b/src/modules/filters/utf8nfkd.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * utf8nfkd - SWFilter descendant to perform NFKD (compatability decomposition - * normalization) on UTF-8 text + * utf8nfkd.cpp - SWFilter descendant to perform NFKD (compatability + * decomposition normalization) on UTF-8 text * + * $Id: utf8nfkd.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -29,16 +30,20 @@ #include <utf8nfkd.h> #include <swbuf.h> + SWORD_NAMESPACE_START + UTF8NFKD::UTF8NFKD() { conv = ucnv_open("UTF-8", &err); } + UTF8NFKD::~UTF8NFKD() { ucnv_close(conv); } + char UTF8NFKD::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if ((unsigned long)key < 2) // hack, we're en(1)/de(0)ciphering @@ -64,5 +69,6 @@ char UTF8NFKD::processText(SWBuf &text, const SWKey *key, const SWModule *module return 0; } + SWORD_NAMESPACE_END #endif diff --git a/src/modules/filters/utf8transliterator.cpp b/src/modules/filters/utf8transliterator.cpp index d6aafe2..b5b1902 100644 --- a/src/modules/filters/utf8transliterator.cpp +++ b/src/modules/filters/utf8transliterator.cpp @@ -1,10 +1,11 @@ /****************************************************************************** * - * utf8transliterators - SWFilter descendant to transliterate between - * ICU-supported scripts. + * utf8transliterator.cpp - SWFilter descendant to transliterate between + * ICU-supported scripts * + * $Id: utf8transliterator.cpp 2908 2013-07-17 22:44:29Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -41,54 +42,57 @@ SWORD_NAMESPACE_START const char UTF8Transliterator::optionstring[NUMTARGETSCRIPTS][16] = { "Off", "Latin", - // "IPA", - // "Basic Latin", - // "SBL", - // "TC", - // "Beta", - // "BGreek", - // "SERA", - // "Hugoye", - // "UNGEGN", - // "ISO", - // "ALA-LC", - // "BGN", - // "Greek", - // "Hebrew", - // "Cyrillic", - // "Arabic", - // "Syriac", - // "Katakana", - // "Hiragana", - // "Hangul", - // "Devanagari", - // "Tamil", - // "Bengali", - // "Gurmukhi", - // "Gujarati", - // "Oriya", - // "Telugu", - // "Kannada", - // "Malayalam", - // "Thai", - // "Georgian", - // "Armenian", - // "Ethiopic", - // "Gothic", - // "Ugaritic", - // "Coptic", - // "Linear B", - // "Cypriot", - // "Runic", - // "Ogham", - // "Thaana", - // "Glagolitic", - // "Cherokee", + /* + "IPA", + "Basic Latin", + "SBL", + "TC", + "Beta", + "BGreek", + "SERA", + "Hugoye", + "UNGEGN", + "ISO", + "ALA-LC", + "BGN", + "Greek", + "Hebrew", + "Cyrillic", + "Arabic", + "Syriac", + "Katakana", + "Hiragana", + "Hangul", + "Devanagari", + "Tamil", + "Bengali", + "Gurmukhi", + "Gujarati", + "Oriya", + "Telugu", + "Kannada", + "Malayalam", + "Thai", + "Georgian", + "Armenian", + "Ethiopic", + "Gothic", + "Ugaritic", + "Coptic", + "Linear B", + "Cypriot", + "Runic", + "Ogham", + "Thaana", + "Glagolitic", + "Cherokee", + */ }; const char UTF8Transliterator::optName[] = "Transliteration"; const char UTF8Transliterator::optTip[] = "Transliterates between scripts"; +#ifdef ICU_CUSTOM_RESOURCE_BUILDING SWTransMap UTF8Transliterator::transMap; #ifndef _ICUSWORD_ @@ -128,7 +132,7 @@ SWCharString::~SWCharString() { } #endif // _ICUSWORD_ - +#endif // ICU_CUSTOM_RESOURCE_BUILDING UTF8Transliterator::UTF8Transliterator() { option = 0; @@ -136,17 +140,19 @@ UTF8Transliterator::UTF8Transliterator() { for (i = 0; i < NUMTARGETSCRIPTS; i++) { options.push_back(optionstring[i]); } +#ifdef ICU_CUSTOM_RESOURCE_BUILDING #ifndef _ICUSWORD_ utf8status = U_ZERO_ERROR; Load(utf8status); #endif +#endif } UTF8Transliterator::~UTF8Transliterator() { } - +#ifdef ICU_CUSTOM_RESOURCE_BUILDING void UTF8Transliterator::Load(UErrorCode &status) { #ifndef _ICUSWORD_ @@ -299,23 +305,29 @@ bool UTF8Transliterator::checkTrans(const UnicodeString& ID, UErrorCode &status return true; #endif // _ICUSWORD_ } +#endif // ICU_CUSTOM_RESOURCE_BUILDING bool UTF8Transliterator::addTrans(const char* newTrans, SWBuf* transList) { +#ifdef ICU_CUSTOM_RESOURCE_BUILDING #ifdef _ICUSWORD_ - UErrorCode status; + UErrorCode status; if (checkTrans(UnicodeString(newTrans), status)) { #endif +#endif // ICU_CUSTOM_RESOURCE_BUILDING *transList += newTrans; - *transList += ";"; - return true; + *transList += ";"; + return true; +#ifdef ICU_CUSTOM_RESOURCE_BUILDING #ifdef _ICUSWORD_ - } - else { - return false; - } + } + else { + return false; + } #endif +#endif // ICU_CUSTOM_RESOURCE_BUILDING } + Transliterator * UTF8Transliterator::createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status ) { Transliterator *trans = Transliterator::createInstance(ID,UTRANS_FORWARD,status); @@ -450,7 +462,7 @@ char UTF8Transliterator::processText(SWBuf &text, const SWKey *key, const SWModu //Simple X to Latin transliterators if (scripts[SE_GREEK]) { - if (strnicmp (((SWModule*)module)->Lang(), "cop", 3)) { + if (strnicmp (((SWModule*)module)->getLanguage(), "cop", 3)) { if (option == SE_SBL) addTrans("Greek-Latin/SBL", &ID); else if (option == SE_TC) @@ -653,7 +665,7 @@ char UTF8Transliterator::processText(SWBuf &text, const SWKey *key, const SWModu } if (scripts[SE_HAN]) { - if (!strnicmp (((SWModule*)module)->Lang(), "ja", 2)) { + if (!strnicmp (((SWModule*)module)->getLanguage(), "ja", 2)) { addTrans("Kanji-Romaji", &ID); } else { diff --git a/src/modules/filters/utf8utf16.cpp b/src/modules/filters/utf8utf16.cpp index e5b96d7..be8ad4b 100644 --- a/src/modules/filters/utf8utf16.cpp +++ b/src/modules/filters/utf8utf16.cpp @@ -1,10 +1,10 @@ /****************************************************************************** * - * UTF8UTF16 - SWFilter descendant to convert UTF-8 to UTF-16 + * utf8utf16.cpp - SWFilter descendant to convert UTF-8 to UTF-16 * + * $Id: utf8utf16.cpp 2980 2013-09-14 21:51:47Z scribe $ * - * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,8 +28,10 @@ #include <utilstr.h> #include <swbuf.h> + SWORD_NAMESPACE_START + UTF8UTF16::UTF8UTF16() { } diff --git a/src/modules/genbook/rawgenbook/rawgenbook.cpp b/src/modules/genbook/rawgenbook/rawgenbook.cpp index eff68f5..6101241 100644 --- a/src/modules/genbook/rawgenbook/rawgenbook.cpp +++ b/src/modules/genbook/rawgenbook/rawgenbook.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * rawtext.cpp - code for class 'RawGenBook'- a module that reads raw text - * files: ot and nt using indexs ??.bks ??.cps ??.vss * + * rawgenbook.cpp - code for class 'RawGenBook'- a module that reads raw + * text files: ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawgenbook.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -51,13 +53,13 @@ RawGenBook::RawGenBook(const char *ipath, const char *iname, const char *idesc, stdstr(&path, ipath); verseKey = !strcmp("VerseKey", keyType); - if (verseKey) Type("Biblical Texts"); + if (verseKey) setType("Biblical Texts"); if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\')) path[strlen(path)-1] = 0; delete key; - key = CreateKey(); + key = createKey(); sprintf(buf, "%s.bdt", path); @@ -82,7 +84,7 @@ RawGenBook::~RawGenBook() { } -bool RawGenBook::isWritable() { +bool RawGenBook::isWritable() const { return ((bdtfd->getFd() > 0) && ((bdtfd->mode & FileMgr::RDWR) == FileMgr::RDWR)); } @@ -94,7 +96,7 @@ bool RawGenBook::isWritable() { * RET: string buffer with verse */ -SWBuf &RawGenBook::getRawEntryBuf() { +SWBuf &RawGenBook::getRawEntryBuf() const { __u32 offset = 0; __u32 size = 0; @@ -160,7 +162,7 @@ void RawGenBook::linkEntry(const SWKey *inkey) { SWCATCH ( ... ) {} // if we don't have a VerseKey * decendant, create our own if (!srckey) { - srckey = (TreeKeyIdx *)CreateKey(); + srckey = (TreeKeyIdx *)createKey(); (*srckey) = *inkey; } @@ -207,7 +209,7 @@ char RawGenBook::createModule(const char *ipath) { } -SWKey *RawGenBook::CreateKey() const { +SWKey *RawGenBook::createKey() const { TreeKey *tKey = new TreeKeyIdx(path); if (verseKey) { SWKey *vtKey = new VerseTreeKey(tKey); delete tKey; return vtKey; } return tKey; @@ -218,7 +220,7 @@ bool RawGenBook::hasEntry(const SWKey *k) const { int dsize; key.getUserData(&dsize); - return (dsize > 7) && key.Error() == '\x00'; + return (dsize > 7) && key.popError() == '\x00'; } SWORD_NAMESPACE_END diff --git a/src/modules/genbook/swgenbook.cpp b/src/modules/genbook/swgenbook.cpp index e7feea2..fef41ad 100644 --- a/src/modules/genbook/swgenbook.cpp +++ b/src/modules/genbook/swgenbook.cpp @@ -1,9 +1,10 @@ /****************************************************************************** - * swld.cpp - code for base class 'SWLD'. SWLD is the basis for all - * types of Lexicon and Dictionary modules (hence the 'LD'). * + * swgenbook.cpp - Implementation of SWGenBook class * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swgenbook.cpp 2893 2013-07-16 03:07:02Z scribe $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -26,7 +27,7 @@ SWORD_NAMESPACE_START /****************************************************************************** - * SWLD Constructor - Initializes data for instance of SWLD + * SWGenBook Constructor - Initializes data for instance of SWGenBook * * ENT: imodname - Internal name for module * imoddesc - Name to display to user for module @@ -39,7 +40,7 @@ SWGenBook::SWGenBook(const char *imodname, const char *imoddesc, SWDisplay *idis /****************************************************************************** - * SWLD Destructor - Cleans up instance of SWGenBook + * SWGenBook Destructor - Cleans up instance of SWGenBook */ SWGenBook::~SWGenBook() { @@ -65,11 +66,11 @@ TreeKey &SWGenBook::getTreeKey(const SWKey *k) const { SWCATCH ( ... ) { } if (lkTest) { SWTRY { - key = SWDYNAMIC_CAST(TreeKey, lkTest->GetElement()); + key = SWDYNAMIC_CAST(TreeKey, lkTest->getElement()); if (!key) { VerseTreeKey *tkey = 0; SWTRY { - tkey = SWDYNAMIC_CAST(VerseTreeKey, lkTest->GetElement()); + tkey = SWDYNAMIC_CAST(VerseTreeKey, lkTest->getElement()); } SWCATCH ( ... ) {} if (tkey) key = tkey->getTreeKey(); @@ -89,7 +90,7 @@ TreeKey &SWGenBook::getTreeKey(const SWKey *k) const { if (!key) { delete tmpTreeKey; - tmpTreeKey = (TreeKey *)CreateKey(); + tmpTreeKey = (TreeKey *)createKey(); (*tmpTreeKey) = *(thiskey); return (*tmpTreeKey); } diff --git a/src/modules/lexdict/rawld/rawld.cpp b/src/modules/lexdict/rawld/rawld.cpp index e6a4d57..7446c10 100644 --- a/src/modules/lexdict/rawld/rawld.cpp +++ b/src/modules/lexdict/rawld/rawld.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and - * dictionary files: *.dat *.idx * + * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and + * dictionary files: *.dat *.idx * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawld.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,8 +30,10 @@ #include <stdio.h> + SWORD_NAMESPACE_START + /****************************************************************************** * RawLD Constructor - Initializes data for instance of RawLD * @@ -39,7 +43,7 @@ SWORD_NAMESPACE_START * idisp - Display object to use for displaying */ -RawLD::RawLD(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : RawStr(ipath), SWLD(iname, idesc, idisp, enc, dir, mark, ilang) +RawLD::RawLD(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, bool caseSensitive, bool strongsPadding) : RawStr(ipath, -1, caseSensitive), SWLD(iname, idesc, idisp, enc, dir, mark, ilang, strongsPadding) { } @@ -53,7 +57,7 @@ RawLD::~RawLD() } -bool RawLD::isWritable() { +bool RawLD::isWritable() const { return ((idxfd->getFd() > 0) && ((idxfd->mode & FileMgr::RDWR) == FileMgr::RDWR)); } @@ -67,7 +71,7 @@ bool RawLD::isWritable() { * RET: error status */ -char RawLD::getEntry(long away) +char RawLD::getEntry(long away) const { __u32 start = 0; __u16 size = 0; @@ -77,14 +81,14 @@ char RawLD::getEntry(long away) char *buf = new char [ strlen(*key) + 6 ]; strcpy(buf, *key); - strongsPad(buf); + if (strongsPadding) strongsPad(buf); if (!(retval = findOffset(buf, &start, &size, away))) { readText(start, &size, &idxbuf, entryBuf); rawFilter(entryBuf, 0); // hack, decipher rawFilter(entryBuf, key); entrySize = size; // support getEntrySize call - if (!key->Persist()) // If we have our own key + if (!key->isPersist()) // If we have our own key *key = idxbuf; // reset it to entry index buffer stdstr(&entkeytxt, idxbuf); // set entry key text that module 'snapped' to. @@ -106,7 +110,7 @@ char RawLD::getEntry(long away) * RET: string buffer with entry */ -SWBuf &RawLD::getRawEntryBuf() { +SWBuf &RawLD::getRawEntryBuf() const { char ret = getEntry(); if (!ret) { @@ -132,7 +136,7 @@ void RawLD::increment(int steps) { if (key->isTraversable()) { *key += steps; - error = key->Error(); + error = key->popError(); steps = 0; } @@ -176,7 +180,7 @@ long RawLD::getEntryForKey(const char *key) const { char *buf = new char [ strlen(key) + 6 ]; strcpy(buf, key); - strongsPad(buf); + if (strongsPadding) strongsPad(buf); findOffset(buf, &start, &size, 0, &offset); @@ -192,4 +196,6 @@ char *RawLD::getKeyForEntry(long entry) const { return key; } + SWORD_NAMESPACE_END + diff --git a/src/modules/lexdict/rawld4/rawld4.cpp b/src/modules/lexdict/rawld4/rawld4.cpp index 6d60d9a..1f81d83 100644 --- a/src/modules/lexdict/rawld4/rawld4.cpp +++ b/src/modules/lexdict/rawld4/rawld4.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and - * dictionary files: *.dat *.idx * + * rawld4.cpp - code for class 'RawLD'- a module that reads raw + * lexicon and dictionary files: *.dat *.idx * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawld4.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,8 +30,10 @@ #include <stdio.h> + SWORD_NAMESPACE_START + /****************************************************************************** * RawLD Constructor - Initializes data for instance of RawLD * @@ -39,7 +43,7 @@ SWORD_NAMESPACE_START * idisp - Display object to use for displaying */ -RawLD4::RawLD4(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : RawStr4(ipath), SWLD(iname, idesc, idisp, enc, dir, mark, ilang) +RawLD4::RawLD4(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, bool caseSensitive, bool strongsPadding) : RawStr4(ipath, -1, caseSensitive), SWLD(iname, idesc, idisp, enc, dir, mark, ilang, strongsPadding) { } @@ -53,7 +57,7 @@ RawLD4::~RawLD4() } -bool RawLD4::isWritable() { +bool RawLD4::isWritable() const { return ((idxfd->getFd() > 0) && ((idxfd->mode & FileMgr::RDWR) == FileMgr::RDWR)); } @@ -67,7 +71,7 @@ bool RawLD4::isWritable() { * RET: error status */ -char RawLD4::getEntry(long away) +char RawLD4::getEntry(long away) const { __u32 start = 0; __u32 size = 0; @@ -85,7 +89,7 @@ char RawLD4::getEntry(long away) rawFilter(entryBuf, 0); // hack, decipher rawFilter(entryBuf, key); entrySize = size; // support getEntrySize call - if (!key->Persist()) // If we have our own key + if (!key->isPersist()) // If we have our own key *key = idxbuf; // reset it to entry index buffer stdstr(&entkeytxt, idxbuf); // set entry key text that module 'snapped' to. @@ -104,7 +108,7 @@ char RawLD4::getEntry(long away) * RET: string buffer with entry */ -SWBuf &RawLD4::getRawEntryBuf() { +SWBuf &RawLD4::getRawEntryBuf() const { char ret = getEntry(); if (!ret) { @@ -130,7 +134,7 @@ void RawLD4::increment(int steps) { if (key->isTraversable()) { *key += steps; - error = key->Error(); + error = key->popError(); steps = 0; } @@ -160,11 +164,13 @@ void RawLD4::deleteEntry() { doSetText(*key, ""); } + long RawLD4::getEntryCount() const { if (idxfd < 0) return 0; return idxfd->seek(0, SEEK_END) / IDXENTRYSIZE; } + long RawLD4::getEntryForKey(const char *key) const { __u32 start, offset; __u32 size; @@ -181,10 +187,13 @@ long RawLD4::getEntryForKey(const char *key) const { return offset / IDXENTRYSIZE; } + char *RawLD4::getKeyForEntry(long entry) const { char *key = 0; getIDXBuf(entry * IDXENTRYSIZE, &key); return key; } + SWORD_NAMESPACE_END + diff --git a/src/modules/lexdict/swld.cpp b/src/modules/lexdict/swld.cpp index bccf5d8..5e1909b 100644 --- a/src/modules/lexdict/swld.cpp +++ b/src/modules/lexdict/swld.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * swld.cpp - code for base class 'SWLD'. SWLD is the basis for all - * types of Lexicon and Dictionary modules (hence the 'LD'). * + * swld.cpp - code for base class 'SWLD'. SWLD is the basis for all + * types of Lexicon and Dictionary modules (hence the 'LD'). * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swld.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,9 +25,12 @@ #include <stdio.h> #include <swld.h> #include <strkey.h> +#include <swkey.h> + SWORD_NAMESPACE_START + /****************************************************************************** * SWLD Constructor - Initializes data for instance of SWLD * @@ -34,10 +39,10 @@ SWORD_NAMESPACE_START * idisp - Display object to use for displaying */ -SWLD::SWLD(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : SWModule(imodname, imoddesc, idisp, (char *)"Lexicons / Dictionaries", enc, dir, mark, ilang) +SWLD::SWLD(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, bool strongsPadding) : SWModule(imodname, imoddesc, idisp, (char *)"Lexicons / Dictionaries", enc, dir, mark, ilang), strongsPadding(strongsPadding) { delete key; - key = CreateKey(); + key = createKey(); entkeytxt = new char [1]; *entkeytxt = 0; } @@ -54,7 +59,7 @@ SWLD::~SWLD() } -SWKey *SWLD::CreateKey() const { return new StrKey(); } +SWKey *SWLD::createKey() const { return new StrKey(); } /****************************************************************************** @@ -67,13 +72,11 @@ SWKey *SWLD::CreateKey() const { return new StrKey(); } * RET: pointer to keytext */ -const char *SWLD::KeyText(const char *ikeytext) -{ - if (key->Persist() && !ikeytext) { +const char *SWLD::getKeyText() const { + if (key->isPersist()) { getRawEntryBuf(); // force module key to snap to entry - return entkeytxt; } - else return SWModule::KeyText(ikeytext); + return entkeytxt; } @@ -96,12 +99,13 @@ void SWLD::setPosition(SW_POSITION p) { getRawEntryBuf(); } + bool SWLD::hasEntry(const SWKey *key) const { const char *key_str = *key; char *buf = new char [ strlen(key_str) + 6 ]; strcpy(buf, key_str); - strongsPad(buf); + if (strongsPadding) strongsPad(buf); bool retVal = !strcmp(buf, getKeyForEntry(getEntryForKey(buf))); delete buf; @@ -109,6 +113,7 @@ bool SWLD::hasEntry(const SWKey *key) const { return retVal; } + /****************************************************************************** * SWLD::strongsPad - Pads a key if (it-1) is 100% digits to 5 places * allows for final to be alpha, e.g. '123B' @@ -161,3 +166,4 @@ void SWLD::strongsPad(char *buf) SWORD_NAMESPACE_END + diff --git a/src/modules/lexdict/zld/zld.cpp b/src/modules/lexdict/zld/zld.cpp index 2c46657..71919d4 100644 --- a/src/modules/lexdict/zld/zld.cpp +++ b/src/modules/lexdict/zld/zld.cpp @@ -1,8 +1,11 @@ /****************************************************************************** - * rawld.cpp - code for class 'RawLD'- a module that reads raw lexicon and - * dictionary files: *.dat *.idx * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * zld.cpp - code for class 'zLD'- a module that reads zlib compressed + * lexicon and dictionary files + * + * $Id: zld.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -27,8 +30,10 @@ #include <stdio.h> + SWORD_NAMESPACE_START + /****************************************************************************** * RawLD Constructor - Initializes data for instance of RawLD * @@ -38,7 +43,7 @@ SWORD_NAMESPACE_START * idisp - Display object to use for displaying */ -zLD::zLD(const char *ipath, const char *iname, const char *idesc, long blockCount, SWCompress *icomp, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : zStr(ipath, -1, blockCount, icomp), SWLD(iname, idesc, idisp, enc, dir, mark, ilang) { +zLD::zLD(const char *ipath, const char *iname, const char *idesc, long blockCount, SWCompress *icomp, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, bool caseSensitive, bool strongsPadding) : zStr(ipath, -1, blockCount, icomp, caseSensitive), SWLD(iname, idesc, idisp, enc, dir, mark, ilang, strongsPadding) { } @@ -52,7 +57,7 @@ zLD::~zLD() { } -bool zLD::isWritable() { +bool zLD::isWritable() const { return ((idxfd->getFd() > 0) && ((idxfd->mode & FileMgr::RDWR) == FileMgr::RDWR)); } @@ -66,7 +71,7 @@ bool zLD::isWritable() { * RET: error status */ -char zLD::getEntry(long away) { +char zLD::getEntry(long away) const { char *idxbuf = 0; char *ebuf = 0; char retval = 0; @@ -75,7 +80,7 @@ char zLD::getEntry(long away) { char *buf = new char [ strlen(*key) + 6 ]; strcpy(buf, *key); - strongsPad(buf); + if (strongsPadding) strongsPad(buf); entryBuf = ""; if (!(retval = findKeyIndex(buf, &index, away))) { @@ -86,7 +91,7 @@ char zLD::getEntry(long away) { rawFilter(entryBuf, key); entrySize = size; // support getEntrySize call - if (!key->Persist()) // If we have our own key + if (!key->isPersist()) // If we have our own key *key = idxbuf; // reset it to entry index buffer stdstr(&entkeytxt, idxbuf); // set entry key text that module 'snapped' to. @@ -106,7 +111,7 @@ char zLD::getEntry(long away) { * RET: string buffer with entry */ -SWBuf &zLD::getRawEntryBuf() { +SWBuf &zLD::getRawEntryBuf() const { if (!getEntry() /*&& !isUnicode()*/) { prepText(entryBuf); } @@ -128,7 +133,7 @@ void zLD::increment(int steps) { if (key->isTraversable()) { *key += steps; - error = key->Error(); + error = key->popError(); steps = 0; } @@ -172,7 +177,7 @@ long zLD::getEntryForKey(const char* key) const char *buf = new char [ strlen(key) + 6 ]; strcpy(buf, key); - strongsPad(buf); + if (strongsPadding) strongsPad(buf); findKeyIndex(buf, &offset); @@ -191,3 +196,4 @@ char *zLD::getKeyForEntry(long entry) const SWORD_NAMESPACE_END + diff --git a/src/modules/readme b/src/modules/readme deleted file mode 100644 index 92cc99e..0000000 --- a/src/modules/readme +++ /dev/null @@ -1,9 +0,0 @@ -This directory contains all different module types that are usable by the SWORD -API. - - comments Commentaries - common common utility objects - lexdict Lexicons/Dictionaries - maps Maps - parsers Language Parsers - texts Scripture Texts diff --git a/src/modules/swmodule.cpp b/src/modules/swmodule.cpp index 758b8d2..6944c4e 100644 --- a/src/modules/swmodule.cpp +++ b/src/modules/swmodule.cpp @@ -1,10 +1,12 @@ /****************************************************************************** - * swmodule.cpp - code for base class 'module'. Module is the basis for all - * types of modules (e.g. texts, commentaries, maps, lexicons, - * etc.) * + * swmodule.cpp - code for base class 'SWModule'. SWModule is the basis + * for all types of modules (e.g. texts, commentaries, + * maps, lexicons, etc.) * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swmodule.cpp 2976 2013-09-10 14:09:44Z scribe $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -27,7 +29,6 @@ #include <sysdata.h> #include <swmodule.h> #include <utilstr.h> -#include <regex.h> // GNU #include <swfilter.h> #include <versekey.h> // KLUDGE for Search #include <treekeyidx.h> // KLUDGE for Search @@ -38,9 +39,17 @@ #include <iostream> #endif +#ifdef USECXX11REGEX +#include <regex> +#ifndef REG_ICASE +#define REG_ICASE std::regex::icase +#endif +#else +#include <regex.h> // GNU +#endif + #ifdef USELUCENE #include <CLucene.h> -#include <CLucene/CLBackwards.h> //Lucence includes //#include "CLucene.h" @@ -61,7 +70,7 @@ using std::vector; SWORD_NAMESPACE_START -SWDisplay SWModule::rawdisp; +SWModule::StdOutDisplay SWModule::rawdisp; typedef std::list<SWBuf> StringList; @@ -77,7 +86,7 @@ typedef std::list<SWBuf> StringList; */ SWModule::SWModule(const char *imodname, const char *imoddesc, SWDisplay *idisp, const char *imodtype, SWTextEncoding encoding, SWTextDirection direction, SWTextMarkup markup, const char *imodlang) { - key = CreateKey(); + key = createKey(); entryBuf = ""; config = &ownConfig; modname = 0; @@ -120,44 +129,44 @@ SWModule::~SWModule() delete [] modlang; if (key) { - if (!key->Persist()) + if (!key->isPersist()) delete key; } stripFilters->clear(); - rawFilters->clear(); - renderFilters->clear(); - optionFilters->clear(); - encodingFilters->clear(); + rawFilters->clear(); + renderFilters->clear(); + optionFilters->clear(); + encodingFilters->clear(); entryAttributes.clear(); - delete stripFilters; - delete rawFilters; - delete renderFilters; - delete optionFilters; - delete encodingFilters; + delete stripFilters; + delete rawFilters; + delete renderFilters; + delete optionFilters; + delete encodingFilters; } /****************************************************************************** - * SWModule::CreateKey - Allocates a key of specific type for module + * SWModule::createKey - Allocates a key of specific type for module * * RET: pointer to allocated key */ -SWKey *SWModule::CreateKey() const +SWKey *SWModule::createKey() const { return new SWKey(); } /****************************************************************************** - * SWModule::Error - Gets and clears error status + * SWModule::popError - Gets and clears error status * * RET: error status */ -char SWModule::Error() +char SWModule::popError() { char retval = error; @@ -175,11 +184,7 @@ char SWModule::Error() * RET: pointer to modname */ -char *SWModule::Name(const char *imodname) { - return stdstr(&modname, imodname); -} - -char *SWModule::Name() const { +const char *SWModule::getName() const { return modname; } @@ -193,11 +198,7 @@ char *SWModule::Name() const { * RET: pointer to moddesc */ -char *SWModule::Description(const char *imoddesc) { - return stdstr(&moddesc, imoddesc); -} - -char *SWModule::Description() const { +const char *SWModule::getDescription() const { return moddesc; } @@ -211,70 +212,20 @@ char *SWModule::Description() const { * RET: pointer to modtype */ -char *SWModule::Type(const char *imodtype) { - return stdstr(&modtype, imodtype); -} - -char *SWModule::Type() const { +const char *SWModule::getType() const { return modtype; } /****************************************************************************** - * SWModule::Direction - Sets/gets module direction + * SWModule::getDirection - Sets/gets module direction * * ENT: newdir - value which to set direction * [-1] - only get * * RET: char direction */ -char SWModule::Direction(signed char newdir) { - if (newdir != -1) - direction = newdir; - return direction; -} - -/****************************************************************************** - * SWModule::Encoding - Sets/gets module encoding - * - * ENT: newdir - value which to set direction - * [-1] - only get - * - * RET: char encoding - */ -char SWModule::Encoding(signed char newenc) { - if (newenc != -1) - encoding = newenc; - return encoding; -} - -/****************************************************************************** - * SWModule::Markup - Sets/gets module markup - * - * ENT: newdir - value which to set direction - * [-1] - only get - * - * RET: char markup - */ -char SWModule::Markup(signed char newmark) { - if (newmark != -1) - markup = newmark; - return markup; -} - - -/****************************************************************************** - * SWModule::Lang - Sets/gets module language - * - * ENT: imodlang - value which to set modlang - * [0] - only get - * - * RET: pointer to modname - */ - -char *SWModule::Lang(const char *imodlang) -{ - if (imodlang) stdstr(&modlang, imodlang); - return modlang; +char SWModule::getDirection() const { + return direction; } @@ -295,19 +246,17 @@ void SWModule::setDisplay(SWDisplay *idisp) { disp = idisp; } - /****************************************************************************** - * SWModule::Display - Calls this modules display object and passes itself - * - * RET: error status - */ + * * SWModule::Display - Calls this modules display object and passes itself + * * + * * RET: error status + * */ -char SWModule::Display() { - disp->Display(*this); +char SWModule::display() { + disp->display(*this); return 0; } - /****************************************************************************** * SWModule::getKey - Gets the key from this module that points to the position * record @@ -333,12 +282,12 @@ char SWModule::setKey(const SWKey *ikey) { SWKey *oldKey = 0; if (key) { - if (!key->Persist()) // if we have our own copy + if (!key->isPersist()) // if we have our own copy oldKey = key; } - if (!ikey->Persist()) { // if we are to keep our own copy - key = CreateKey(); + if (!ikey->isPersist()) { // if we are to keep our own copy + key = createKey(); *key = *ikey; } else key = (SWKey *)ikey; // if we are to just point to an external key @@ -360,7 +309,7 @@ char SWModule::setKey(const SWKey *ikey) { void SWModule::setPosition(SW_POSITION p) { *key = p; - char saveError = key->Error(); + char saveError = key->popError(); switch (p) { case POS_TOP: @@ -388,7 +337,7 @@ void SWModule::setPosition(SW_POSITION p) { void SWModule::increment(int steps) { (*key) += steps; - error = key->Error(); + error = key->popError(); } @@ -402,7 +351,7 @@ void SWModule::increment(int steps) { void SWModule::decrement(int steps) { (*key) -= steps; - error = key->Error(); + error = key->popError(); } @@ -426,7 +375,7 @@ void SWModule::decrement(int steps) { ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *scope, bool *justCheckIfSupported, void (*percent)(char, void *), void *percentUserData) { - listKey.ClearList(); + listKey.clear(); SWBuf term = istr; bool includeComponents = false; // for entryAttrib e.g., /Lemma.1/ @@ -447,10 +396,21 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc return listKey; } - SWKey *saveKey = 0; + SWKey *saveKey = 0; SWKey *searchKey = 0; - SWKey *resultKey = CreateKey(); + SWKey *resultKey = createKey(); + SWKey *lastKey = createKey(); + SWBuf lastBuf = ""; + +#ifdef USECXX11REGEX + std::locale oldLocale; + std::locale::global(std::locale("en_US.UTF-8")); + + std::regex preg; +#else regex_t preg; +#endif + vector<SWBuf> words; vector<SWBuf> window; const char *sres; @@ -460,36 +420,40 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc // determine if we might be doing special strip searches. useful for knowing if we can use shortcuts bool specialStrips = (getConfigEntry("LocalStripFilter") - || (getConfig().has("GlobalOptionFilter", "UTF8GreekAccents")) - || (getConfig().has("GlobalOptionFilter", "UTF8HebrewPoints")) - || (getConfig().has("GlobalOptionFilter", "UTF8ArabicPoints")) - || (strchr(istr, '<'))); + || (getConfig().has("GlobalOptionFilter", "UTF8GreekAccents")) + || (getConfig().has("GlobalOptionFilter", "UTF8HebrewPoints")) + || (getConfig().has("GlobalOptionFilter", "UTF8ArabicPoints")) + || (strchr(istr, '<'))); - processEntryAttributes(searchType == -3); + setProcessEntryAttributes(searchType == -3); - if (!key->Persist()) { - saveKey = CreateKey(); + if (!key->isPersist()) { + saveKey = createKey(); *saveKey = *key; } else saveKey = key; - searchKey = (scope)?scope->clone():(key->Persist())?key->clone():0; + searchKey = (scope)?scope->clone():(key->isPersist())?key->clone():0; if (searchKey) { - searchKey->Persist(1); + searchKey->setPersist(true); setKey(*searchKey); } (*percent)(perc, percentUserData); *this = BOTTOM; - long highIndex = key->Index(); + long highIndex = key->getIndex(); if (!highIndex) highIndex = 1; // avoid division by zero errors. *this = TOP; if (searchType >= 0) { +#ifdef USECXX11REGEX + preg = std::regex((SWBuf(".*")+istr+".*").c_str(), std::regex_constants::extended & flags); +#else flags |=searchType|REG_NOSUB|REG_EXTENDED; regcomp(&preg, istr, flags); +#endif } (*percent)(++perc, percentUserData); @@ -497,10 +461,6 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc #ifdef USELUCENE if (searchType == -4) { // lucene - //Buffers for the wchar<->utf8 char* conversion - const unsigned short int MAX_CONV_SIZE = 2047; - wchar_t wcharBuffer[MAX_CONV_SIZE + 1]; - char utfBuffer[MAX_CONV_SIZE + 1]; lucene::index::IndexReader *ir = 0; lucene::search::IndexSearcher *is = 0; @@ -513,20 +473,18 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc const TCHAR *stopWords[] = { 0 }; standard::StandardAnalyzer analyzer(stopWords); - lucene_utf8towcs(wcharBuffer, istr, MAX_CONV_SIZE); //TODO Is istr always utf8? - q = QueryParser::parse(wcharBuffer, _T("content"), &analyzer); + q = QueryParser::parse((wchar_t *)utf8ToWChar(istr).getRawData(), _T("content"), &analyzer); (*percent)(20, percentUserData); h = is->search(q); (*percent)(80, percentUserData); // iterate thru each good module position that meets the search bool checkBounds = getKey()->isBoundSet(); - for (long i = 0; i < h->length(); i++) { + for (unsigned long i = 0; i < (unsigned long)h->length(); i++) { Document &doc = h->doc(i); // set a temporary verse key to this module position - lucene_wcstoutf8(utfBuffer, doc.get(_T("key")), MAX_CONV_SIZE); - *resultKey = utfBuffer; //TODO Does a key always accept utf8? + *resultKey = wcharToUTF8(doc.get(_T("key"))); //TODO Does a key always accept utf8? // check to see if it sets ok (within our bounds) and if not, skip if (checkBounds) { @@ -536,7 +494,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc } } listKey << *resultKey; - listKey.GetElement()->userData = (void *)((__u32)(h->score(i)*100)); + listKey.getElement()->userData = (__u64)((__u32)(h->score(i)*100)); } (*percent)(98, percentUserData); } @@ -606,8 +564,8 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc (*percent)(perc, percentUserData); - while ((searchType != -4) && !Error() && !terminateSearch) { - long mindex = key->Index(); + while ((searchType != -4) && !popError() && !terminateSearch) { + long mindex = key->getIndex(); float per = (float)mindex / highIndex; per *= 93; per += 5; @@ -619,17 +577,35 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc else if (newperc < perc) { #ifndef _MSC_VER std::cerr << "Serious error: new percentage complete is less than previous value\n"; - std::cerr << "index: " << (key->Index()) << "\n"; + std::cerr << "index: " << (key->getIndex()) << "\n"; std::cerr << "highIndex: " << highIndex << "\n"; std::cerr << "newperc ==" << (int)newperc << "%" << "is smaller than\n"; std::cerr << "perc == " << (int )perc << "% \n"; #endif } if (searchType >= 0) { - if (!regexec(&preg, StripText(), 0, 0, 0)) { + SWBuf textBuf = stripText(); +#ifdef USECXX11REGEX + if (std::regex_match(std::string(textBuf.c_str()), preg)) { +#else + if (!regexec(&preg, textBuf, 0, 0, 0)) { +#endif *resultKey = *getKey(); resultKey->clearBound(); listKey << *resultKey; + lastBuf = ""; + } +#ifdef USECXX11REGEX + else if (std::regex_match(std::string((lastBuf + ' ' + textBuf).c_str()), preg)) { +#else + else if (!regexec(&preg, lastBuf + ' ' + textBuf, 0, 0, 0)) { +#endif + lastKey->clearBound(); + listKey << *lastKey; + lastBuf = textBuf; + } + else { + lastBuf = textBuf; } } @@ -640,10 +616,10 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc // phrase case -1: - textBuf = StripText(); + textBuf = stripText(); if ((flags & REG_ICASE) == REG_ICASE) toupperstr(textBuf); sres = strstr(textBuf.c_str(), term.c_str()); - if (sres) { //it's also in the StripText(), so we have a valid search result item now + if (sres) { //it's also in the stripText(), so we have a valid search result item now *resultKey = *getKey(); resultKey->clearBound(); listKey << *resultKey; @@ -655,7 +631,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc int loopCount = 0; unsigned int foundWords = 0; do { - textBuf = ((loopCount == 0)&&(!specialStrips)) ? getRawEntry() : StripText(); + textBuf = ((loopCount == 0)&&(!specialStrips)) ? getRawEntry() : stripText(); foundWords = 0; for (unsigned int i = 0; i < words.size(); i++) { @@ -680,7 +656,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc // entry attributes case -3: { - RenderText(); // force parse + renderText(); // force parse AttributeTypeList &entryAttribs = getEntryAttributes(); AttributeTypeList::iterator i1Start, i1End; AttributeList::iterator i2Start, i2End; @@ -804,25 +780,32 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc break; } // end switch } + *lastKey = *getKey(); (*this)++; } // cleaup work - if (searchType >= 0) + if (searchType >= 0) { +#ifdef USECXX11REGEX + std::locale::global(oldLocale); +#else regfree(&preg); +#endif + } setKey(*saveKey); - if (!saveKey->Persist()) + if (!saveKey->isPersist()) delete saveKey; if (searchKey) delete searchKey; delete resultKey; + delete lastKey; listKey = TOP; - processEntryAttributes(savePEA); + setProcessEntryAttributes(savePEA); (*percent)(100, percentUserData); @@ -833,7 +816,7 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc /****************************************************************************** - * SWModule::StripText() - calls all stripfilters on current text + * SWModule::stripText() - calls all stripfilters on current text * * ENT: buf - buf to massage instead of this modules current text * len - max len of buf @@ -841,29 +824,45 @@ ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *sc * RET: this module's text at current key location massaged by Strip filters */ -const char *SWModule::StripText(const char *buf, int len) { - return RenderText(buf, len, false); +const char *SWModule::stripText(const char *buf, int len) { + static SWBuf local; + local = renderText(buf, len, false); + return local.c_str(); +} + + +/** SWModule::getRenderHeader() - Produces any header data which might be + * useful which associated with the processing done with this filter. + * A typical example is a suggested CSS style block for classed + * containers. + */ +const char *SWModule::getRenderHeader() const { + FilterList::const_iterator first = getRenderFilters().begin(); + if (first != getRenderFilters().end()) { + return (*first)->getHeader(); + } + return ""; } /****************************************************************************** - * SWModule::RenderText - calls all renderfilters on current text + * SWModule::renderText - calls all renderfilters on current text * * ENT: buf - buffer to Render instead of current module position * - * RET: this module's text at current key location massaged by RenderText filters + * RET: this module's text at current key location massaged by renderText filters */ - const char *SWModule::RenderText(const char *buf, int len, bool render) { + SWBuf SWModule::renderText(const char *buf, int len, bool render) { bool savePEA = isProcessEntryAttributes(); if (!buf) { entryAttributes.clear(); } else { - processEntryAttributes(false); + setProcessEntryAttributes(false); } - static SWBuf local; + SWBuf local; if (buf) local = buf; @@ -889,37 +888,37 @@ const char *SWModule::StripText(const char *buf, int len) { tmpbuf = null; } - processEntryAttributes(savePEA); + setProcessEntryAttributes(savePEA); return tmpbuf; } /****************************************************************************** - * SWModule::RenderText - calls all renderfilters on current text + * SWModule::renderText - calls all renderfilters on current text * * ENT: tmpKey - key to use to grab text * * RET: this module's text at current key location massaged by RenderFilers */ - const char *SWModule::RenderText(const SWKey *tmpKey) { +SWBuf SWModule::renderText(const SWKey *tmpKey) { SWKey *saveKey; const char *retVal; - if (!key->Persist()) { - saveKey = CreateKey(); + if (!key->isPersist()) { + saveKey = createKey(); *saveKey = *key; } else saveKey = key; setKey(*tmpKey); - retVal = RenderText(); + retVal = renderText(); setKey(*saveKey); - if (!saveKey->Persist()) + if (!saveKey->isPersist()) delete saveKey; return retVal; @@ -927,35 +926,53 @@ const char *SWModule::StripText(const char *buf, int len) { /****************************************************************************** - * SWModule::StripText - calls all StripTextFilters on current text + * SWModule::stripText - calls all StripTextFilters on current text * * ENT: tmpKey - key to use to grab text * * RET: this module's text at specified key location massaged by Strip filters */ -const char *SWModule::StripText(const SWKey *tmpKey) { +const char *SWModule::stripText(const SWKey *tmpKey) { SWKey *saveKey; const char *retVal; - if (!key->Persist()) { - saveKey = CreateKey(); + if (!key->isPersist()) { + saveKey = createKey(); *saveKey = *key; } else saveKey = key; setKey(*tmpKey); - retVal = StripText(); + retVal = stripText(); setKey(*saveKey); - if (!saveKey->Persist()) + if (!saveKey->isPersist()) delete saveKey; return retVal; } +/****************************************************************************** + * SWModule::getBibliography -Returns bibliographic data for a module in the + * requested format + * + * ENT: bibFormat format of the bibliographic data + * + * RET: bibliographic data in the requested format as a string (BibTeX by default) + */ + +SWBuf SWModule::getBibliography(unsigned char bibFormat) const { + SWBuf s; + switch (bibFormat) { + case BIB_BIBTEX: + s.append("@Book {").append(modname).append(", Title = \"").append(moddesc).append("\", Publisher = \"CrossWire Bible Society\"}"); + break; + } + return s; +} const char *SWModule::getConfigEntry(const char *key) const { ConfigEntMap::iterator it = config->find(key); @@ -1008,7 +1025,6 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void SWBuf c; const int MAX_CONV_SIZE = 1024 * 1024; - wchar_t *wcharBuffer = new wchar_t[MAX_CONV_SIZE + 1]; // turn all filters to default values StringList filterSettings; @@ -1030,15 +1046,15 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void // save key information so as not to disrupt original // module position - if (!key->Persist()) { - saveKey = CreateKey(); + if (!key->isPersist()) { + saveKey = createKey(); *saveKey = *key; } else saveKey = key; - searchKey = (key->Persist())?key->clone():0; + searchKey = (key->isPersist())?key->clone():0; if (searchKey) { - searchKey->Persist(1); + searchKey->setPersist(1); setKey(*searchKey); } @@ -1062,19 +1078,19 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void VerseKey *vkcheck = 0; vkcheck = SWDYNAMIC_CAST(VerseKey, key); VerseKey *chapMax = 0; - if (vkcheck) chapMax = (VerseKey *)vkcheck->clone(); + if (vkcheck) chapMax = (VerseKey *)vkcheck->clone(); TreeKeyIdx *tkcheck = 0; tkcheck = SWDYNAMIC_CAST(TreeKeyIdx, key); *this = BOTTOM; - long highIndex = key->Index(); + long highIndex = key->getIndex(); if (!highIndex) highIndex = 1; // avoid division by zero errors. bool savePEA = isProcessEntryAttributes(); - processEntryAttributes(true); + setProcessEntryAttributes(true); // prox chapter blocks // position module at the beginning @@ -1082,14 +1098,17 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void SWBuf proxBuf; SWBuf proxLem; + SWBuf proxMorph; SWBuf strong; + SWBuf morph; - char err = Error(); + char err = popError(); while (!err) { - long mindex = key->Index(); + long mindex = key->getIndex(); proxBuf = ""; proxLem = ""; + proxMorph = ""; // computer percent complete so we can report to our progress callback float per = (float)mindex / highIndex; @@ -1102,7 +1121,7 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void } // get "content" field - const char *content = StripText(); + const char *content = stripText(); bool good = false; @@ -1118,8 +1137,10 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void AttributeTypeList::iterator words; AttributeList::iterator word; AttributeValue::iterator strongVal; + AttributeValue::iterator morphVal; strong=""; + morph=""; words = getEntryAttributes().find("Word"); if (words != getEntryAttributes().end()) { for (word = words->second.begin();word != words->second.end(); word++) { @@ -1136,16 +1157,22 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void continue; // no text? let's skip } strong.append(strongVal->second); + morph.append(strongVal->second); + morph.append('@'); + SWBuf tmp = "Morph"; + if (partCount > 1) tmp.appendFormatted(".%d", i+1); + morphVal = word->second.find(tmp); + if (morphVal != word->second.end()) { + morph.append(morphVal->second); + } strong.append(' '); + morph.append(' '); } } } } - lucene_utf8towcs(wcharBuffer, keyText, MAX_CONV_SIZE); //keyText must be utf8 -// doc->add( *(new Field("key", wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED))); - doc->add( *Field::Text(_T("key"), wcharBuffer ) ); - + doc->add(*_CLNEW Field(_T("key"), (wchar_t *)utf8ToWChar(keyText).getRawData(), Field::STORE_YES | Field::INDEX_UNTOKENIZED)); if (includeKeyInSearch) { c = keyText; @@ -1154,12 +1181,11 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void content = c.c_str(); } - lucene_utf8towcs(wcharBuffer, content, MAX_CONV_SIZE); //content must be utf8 - doc->add( *Field::UnStored(_T("content"), wcharBuffer) ); + doc->add(*_CLNEW Field(_T("content"), (wchar_t *)utf8ToWChar(content).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED)); if (strong.length() > 0) { - lucene_utf8towcs(wcharBuffer, strong, MAX_CONV_SIZE); - doc->add( *Field::UnStored(_T("lemma"), wcharBuffer) ); + doc->add(*_CLNEW Field(_T("lemma"), (wchar_t *)utf8ToWChar(strong).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED)); + doc->add(*_CLNEW Field(_T("morph"), (wchar_t *)utf8ToWChar(morph).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED)); //printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str()); } @@ -1172,20 +1198,22 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void if (vkcheck) { *chapMax = *vkcheck; // we're the first verse in a chapter - if (vkcheck->Verse() == 1) { + if (vkcheck->getVerse() == 1) { *chapMax = MAXVERSE; VerseKey saveKey = *vkcheck; while ((!err) && (*vkcheck <= *chapMax)) { //printf("building proxBuf from (%s).\nproxBuf.c_str(): %s\n", (const char *)*key, proxBuf.c_str()); //printf("building proxBuf from (%s).\n", (const char *)*key); - content = StripText(); + content = stripText(); if (content && *content) { // build "strong" field strong = ""; + morph = ""; AttributeTypeList::iterator words; AttributeList::iterator word; AttributeValue::iterator strongVal; + AttributeValue::iterator morphVal; words = getEntryAttributes().find("Word"); if (words != getEntryAttributes().end()) { @@ -1203,7 +1231,16 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void continue; // no text? let's skip } strong.append(strongVal->second); + morph.append(strongVal->second); + morph.append('@'); + SWBuf tmp = "Morph"; + if (partCount > 1) tmp.appendFormatted(".%d", i+1); + morphVal = word->second.find(tmp); + if (morphVal != word->second.end()) { + morph.append(morphVal->second); + } strong.append(' '); + morph.append(' '); } } } @@ -1211,11 +1248,14 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void proxBuf += content; proxBuf.append(' '); proxLem += strong; - if (proxLem.length()) + proxMorph += morph; + if (proxLem.length()) { proxLem.append("\n"); + proxMorph.append("\n"); + } } (*this)++; - err = Error(); + err = popError(); } err = 0; *vkcheck = saveKey; @@ -1230,13 +1270,15 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void //printf("building proxBuf from (%s).\n", (const char *)*key); //fflush(stdout); - content = StripText(); + content = stripText(); if (content && *content) { // build "strong" field strong = ""; + morph = ""; AttributeTypeList::iterator words; AttributeList::iterator word; AttributeValue::iterator strongVal; + AttributeValue::iterator morphVal; words = getEntryAttributes().find("Word"); if (words != getEntryAttributes().end()) { @@ -1254,7 +1296,16 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void continue; // no text? let's skip } strong.append(strongVal->second); + morph.append(strongVal->second); + morph.append('@'); + SWBuf tmp = "Morph"; + if (partCount > 1) tmp.appendFormatted(".%d", i+1); + morphVal = word->second.find(tmp); + if (morphVal != word->second.end()) { + morph.append(morphVal->second); + } strong.append(' '); + morph.append(' '); } } } @@ -1263,8 +1314,11 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void proxBuf += content; proxBuf.append(' '); proxLem += strong; - if (proxLem.length()) + proxMorph += morph; + if (proxLem.length()) { proxLem.append("\n"); + proxMorph.append("\n"); + } } } while (tkcheck->nextSibling()); tkcheck->parent(); @@ -1276,16 +1330,12 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void if (proxBuf.length() > 0) { - lucene_utf8towcs(wcharBuffer, proxBuf, MAX_CONV_SIZE); //keyText must be utf8 - -//printf("proxBuf after (%s).\nprox: %s\nproxLem: %s\n", (const char *)*key, proxBuf.c_str(), proxLem.c_str()); - - doc->add( *Field::UnStored(_T("prox"), wcharBuffer) ); + doc->add(*_CLNEW Field(_T("prox"), (wchar_t *)utf8ToWChar(proxBuf).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED)); good = true; } if (proxLem.length() > 0) { - lucene_utf8towcs(wcharBuffer, proxLem, MAX_CONV_SIZE); //keyText must be utf8 - doc->add( *Field::UnStored(_T("proxlem"), wcharBuffer) ); + doc->add(*_CLNEW Field(_T("proxlem"), (wchar_t *)utf8ToWChar(proxLem).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED) ); + doc->add(*_CLNEW Field(_T("proxmorph"), (wchar_t *)utf8ToWChar(proxMorph).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED) ); good = true; } if (good) { @@ -1296,27 +1346,39 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void delete doc; (*this)++; - err = Error(); + err = popError(); } // Optimizing automatically happens with the call to addIndexes //coreWriter->optimize(); coreWriter->close(); +#ifdef CLUCENE2 + d = FSDirectory::getDirectory(target.c_str()); +#endif if (IndexReader::indexExists(target.c_str())) { +#ifndef CLUCENE2 d = FSDirectory::getDirectory(target.c_str(), false); +#endif if (IndexReader::isLocked(d)) { IndexReader::unlock(d); } - fsWriter = new IndexWriter( d, an, false); - } else { + } + else { +#ifndef CLUCENE2 d = FSDirectory::getDirectory(target.c_str(), true); +#endif fsWriter = new IndexWriter(d, an, true); } Directory *dirs[] = { ramDir, 0 }; +#ifdef CLUCENE2 + lucene::util::ConstValueArray< lucene::store::Directory *>dirsa(dirs, 1); + fsWriter->addIndexes(dirsa); +#else fsWriter->addIndexes(dirs); +#endif fsWriter->close(); delete ramDir; @@ -1327,15 +1389,15 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void // reposition module back to where it was before we were called setKey(*saveKey); - if (!saveKey->Persist()) + if (!saveKey->isPersist()) delete saveKey; if (searchKey) delete searchKey; - delete chapMax; + delete chapMax; - processEntryAttributes(savePEA); + setProcessEntryAttributes(savePEA); // reset option filters back to original values StringList::iterator origVal = filterSettings.begin(); @@ -1343,8 +1405,6 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void (*filter)->setOptionValue(*origVal++); } - delete [] wcharBuffer; - return 0; #else return SWSearchable::createSearchFramework(percent, percentUserData); @@ -1356,7 +1416,7 @@ signed char SWModule::createSearchFramework(void (*percent)(char, void *), void * @param buf the buffer to filter * @param key key location from where this buffer was extracted */ -void SWModule::filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey *key) { +void SWModule::filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey *key) const { OptionFilterList::iterator it; for (it = filters->begin(); it != filters->end(); it++) { (*it)->processText(buf, key, this); @@ -1368,7 +1428,7 @@ void SWModule::filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey * * @param buf the buffer to filter * @param key key location from where this buffer was extracted */ -void SWModule::filterBuffer(FilterList *filters, SWBuf &buf, const SWKey *key) { +void SWModule::filterBuffer(FilterList *filters, SWBuf &buf, const SWKey *key) const { FilterList::iterator it; for (it = filters->begin(); it != filters->end(); it++) { (*it)->processText(buf, key, this); diff --git a/src/modules/tests/echomod.cpp b/src/modules/tests/echomod.cpp index 99b00cd..4de772d 100644 --- a/src/modules/tests/echomod.cpp +++ b/src/modules/tests/echomod.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * echomod.cpp - code for class 'echomod'- a dummy test text module that just - * echos back the key * + * echomod.cpp - code for class 'EchoMod'- a dummy test text module + * that just echos back the key * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: echomod.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -33,7 +35,7 @@ EchoMod::~EchoMod() { } -SWBuf &EchoMod::getRawEntryBuf() +SWBuf &EchoMod::getRawEntryBuf() const { static SWBuf retVal; retVal = *key; diff --git a/src/modules/texts/rawtext/rawtext.cpp b/src/modules/texts/rawtext/rawtext.cpp index 8641a45..4fb716c 100644 --- a/src/modules/texts/rawtext/rawtext.cpp +++ b/src/modules/texts/rawtext/rawtext.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * rawtext.cpp - code for class 'RawText'- a module that reads raw text files: - * ot and nt using indexs ??.bks ??.cps ??.vss * + * rawtext.cpp - code for class 'RawText'- a module that reads raw text + * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawtext.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -71,7 +73,7 @@ RawText::~RawText() { } -bool RawText::isWritable() { +bool RawText::isWritable() const { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); } @@ -83,16 +85,16 @@ bool RawText::isWritable() { * RET: string buffer with verse */ -SWBuf &RawText::getRawEntryBuf() { +SWBuf &RawText::getRawEntryBuf() const { long start = 0; unsigned short size = 0; VerseKey &key = getVerseKey(); - findOffset(key.Testament(), key.TestamentIndex(), &start, &size); + findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size); entrySize = size; // support getEntrySize call entryBuf = ""; - readText(key.Testament(), start, size, entryBuf); + readText(key.getTestament(), start, size, entryBuf); rawFilter(entryBuf, 0); // hack, decipher rawFilter(entryBuf, &key); @@ -106,14 +108,14 @@ SWBuf &RawText::getRawEntryBuf() { void RawText::setEntry(const char *inbuf, long len) { VerseKey &key = getVerseKey(); - doSetText(key.Testament(), key.TestamentIndex(), inbuf, len); + doSetText(key.getTestament(), key.getTestamentIndex(), inbuf, len); } void RawText::linkEntry(const SWKey *inkey) { VerseKey &destkey = getVerseKey(); const VerseKey *srckey = &getVerseKey(inkey); - doLinkEntry(destkey.Testament(), destkey.TestamentIndex(), srckey->TestamentIndex()); + doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex()); } @@ -125,7 +127,7 @@ void RawText::linkEntry(const SWKey *inkey) { void RawText::deleteEntry() { VerseKey &key = getVerseKey(); - doSetText(key.Testament(), key.TestamentIndex(), ""); + doSetText(key.getTestament(), key.getTestamentIndex(), ""); } /****************************************************************************** @@ -141,7 +143,7 @@ void RawText::increment(int steps) { unsigned short size; VerseKey *tmpkey = &getVerseKey(); - findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size); + findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size); SWKey lastgood = *tmpkey; while (steps) { @@ -151,17 +153,21 @@ void RawText::increment(int steps) { (steps > 0) ? ++(*key) : --(*key); tmpkey = &getVerseKey(); - if ((error = key->Error())) { + if ((error = key->popError())) { *key = lastgood; break; } - long index = tmpkey->TestamentIndex(); - findOffset(tmpkey->Testament(), index, &start, &size); + long index = tmpkey->getTestamentIndex(); + findOffset(tmpkey->getTestament(), index, &start, &size); + if ( - (((laststart != start) || (lastsize != size)) // we're a different entry + ( + ((laststart != start) || (lastsize != size)) // we're a different entry // && (start > 0) - && (size)) // and we actually have a size - ||(!skipConsecutiveLinks)) { // or we don't want to skip consecutive links + && (size) // and we actually have a size + ) + || !skipConsecutiveLinks + ) { // or we don't want to skip consecutive links steps += (steps < 0) ? 1 : -1; lastgood = *tmpkey; } @@ -169,15 +175,16 @@ void RawText::increment(int steps) { error = (error) ? KEYERR_OUTOFBOUNDS : 0; } + bool RawText::isLinked(const SWKey *k1, const SWKey *k2) const { long start1, start2; unsigned short size1, size2; VerseKey *vk1 = &getVerseKey(k1); VerseKey *vk2 = &getVerseKey(k2); - if (vk1->Testament() != vk2->Testament()) return false; + if (vk1->getTestament() != vk2->getTestament()) return false; - findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1); - findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2); + findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1); + findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2); if (!size1 || !size2) return false; return start1 == start2; } @@ -187,7 +194,7 @@ bool RawText::hasEntry(const SWKey *k) const { unsigned short size; VerseKey *vk = &getVerseKey(k); - findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size); + findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size); return size; } diff --git a/src/modules/texts/rawtext4/Makefile b/src/modules/texts/rawtext4/Makefile new file mode 100644 index 0000000..a08e07e --- /dev/null +++ b/src/modules/texts/rawtext4/Makefile @@ -0,0 +1,5 @@ + +root := ../../../.. + +all: + make -C ${root} diff --git a/src/modules/texts/rawtext4/rawtext4.cpp b/src/modules/texts/rawtext4/rawtext4.cpp index 65f5cef..5980801 100644 --- a/src/modules/texts/rawtext4/rawtext4.cpp +++ b/src/modules/texts/rawtext4/rawtext4.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * rawtext4.cpp - code for class 'RawText4'- a module that reads raw text - * files: ot and nt using indexs ??.bks ??.cps ??.vss * + * rawtext4.cpp - code for class 'RawText4'- a module that reads raw text + * files: ot and nt using indexs ??.bks ??.cps ??.vss * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: rawtext4.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -31,24 +33,8 @@ #include <versekey.h> #include <stringmgr.h> -#include <regex.h> // GNU -#include <map> -#include <list> -#include <algorithm> - -#ifndef USELUCENE -using std::map; -using std::list; -using std::find; -#endif - SWORD_NAMESPACE_START -#ifndef USELUCENE -typedef map < SWBuf, list<long> > strlist; -typedef list<long> longlist; -#endif - /****************************************************************************** * RawText4 Constructor - Initializes data for instance of RawText4 * @@ -71,7 +57,7 @@ RawText4::~RawText4() { } -bool RawText4::isWritable() { +bool RawText4::isWritable() const { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); } @@ -83,16 +69,16 @@ bool RawText4::isWritable() { * RET: string buffer with verse */ -SWBuf &RawText4::getRawEntryBuf() { +SWBuf &RawText4::getRawEntryBuf() const { long start = 0; unsigned long size = 0; VerseKey &key = getVerseKey(); - findOffset(key.Testament(), key.TestamentIndex(), &start, &size); + findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size); entrySize = size; // support getEntrySize call entryBuf = ""; - readText(key.Testament(), start, size, entryBuf); + readText(key.getTestament(), start, size, entryBuf); rawFilter(entryBuf, 0); // hack, decipher rawFilter(entryBuf, &key); @@ -106,14 +92,14 @@ SWBuf &RawText4::getRawEntryBuf() { void RawText4::setEntry(const char *inbuf, long len) { VerseKey &key = getVerseKey(); - doSetText(key.Testament(), key.TestamentIndex(), inbuf, len); + doSetText(key.getTestament(), key.getTestamentIndex(), inbuf, len); } void RawText4::linkEntry(const SWKey *inkey) { VerseKey &destkey = getVerseKey(); const VerseKey *srckey = &getVerseKey(inkey); - doLinkEntry(destkey.Testament(), destkey.TestamentIndex(), srckey->TestamentIndex()); + doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex()); } @@ -125,7 +111,7 @@ void RawText4::linkEntry(const SWKey *inkey) { void RawText4::deleteEntry() { VerseKey &key = getVerseKey(); - doSetText(key.Testament(), key.TestamentIndex(), ""); + doSetText(key.getTestament(), key.getTestamentIndex(), ""); } /****************************************************************************** @@ -141,7 +127,7 @@ void RawText4::increment(int steps) { unsigned long size; VerseKey *tmpkey = &getVerseKey(); - findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size); + findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size); SWKey lastgood = *tmpkey; while (steps) { @@ -151,12 +137,12 @@ void RawText4::increment(int steps) { (steps > 0) ? ++(*key) : --(*key); tmpkey = &getVerseKey(); - if ((error = key->Error())) { + if ((error = key->popError())) { *key = lastgood; break; } - long index = tmpkey->TestamentIndex(); - findOffset(tmpkey->Testament(), index, &start, &size); + long index = tmpkey->getTestamentIndex(); + findOffset(tmpkey->getTestament(), index, &start, &size); if ( (((laststart != start) || (lastsize != size)) // we're a different entry // && (start > 0) @@ -174,10 +160,10 @@ bool RawText4::isLinked(const SWKey *k1, const SWKey *k2) const { unsigned long size1, size2; VerseKey *vk1 = &getVerseKey(k1); VerseKey *vk2 = &getVerseKey(k2); - if (vk1->Testament() != vk2->Testament()) return false; + if (vk1->getTestament() != vk2->getTestament()) return false; - findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1); - findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2); + findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1); + findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2); return start1 == start2; } @@ -186,7 +172,7 @@ bool RawText4::hasEntry(const SWKey *k) const { unsigned long size; VerseKey *vk = &getVerseKey(k); - findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size); + findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size); return size; } diff --git a/src/modules/texts/swtext.cpp b/src/modules/texts/swtext.cpp index a7f5f92..9c3c02d 100644 --- a/src/modules/texts/swtext.cpp +++ b/src/modules/texts/swtext.cpp @@ -1,8 +1,11 @@ /****************************************************************************** - * swtext.cpp - code for base class 'SWText'- The basis for all text modules * + * swtext.cpp - code for base class 'SWText'- The basis for all text + * modules * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: swtext.cpp 2893 2013-07-16 03:07:02Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -38,9 +41,9 @@ SWText::SWText(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWT this->versification = 0; stdstr(&(this->versification), versification); delete key; - key = (VerseKey *)CreateKey(); - tmpVK1 = (VerseKey *)CreateKey(); - tmpVK2 = (VerseKey *)CreateKey(); + key = (VerseKey *)createKey(); + tmpVK1 = (VerseKey *)createKey(); + tmpVK2 = (VerseKey *)createKey(); tmpSecond = false; skipConsecutiveLinks = false; } @@ -58,10 +61,10 @@ SWText::~SWText() { /****************************************************************************** - * SWText CreateKey - Create the correct key (VerseKey) for use with SWText + * SWText createKey - Create the correct key (VerseKey) for use with SWText */ -SWKey *SWText::CreateKey() const { +SWKey *SWText::createKey() const { VerseKey *vk = new VerseKey(); vk->setVersificationSystem(versification); @@ -70,24 +73,22 @@ SWKey *SWText::CreateKey() const { } -long SWText::Index() const { +long SWText::getIndex() const { VerseKey *key = &getVerseKey(); - entryIndex = key->Index(); + entryIndex = key->getIndex(); return entryIndex; } -long SWText::Index(long iindex) { +void SWText::setIndex(long iindex) { VerseKey *key = &getVerseKey(); - key->Testament(1); - key->Index(iindex); + key->setTestament(1); + key->setIndex(iindex); if (key != this->key) { this->key->copyFrom(*key); } - - return Index(); } @@ -108,7 +109,7 @@ VerseKey &SWText::getVerseKey(const SWKey *keyToConvert) const { SWCATCH ( ... ) { } if (lkTest) { SWTRY { - key = SWDYNAMIC_CAST(VerseKey, lkTest->GetElement()); + key = SWDYNAMIC_CAST(VerseKey, lkTest->getElement()); } SWCATCH ( ... ) { } } diff --git a/src/modules/texts/ztext/ztext.cpp b/src/modules/texts/ztext/ztext.cpp index 61b3008..f0afe6d 100644 --- a/src/modules/texts/ztext/ztext.cpp +++ b/src/modules/texts/ztext/ztext.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * ztext.cpp - code for class 'zText'- a module that reads compressed text - * files: ot and nt using indexs ??.vss * + * ztext.cpp - code for class 'zText'- a module that reads compressed text + * files * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: ztext.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,9 +30,6 @@ #include <ztext.h> -#include <regex.h> // GNU - - SWORD_NAMESPACE_START /****************************************************************************** @@ -65,7 +64,7 @@ zText::~zText() } -bool zText::isWritable() { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); } +bool zText::isWritable() const { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); } /****************************************************************************** @@ -74,18 +73,18 @@ bool zText::isWritable() { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & * RET: buffer with verse */ -SWBuf &zText::getRawEntryBuf() { +SWBuf &zText::getRawEntryBuf() const { long start = 0; unsigned short size = 0; unsigned long buffnum = 0; VerseKey &key = getVerseKey(); - findOffset(key.Testament(), key.TestamentIndex(), &start, &size, &buffnum); + findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size, &buffnum); entrySize = size; // support getEntrySize call entryBuf = ""; - zReadText(key.Testament(), start, size, buffnum, entryBuf); + zReadText(key.getTestament(), start, size, buffnum, entryBuf); rawFilter(entryBuf, &key); // if (!isUnicode()) @@ -96,18 +95,18 @@ SWBuf &zText::getRawEntryBuf() { bool zText::sameBlock(VerseKey *k1, VerseKey *k2) { - if (k1->Testament() != k2->Testament()) + if (k1->getTestament() != k2->getTestament()) return false; switch (blockType) { case VERSEBLOCKS: - if (k1->Verse() != k2->Verse()) + if (k1->getVerse() != k2->getVerse()) return false; case CHAPTERBLOCKS: - if (k1->Chapter() != k2->Chapter()) + if (k1->getChapter() != k2->getChapter()) return false; case BOOKBLOCKS: - if (k1->Book() != k2->Book()) + if (k1->getBook() != k2->getBook()) return false; } return true; @@ -125,7 +124,7 @@ void zText::setEntry(const char *inbuf, long len) { delete lastWriteKey; } - doSetText(key.Testament(), key.TestamentIndex(), inbuf, len); + doSetText(key.getTestament(), key.getTestamentIndex(), inbuf, len); lastWriteKey = (VerseKey *)key.clone(); // must delete } @@ -134,7 +133,7 @@ void zText::setEntry(const char *inbuf, long len) { void zText::linkEntry(const SWKey *inkey) { VerseKey &destkey = getVerseKey(); const VerseKey *srckey = &getVerseKey(inkey); - doLinkEntry(destkey.Testament(), destkey.TestamentIndex(), srckey->TestamentIndex()); + doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex()); } @@ -147,7 +146,7 @@ void zText::deleteEntry() { VerseKey &key = getVerseKey(); - doSetText(key.Testament(), key.TestamentIndex(), ""); + doSetText(key.getTestament(), key.getTestamentIndex(), ""); } @@ -164,7 +163,7 @@ void zText::increment(int steps) { unsigned long buffnum; VerseKey *tmpkey = &getVerseKey(); - findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size, &buffnum); + findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size, &buffnum); SWKey lastgood = *tmpkey; while (steps) { @@ -174,18 +173,21 @@ void zText::increment(int steps) { (steps > 0) ? ++(*key) : --(*key); tmpkey = &getVerseKey(); - if ((error = key->Error())) { + if ((error = key->popError())) { *key = lastgood; break; } - long index = tmpkey->TestamentIndex(); - findOffset(tmpkey->Testament(), index, &start, &size, &buffnum); + long index = tmpkey->getTestamentIndex(); + findOffset(tmpkey->getTestament(), index, &start, &size, &buffnum); if ( - (((laststart != start) || (lastsize != size)) // we're a different entry + ( + ((laststart != start) || (lastsize != size)) // we're a different entry // && (start > 0) - && (size)) // and we actually have a size - ||(!skipConsecutiveLinks)) { // or we don't want to skip consecutive links + && (size) // and we actually have a size + ) + || !skipConsecutiveLinks + ) { // or we don't want to skip consecutive links steps += (steps < 0) ? 1 : -1; lastgood = *tmpkey; } @@ -193,16 +195,17 @@ void zText::increment(int steps) { error = (error) ? KEYERR_OUTOFBOUNDS : 0; } + bool zText::isLinked(const SWKey *k1, const SWKey *k2) const { long start1, start2; unsigned short size1, size2; unsigned long buffnum1, buffnum2; VerseKey *vk1 = &getVerseKey(k1); VerseKey *vk2 = &getVerseKey(k2); - if (vk1->Testament() != vk2->Testament()) return false; + if (vk1->getTestament() != vk2->getTestament()) return false; - findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1, &buffnum1); - findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2, &buffnum2); + findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1, &buffnum1); + findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2, &buffnum2); return start1 == start2 && buffnum1 == buffnum2; } @@ -212,7 +215,7 @@ bool zText::hasEntry(const SWKey *k) const { unsigned long buffnum; VerseKey *vk = &getVerseKey(k); - findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size, &buffnum); + findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size, &buffnum); return size; } diff --git a/src/utilfuns/Makefile.am b/src/utilfuns/Makefile.am index fcbdaeb..f934eeb 100644 --- a/src/utilfuns/Makefile.am +++ b/src/utilfuns/Makefile.am @@ -8,7 +8,6 @@ utilfunsdir = $(top_srcdir)/src/utilfuns libsword_la_SOURCES += $(utilfunsdir)/swobject.cpp libsword_la_SOURCES += $(utilfunsdir)/utilstr.cpp libsword_la_SOURCES += $(utilfunsdir)/utilxml.cpp -libsword_la_SOURCES += $(utilfunsdir)/swunicod.cpp libsword_la_SOURCES += $(utilfunsdir)/swversion.cpp libsword_la_SOURCES += $(utilfunsdir)/swbuf.cpp libsword_la_SOURCES += $(utilfunsdir)/ftpparse.c diff --git a/src/utilfuns/ftplib.c b/src/utilfuns/ftplib.c index b184a91..a211973 100644 --- a/src/utilfuns/ftplib.c +++ b/src/utilfuns/ftplib.c @@ -1,23 +1,23 @@ /***************************************************************************/ -/* ftplib.c - callable ftp access routines */ -/* Copyright (C) 1996-2000 Thomas Pfau, pfau@cnj.digex.net */ -/* 73 Catherine Street, South Bound Brook, NJ, 08880 */ -/* */ -/* This library is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU Library General Public */ -/* License as published by the Free Software Foundation; either */ -/* version 2 of the License, or (at your option) any later version. */ -/* */ -/* This library is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */ -/* Library General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU Library General Public */ -/* License along with this progam; if not, write to the */ -/* Free Software Foundation, Inc., 59 Temple Place - Suite 330, */ -/* Boston, MA 02111-1307, USA. */ -/* */ +/* ftplib.c - callable ftp access routines */ +/* Copyright (C) 1996-2000 Thomas Pfau, pfau@cnj.digex.net */ +/* 73 Catherine Street, South Bound Brook, NJ, 08880 */ +/* */ +/* This library is free software; you can redistribute it and/or */ +/* modify it under the terms of the GNU Library General Public */ +/* License as published by the Free Software Foundation; either */ +/* version 2 of the License, or (at your option) any later version. */ +/* */ +/* This library is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */ +/* Library General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU Library General Public */ +/* License along with this progam; if not, write to the */ +/* Free Software Foundation, Inc., 59 Temple Place - Suite 330, */ +/* Boston, MA 02111-1307, USA. */ +/* */ /***************************************************************************/ // changes made by Lorn Potter <llornkcor@handhelds.org> // @@ -126,15 +126,19 @@ struct NetBuf { int cmode; struct timeval idletime; FtpCallback idlecb; + FtpCallbackWriter writercb; void *idlearg; + void *writerarg; int xfered; int cbbytes; int xfered1; char response[256]; }; +#if 0 static char *version = "ftplib Release 3.1-1 9/16/00, copyright 1996-2000 Thomas Pfau"; +#endif GLOBALDEF int ftplib_debug = 0; @@ -569,8 +573,10 @@ GLOBALDEF int FtpConnect(const char *host, netbuf **nControl) ctrl->ctrl = NULL; ctrl->cmode = FTPLIB_DEFMODE; ctrl->idlecb = NULL; + ctrl->writercb = NULL; ctrl->idletime.tv_sec = ctrl->idletime.tv_usec = 0; ctrl->idlearg = NULL; + ctrl->writerarg = NULL; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = 0; @@ -607,6 +613,10 @@ GLOBALDEF int FtpOptions(int opt, long val, netbuf *nControl) nControl->idlecb = (FtpCallback) val; rv = 1; break; + case FTPLIB_CALLBACK_WRITER: + nControl->writercb = (FtpCallbackWriter) val; + rv = 1; + break; case FTPLIB_IDLETIME: v = (int) val; rv = 1; @@ -617,6 +627,10 @@ GLOBALDEF int FtpOptions(int opt, long val, netbuf *nControl) rv = 1; nControl->idlearg = (void *) val; break; + case FTPLIB_CALLBACK_WRITERARG: + rv = 1; + nControl->writerarg = (void *) val; + break; case FTPLIB_CALLBACKBYTES: rv = 1; nControl->cbbytes = (int) val; @@ -807,6 +821,7 @@ static int FtpOpenPort(netbuf *nControl, netbuf **nData, int mode, int dir) ctrl->dir = dir; ctrl->idletime = nControl->idletime; ctrl->idlearg = nControl->idlearg; + ctrl->writerarg = nControl->writerarg; ctrl->xfered = 0; ctrl->xfered1 = 0; ctrl->cbbytes = nControl->cbbytes; @@ -814,6 +829,7 @@ static int FtpOpenPort(netbuf *nControl, netbuf **nData, int mode, int dir) ctrl->idlecb = nControl->idlecb; else ctrl->idlecb = NULL; + ctrl->writercb = nControl->writercb; *nData = ctrl; return 1; } @@ -1203,6 +1219,7 @@ static int FtpXfer(const char *localfile, const char *path, FILE *local = NULL; netbuf *nData; int rv=1; + int writeResult = 0; if (localfile != NULL) { @@ -1237,13 +1254,15 @@ static int FtpXfer(const char *localfile, const char *path, } else { - while ((l = FtpRead(dbuf, FTPLIB_BUFSIZ, nData)) > 0) - if (fwrite(dbuf, 1, l, local) <= 0) + while ((l = FtpRead(dbuf, FTPLIB_BUFSIZ, nData)) > 0) { + writeResult = (nData->writercb) ? nData->writercb(nData, dbuf, l, nData->writerarg) : fwrite(dbuf, 1, l, local); + if (writeResult <= 0) { - perror("localfile write"); + perror("localstore write"); rv = 0; break; } + } } free(dbuf); fflush(local); diff --git a/src/utilfuns/roman.cpp b/src/utilfuns/roman.cpp index 4db9540..d436b19 100644 --- a/src/utilfuns/roman.cpp +++ b/src/utilfuns/roman.cpp @@ -1,7 +1,10 @@ -/* - * roman.c +/****************************************************************************** * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * roman.cpp - + * + * $Id: roman.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -21,8 +24,10 @@ #include <string.h> #include <roman.h> + SWORD_NAMESPACE_START + char isroman (const char *str, int maxchars) { char *ch = (char*)str; for (; *ch && (!maxchars || (ch-str) <= maxchars); ch++) @@ -82,4 +87,6 @@ int from_rom(const char* str) { return n; } + SWORD_NAMESPACE_END + diff --git a/src/utilfuns/swbuf.cpp b/src/utilfuns/swbuf.cpp index 53dd43a..9c4908b 100644 --- a/src/utilfuns/swbuf.cpp +++ b/src/utilfuns/swbuf.cpp @@ -1,23 +1,24 @@ /****************************************************************************** -* swbuf.cpp - code for SWBuf used as a transport and utility for data buffers -* -* $Id: swbuf.cpp 2198 2008-09-11 20:59:30Z scribe $ -* -* Copyright 2003 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * swbuf.cpp - used as a transport and utility for data buffers + * + * $Id: swbuf.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #include <swbuf.h> @@ -25,10 +26,11 @@ #include <stdarg.h> #include <stdio.h> + SWORD_NAMESPACE_START + char *SWBuf::nullStr = (char *)""; -char SWBuf::junkBuf[JUNKBUFSIZE]; /****************************************************************************** * SWBuf Constructor - Creates an empty SWBuf object or an SWBuf initialized @@ -81,6 +83,7 @@ SWBuf &SWBuf::setFormatted(const char *format, ...) { va_start(argptr, format); #ifdef NO_VSNPRINTF + static char junkBuf[JUNKBUFSIZE]; int len = vsprintf(junkBuf, format, argptr)+1; #else int len = vsnprintf(0, 0, format, argptr)+1; @@ -97,7 +100,7 @@ SWBuf &SWBuf::setFormatted(const char *format, ...) { * SWBuf::append - appends a value to the current value of this SWBuf * */ -void SWBuf::append(const char *str, long max) { +SWBuf &SWBuf::append(const char *str, long max) { // if (!str) //A null string was passed // return; if (max < 0) @@ -106,6 +109,7 @@ void SWBuf::append(const char *str, long max) { for (;((max)&&(*str));max--) *end++ = *str++; *end = 0; + return *this; } /****************************************************************************** @@ -124,11 +128,12 @@ void SWBuf::setSize(unsigned long len) { * WARNING: This function can only write at most * JUNKBUFSIZE to the string per call. */ -void SWBuf::appendFormatted(const char *format, ...) { +SWBuf &SWBuf::appendFormatted(const char *format, ...) { va_list argptr; va_start(argptr, format); #ifdef NO_VSNPRINTF + static char junkBuf[JUNKBUFSIZE]; int len = vsprintf(junkBuf, format, argptr)+1; #else int len = vsnprintf(0, 0, format, argptr)+1; @@ -138,6 +143,7 @@ void SWBuf::appendFormatted(const char *format, ...) { va_start(argptr, format); end += vsprintf(end, format, argptr); va_end(argptr); + return *this; } void SWBuf::insert(unsigned long pos, const char* str, unsigned long start, signed long max) { diff --git a/src/utilfuns/swobject.cpp b/src/utilfuns/swobject.cpp index 227911b..2316111 100644 --- a/src/utilfuns/swobject.cpp +++ b/src/utilfuns/swobject.cpp @@ -1,24 +1,25 @@ /****************************************************************************** -* swobject.cpp - code for SWObject used as lowest base class for many -* SWORD objects -* -* $Id: swobject.cpp 1785 2005-04-30 19:11:12Z scribe $ -* -* Copyright 2005 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * swobject.cpp - code for SWClass used as lowest base class for many + * SWORD objects + * + * $Id: swobject.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #include <swobject.h> @@ -29,8 +30,10 @@ #include <string.h> #endif + SWORD_NAMESPACE_START + bool SWClass::isAssignableFrom(const char *className) const { for (int i = 0; descends[i]; i++) { #ifndef __CYGWIN__ @@ -43,4 +46,6 @@ bool SWClass::isAssignableFrom(const char *className) const { return false; } + SWORD_NAMESPACE_END + diff --git a/src/utilfuns/swunicod.cpp b/src/utilfuns/swunicod.cpp deleted file mode 100644 index 4b338eb..0000000 --- a/src/utilfuns/swunicod.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/* - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#include "swunicod.h" -SWORD_NAMESPACE_START -unsigned char* UTF32to8 (unsigned long utf32, unsigned char * utf8) { - unsigned int i; - for (i = 0; i < 6; i++) utf8[i] = 0; - - if (utf32 < 0x80) { - utf8[0] = (char)utf32; - } - else if (utf32 < 0x800) { - i = utf32 & 0x3f; - utf8[1] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x1f; - utf8[0] = 0xc0 | i; - } - else if (utf32 < 0x10000) { - i = utf32 & 0x3f; - utf8[2] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x3f; - utf8[1] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x0f; - utf8[0] = 0xe0 | i; - } - else if (utf32 < 0x200000) { - i = utf32 & 0x3f; - utf8[3] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x3f; - utf8[2] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x3f; - utf8[1] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x07; - utf8[0] = 0xf0 | i; - } - else if (utf32 < 0x4000000) { - i = utf32 & 0x3f; - utf8[4] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x3f; - utf8[3] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x3f; - utf8[2] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x3f; - utf8[1] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x03; - utf8[0] = 0xf8 | i; - } - else if (utf32 < 0x80000000) { - i = utf32 & 0x3f; - utf8[5] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x3f; - utf8[4] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x3f; - utf8[3] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x3f; - utf8[2] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x3f; - utf8[1] = 0x80 | i; - utf32 >>= 6; - - i = utf32 & 0x01; - utf8[0] = 0xfc | i; - } - return utf8; -} - -unsigned long UTF8to32 (unsigned char * utf8) { - - unsigned char i = utf8[0]; - unsigned char count; - unsigned long utf32 = 0; - - for (count = 0; i & 0x80; count++) i <<= 1; - if (!count) { - return utf8[0]; - } - else if (count == 1) { - return 0xffff; - } - else { - count--; - utf32 = i >> count; - for (i = 1; i <= count; i++) { - if ((0xc0 & utf8[i]) != 0x80) { - return 0xffff; - } - utf32 <<= 6; - utf32 |= (utf8[i] & 0x3f); - } - } - return utf32; -} - -SWORD_NAMESPACE_END diff --git a/src/utilfuns/swversion.cpp b/src/utilfuns/swversion.cpp index fe112db..78a00ba 100644 --- a/src/utilfuns/swversion.cpp +++ b/src/utilfuns/swversion.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swversion.cpp - SWVersion: version number utility class + * + * $Id: swversion.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -15,16 +20,17 @@ * */ -#include <config.h> - #include <swversion.h> #include <stdio.h> #include <stdlib.h> #include <string.h> + SWORD_NAMESPACE_START -SWVersion SWVersion::currentVersion( VERSION ); + +SWVersion SWVersion::currentVersion( SWORD_VERSION_STR ); + /****************************************************************************** * SWVersion c-tor - Constructs a new SWVersion @@ -97,4 +103,6 @@ const char *SWVersion::getText() const { return buf; } + SWORD_NAMESPACE_END + diff --git a/src/utilfuns/url.cpp b/src/utilfuns/url.cpp index 549c283..a909a04 100644 --- a/src/utilfuns/url.cpp +++ b/src/utilfuns/url.cpp @@ -1,25 +1,25 @@ /****************************************************************************** -* url.cpp - code for an URL parser utility class -* -* $Id: url.cpp 2250 2009-02-14 05:48:58Z scribe $ -* -* Copyright 2003 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ + * + * url.cpp - code for an URL parser utility class + * + * $Id: url.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ -//Sword includes #include <url.h> #include <swlog.h> @@ -29,10 +29,12 @@ #include <stdio.h> #include <iostream> + SWORD_NAMESPACE_START + namespace { - typedef std::map< unsigned char, SWBuf > DataMap; + typedef std::map<unsigned char, SWBuf> DataMap; DataMap m; static class __init { public: @@ -52,10 +54,11 @@ namespace { } ___init; } + /** * Constructors/Destructors */ -URL::URL(const char* url) +URL::URL(const char *url) : url(""), protocol(""), hostname(""), @@ -67,27 +70,32 @@ URL::URL(const char* url) } } -const char* URL::getProtocol() const { + +const char *URL::getProtocol() const { return protocol.c_str(); } -const char* URL::getHostName () const { + +const char *URL::getHostName () const { return hostname.c_str(); } -const char* URL::getPath() const { + +const char *URL::getPath() const { return path.c_str(); } + const URL::ParameterMap &URL::getParameters() const { return parameterMap; } + /** * Returns the value of an URL parameter. For the URL "http://www.crosswire.org/index.jsp?page=test&user=nobody" the value of the parameter "page" would be "test". * If the parameter is not set an empty string is returned. */ -const char* URL::getParameterValue(const char* name) const { +const char *URL::getParameterValue(const char *name) const { static SWBuf emptyStr(""); ParameterMap::const_iterator it = parameterMap.find(name); @@ -106,22 +114,22 @@ const char* URL::getParameterValue(const char* name) const { * Parse the URL into the protocol, the hostname, the path and the paramters with their values * */ -void URL::parse () { +void URL::parse() { /* format example protocol://hostname/path/path/path.pl?param1=value1&param2=value2 - * we include the script name in the path, so the path would be /path/path/path.pl in this example - * & could also be & - */ + * we include the script name in the path, so the path would be /path/path/path.pl in this example + * & could also be & + */ + + //1. Init + const char *urlPtr = url.c_str(); - //1. Init - const char* urlPtr = url.c_str(); - - protocol = ""; - hostname = ""; - path = ""; - parameterMap.clear(); + protocol = ""; + hostname = ""; + path = ""; + parameterMap.clear(); // 2. Get the protocol, which is from the begining to the first :// - const char* end = strchr( urlPtr, ':' ); + const char *end = strchr( urlPtr, ':' ); if (end) { //protocol was found protocol.append(urlPtr, end-urlPtr); urlPtr = end + 1; @@ -174,6 +182,7 @@ void URL::parse () { SWBuf paramName; SWBuf paramValue; + if (checkAnchor) checkAnchor = false; /* end = strchr(urlPtr, '#'); if (!end) { @@ -188,7 +197,7 @@ void URL::parse () { paramValue = ""; //search for the equal sign to find the value part - const char* valueStart = strchr(end, '='); + const char *valueStart = strchr(end, '='); if (valueStart) { const char* valueEnd = strstr(valueStart, "&") ? strstr(valueStart, "&") : strstr(valueStart, "&"); //try to find a new paramter part @@ -234,6 +243,7 @@ const SWBuf URL::encode(const char *urlText) { return url; } + const SWBuf URL::decode(const char *encoded) { /*static*/ SWBuf text; text = encoded; @@ -274,4 +284,6 @@ const SWBuf URL::decode(const char *encoded) { return text; } + SWORD_NAMESPACE_END + diff --git a/src/utilfuns/utilstr.cpp b/src/utilfuns/utilstr.cpp index 67ffcd5..cabd455 100644 --- a/src/utilfuns/utilstr.cpp +++ b/src/utilfuns/utilstr.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * utilstr.cpp - String utility functions + * + * $Id: utilstr.cpp 2982 2013-09-15 13:33:03Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -26,42 +31,40 @@ SWORD_NAMESPACE_START -const unsigned char SW_toupper_array[256] = - { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, - 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, - 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, - 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, - 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, - 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, - 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, - 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, - 0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, - 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, - 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, - 0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, - 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, - 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, - 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, - 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, - 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, - 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, - 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, - 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, - 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, - 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, - 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, - 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, - 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, - 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, - 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xf7, - 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xff - }; - +const unsigned char SW_toupper_array[256] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, + 0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, + 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, + 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, + 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, + 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, + 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, + 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, + 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, + 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, + 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xf7, + 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xff +}; /****************************************************************************** @@ -243,6 +246,103 @@ __u32 getUniCharFromUTF8(const unsigned char **buf) { } +SWBuf getUTF8FromUniChar(__u32 uchar) { + SWBuf retVal("", 7); + unsigned int i; + + if (uchar < 0x80) { + retVal.append((unsigned char)uchar); + retVal.setSize(1); + } + else if (uchar < 0x800) { + retVal.setSize(2); + i = uchar & 0x3f; + retVal[1] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x1f; + retVal[0] = (unsigned char)(0xc0 | i); + } + else if (uchar < 0x10000) { + retVal.setSize(3); + i = uchar & 0x3f; + retVal[2] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + retVal[1] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x0f; + retVal[0] = (unsigned char)(0xe0 | i); + } + else if (uchar < 0x200000) { + retVal.setSize(4); + i = uchar & 0x3f; + retVal[3] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + retVal[2] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + retVal[1] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x07; + retVal[0] = (unsigned char)(0xf0 | i); + } + else if (uchar < 0x4000000) { + retVal.setSize(5); + i = uchar & 0x3f; + retVal[4] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + retVal[3] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + retVal[2] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + retVal[1] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x03; + retVal[0] = (unsigned char)(0xf8 | i); + } + else if (uchar < 0x80000000) { + retVal.setSize(6); + i = uchar & 0x3f; + retVal[5] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + retVal[4] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + retVal[3] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + retVal[2] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x3f; + retVal[1] = (unsigned char)(0x80 | i); + uchar >>= 6; + + i = uchar & 0x01; + retVal[0] = (unsigned char)(0xfc | i); + } + + return retVal; +} + SWBuf assureValidUTF8(const char *buf) { @@ -269,4 +369,45 @@ SWBuf assureValidUTF8(const char *buf) { return myCopy; } + +/**** + * This can be called to convert a UTF8 stream to an SWBuf which manages + * a wchar_t[] + * access buffer with (wchar_t *)SWBuf::getRawData(); + * + */ +SWBuf utf8ToWChar(const char *buf) { + + const char *q = 0; + SWBuf wcharBuf; + while (*buf) { + q = buf; + wchar_t wc = getUniCharFromUTF8((const unsigned char **)&buf); + if (!wc) { + // if my buffer was advanced but nothing was converted, I had invalid data + if (buf - q) { + // invalid bytes in UTF8 stream + wcharBuf.append((wchar_t)0x1a); // unicode replacement character + } + } + else wcharBuf.append(wc); + } + return wcharBuf; +} + + +/**** + * This can be called to convert a wchar_t[] to a UTF-8 SWBuf + * + */ +SWBuf wcharToUTF8(const wchar_t *buf) { + + SWBuf utf8Buf; + while (*buf) { + utf8Buf.append(getUTF8FromUniChar(*buf++)); + } + return utf8Buf; +} + + SWORD_NAMESPACE_END diff --git a/src/utilfuns/utilxml.cpp b/src/utilfuns/utilxml.cpp index d3af7e5..1537499 100644 --- a/src/utilfuns/utilxml.cpp +++ b/src/utilfuns/utilxml.cpp @@ -1,9 +1,11 @@ /****************************************************************************** - * utilxml.cpp - implementaion of utility classes to handle XML processing * - * $Id: utilxml.cpp 2378 2009-05-04 23:18:51Z scribe $ + * utilxml.cpp - Implementaion of utility classes to handle + * XML processing * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * $Id: utilxml.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,9 +25,10 @@ #include <ctype.h> #include <utilstr.h> + SWORD_NAMESPACE_START -const char *XMLTag::nullstr = ""; + void XMLTag::parse() const { int i; int start; @@ -121,6 +124,7 @@ XMLTag::XMLTag(const char *tagString) { setText(tagString); } + XMLTag::XMLTag(const XMLTag& t) : attributes(t.attributes) { parsed = t.parsed; empty = t.empty; @@ -137,6 +141,7 @@ XMLTag::XMLTag(const XMLTag& t) : attributes(t.attributes) { } } + void XMLTag::setText(const char *tagString) { parsed = false; empty = false; @@ -173,6 +178,7 @@ void XMLTag::setText(const char *tagString) { } } + XMLTag::~XMLTag() { if (buf) delete [] buf; @@ -180,6 +186,7 @@ XMLTag::~XMLTag() { delete [] name; } + const StringList XMLTag::getAttributeNames() const { StringList retVal; @@ -276,6 +283,7 @@ const char *XMLTag::setAttribute(const char *attribName, const char *attribValue return attribValue; } + const char *XMLTag::toString() const { SWBuf tag = "<"; if (!parsed) @@ -318,4 +326,6 @@ bool XMLTag::isEndTag(const char *eID) const { return endTag; } + SWORD_NAMESPACE_END + diff --git a/src/utilfuns/zlib/untgz.c b/src/utilfuns/zlib/untgz.c index 2919656..a7b7164 100644 --- a/src/utilfuns/zlib/untgz.c +++ b/src/utilfuns/zlib/untgz.c @@ -12,7 +12,10 @@ #include <errno.h> #include <fcntl.h> #ifdef unix -# include <unistd.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/types.h> + #else # include <direct.h> # include <io.h> @@ -80,7 +83,6 @@ union tar_buffer { enum { TGZ_EXTRACT = 0, TGZ_LIST }; -static char *TGZfname OF((const char *)); void TGZnotfound OF((const char *)); int getoct OF((char *, int)); @@ -105,23 +107,6 @@ static char *TGZprefix[] = { "\0", ".tgz", ".tar.gz", ".tar", NULL }; /* Return the real name of the TGZ archive */ /* or NULL if it does not exist. */ -static char *TGZfname OF((const char *fname)) -{ - static char buffer[1024]; - int origlen,i; - - strcpy(buffer,fname); - origlen = strlen(buffer); - - for (i=0; TGZprefix[i]; i++) - { - strcpy(buffer+origlen,TGZprefix[i]); - if (access(buffer,F_OK) == 0) - return buffer; - } - return NULL; -} - /* error message for the filename */ void TGZnotfound OF((const char *fname)) @@ -419,12 +404,12 @@ void help(int exitval) void error(const char *msg) { fprintf(stderr, "%s: %s\n", prog, msg); - exit(1); +// exit(1); // don't exit on error } int untargz(int fd, const char *dest) { - gzFile *f; + gzFile f; f = gzdopen(fd, "rb"); if (f == NULL) { diff --git a/sword.kdevprj b/sword.kdevprj index b2797ad..f2ae50a 100644 --- a/sword.kdevprj +++ b/sword.kdevprj @@ -50,7 +50,7 @@ install_location= type=HEADER [include/Makefile.am] -files=include/canon.h,include/cipherfil.h,include/defs.h,include/echomod.h,include/entriesblk.h,include/femain.h,include/filemgr.h,include/gbffootnotes.h,include/gbfheadings.h,include/gbfhtml.h,include/swfilter.h,include/gbfhtmlhref.h,include/gbfmorph.h,include/gbfplain.h,include/gbfrtf.h,include/gbfstrongs.h,include/gbfthml.h,include/Greek2Greek.h,include/GreekChars.h,include/hrefcom.h,include/latin1utf16.h,include/latin1utf8.h,include/listkey.h,include/localemgr.h,include/lzsscomprs.h,include/plainfootnotes.h,include/plainhtml.h,include/rawcom.h,include/rawfiles.h,include/rawld.h,include/rawld4.h,include/rawstr.h,include/rawstr4.h,include/rawtext.h,include/rawverse.h,include/regex.h,include/roman.h,include/rtfhtml.h,include/rwphtml.h,include/rwprtf.h,include/sapphire.h,include/scsuutf8.h,include/strkey.h,include/swbasicfilter.h,include/swbyteswap.h,include/swcipher.h,include/swcom.h,include/swcomprs.h,include/swconfig.h,include/swdisp.h,include/swdisprtf.h,include/swdisprtfchap.h,include/swencodingmgr.h,include/swkey.h,include/swld.h,include/swlocale.h,include/swlog.h,include/swmacs.h,include/swmarkupmgr.h,include/swmgr.h,include/swmodule.h,include/swobject.h,include/swtext.h,include/swunicod.h,include/swwinlog.h,include/tbdisp.h,include/thmlgbf.h,include/thmlhtml.h,include/thmlhtmlhref.h,include/thmlplain.h,include/thmlrtf.h,include/unicodertf.h,include/unixstr.h,include/untgz.h,include/utf16utf8.h,include/utf8cantillation.h,include/utf8greekaccents.h,include/utf8arabicpoints.h,include/utf8hebrewpoints.h,include/utf8html.h,include/utf8latin1.h,include/utf8transliterator.h,include/utf8utf16.h,include/utilconf.h,include/utilfuns.h,include/utilstr.h,include/versekey.h,include/zcom.h,include/zconf.h,include/zipcomprs.h,include/zlib.h,include/ztext.h,include/zverse.h,include/thmlfootnotes.h,include/thmlheadings.h,include/thmllemma.h,include/thmlmorph.h,include/thmlscripref.h,include/thmlstrongs.h,include/utf8cnormalizer.h,include/utf8arshaping.h,include/utf8bidireorder.h,include/utf8nfc.h,include/utf8nfkd.h,include/encfiltmgr.h,include/swversion.h,include/swfiltermgr.h,include/markupfiltmgr.h,include/rawgenbook.h,include/swgenbook.h,include/treekey.h,include/thmlvariants.h,include/treekeyidx.h,include/zld.h,include/zstr.h,include/swinputmeth.h,include/nullim.h,include/hebrewmcim.h,include/flatapi.h,include/cdsourcemgr.h,include/ftpparse.h,include/gbfosis.h,include/gbfredletterwords.h,include/greeklexattribs.h,include/installmgr.h,include/osismorph.h,include/osisstrongs.h,include/remotesourcemgr.h,include/multimapwdef.h,include/swcacher.h,include/swinstallmgr.h,include/swremotemgr.h,include/swsourcemgr.h,include/sysdata.h,include/thmlosis.h,include/swbuf.h,include/osisplain.h,include/osisrtf.h +files=include/canon.h,include/cipherfil.h,include/defs.h,include/echomod.h,include/entriesblk.h,include/femain.h,include/filemgr.h,include/gbffootnotes.h,include/gbfheadings.h,include/gbfhtml.h,include/swfilter.h,include/gbfhtmlhref.h,include/gbfmorph.h,include/gbfplain.h,include/gbfrtf.h,include/gbfstrongs.h,include/gbfthml.h,include/Greek2Greek.h,include/GreekChars.h,include/hrefcom.h,include/latin1utf16.h,include/latin1utf8.h,include/listkey.h,include/localemgr.h,include/lzsscomprs.h,include/plainfootnotes.h,include/plainhtml.h,include/rawcom.h,include/rawfiles.h,include/rawld.h,include/rawld4.h,include/rawstr.h,include/rawstr4.h,include/rawtext.h,include/rawverse.h,include/regex.h,include/roman.h,include/rtfhtml.h,include/rwphtml.h,include/rwprtf.h,include/sapphire.h,include/scsuutf8.h,include/strkey.h,include/swbasicfilter.h,include/swbyteswap.h,include/swcipher.h,include/swcom.h,include/swcomprs.h,include/swconfig.h,include/swdisp.h,include/swdisprtf.h,include/swdisprtfchap.h,include/swencodingmgr.h,include/swkey.h,include/swld.h,include/swlocale.h,include/swlog.h,include/swmacs.h,include/swmarkupmgr.h,include/swmgr.h,include/swmodule.h,include/swobject.h,include/swtext.h,include/swwinlog.h,include/tbdisp.h,include/thmlgbf.h,include/thmlhtml.h,include/thmlhtmlhref.h,include/thmlplain.h,include/thmlrtf.h,include/unicodertf.h,include/unixstr.h,include/untgz.h,include/utf16utf8.h,include/utf8cantillation.h,include/utf8greekaccents.h,include/utf8arabicpoints.h,include/utf8hebrewpoints.h,include/utf8html.h,include/utf8latin1.h,include/utf8transliterator.h,include/utf8utf16.h,include/utilconf.h,include/utilfuns.h,include/utilstr.h,include/versekey.h,include/zcom.h,include/zconf.h,include/zipcomprs.h,include/zlib.h,include/ztext.h,include/zverse.h,include/thmlfootnotes.h,include/thmlheadings.h,include/thmllemma.h,include/thmlmorph.h,include/thmlscripref.h,include/thmlstrongs.h,include/utf8cnormalizer.h,include/utf8arshaping.h,include/utf8bidireorder.h,include/utf8nfc.h,include/utf8nfkd.h,include/encfiltmgr.h,include/swversion.h,include/swfiltermgr.h,include/markupfiltmgr.h,include/rawgenbook.h,include/swgenbook.h,include/treekey.h,include/thmlvariants.h,include/treekeyidx.h,include/zld.h,include/zstr.h,include/swinputmeth.h,include/nullim.h,include/hebrewmcim.h,include/flatapi.h,include/cdsourcemgr.h,include/ftpparse.h,include/gbfosis.h,include/gbfredletterwords.h,include/greeklexattribs.h,include/installmgr.h,include/osismorph.h,include/osisstrongs.h,include/remotesourcemgr.h,include/multimapwdef.h,include/swcacher.h,include/swinstallmgr.h,include/swremotemgr.h,include/swsourcemgr.h,include/sysdata.h,include/thmlosis.h,include/swbuf.h,include/osisplain.h,include/osisrtf.h sub_dirs= type=normal @@ -576,12 +576,6 @@ install=false install_location= type=HEADER -[include/swunicod.h] -dist=true -install=false -install_location= -type=HEADER - [include/swversion.h] dist=true install=false @@ -1728,7 +1722,7 @@ install_location= type=SOURCE [src/utilfuns/Makefile.am] -files=src/utilfuns/Greek2Greek.cpp,src/utilfuns/regex.c,src/utilfuns/roman.c,src/utilfuns/sub.c,src/utilfuns/swunicod.cpp,src/utilfuns/unixstr.cpp,src/utilfuns/utilconf.cpp,src/utilfuns/utilstr.cpp,src/utilfuns/swversion.cpp,src/utilfuns/roman.cpp,src/utilfuns/ftpparse.c,src/utilfuns/swbuf.cpp,src/utilfuns/utilweb.cpp,src/utilfuns/utilxml.cpp +files=src/utilfuns/Greek2Greek.cpp,src/utilfuns/regex.c,src/utilfuns/roman.c,src/utilfuns/sub.c,src/utilfuns/unixstr.cpp,src/utilfuns/utilconf.cpp,src/utilfuns/utilstr.cpp,src/utilfuns/swversion.cpp,src/utilfuns/roman.cpp,src/utilfuns/ftpparse.c,src/utilfuns/swbuf.cpp,src/utilfuns/utilweb.cpp,src/utilfuns/utilxml.cpp sharedlib_LDFLAGS=-version-info 0:0:1 sharedlib_rootname=utilfuns sub_dirs=zlib @@ -1770,12 +1764,6 @@ install=false install_location= type=SOURCE -[src/utilfuns/swunicod.cpp] -dist=true -install=false -install_location= -type=SOURCE - [src/utilfuns/swversion.cpp] dist=true install=false diff --git a/sword.pc.in b/sword.pc.in index ab3d678..17c18f4 100644 --- a/sword.pc.in +++ b/sword.pc.in @@ -10,5 +10,5 @@ Version: @VERSION@ @SHAREDLIB_TRUE@Libs: -L${libdir} -lsword @SHAREDLIB_FALSE@Libs: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@ Libs.private: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@ -Cflags: -I${includedir}/sword +Cflags: -I${includedir}/sword diff --git a/test-driver b/test-driver new file mode 100755 index 0000000..32bf39e --- /dev/null +++ b/test-driver @@ -0,0 +1,127 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2012-06-27.10; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <<END +Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] + [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT +The '--test-name', '--log-file' and '--trs-file' options are mandatory. +END +} + +# TODO: better error handling in option parsing (in particular, ensure +# TODO: $log_file, $trs_file and $test_name are defined). +test_name= # Used for reporting. +log_file= # Where to save the output of the test script. +trs_file= # Where to save the metadata of the test run. +expect_failure=no +color_tests=no +enable_hard_errors=yes +while test $# -gt 0; do + case $1 in + --help) print_usage; exit $?;; + --version) echo "test-driver $scriptversion"; exit $?;; + --test-name) test_name=$2; shift;; + --log-file) log_file=$2; shift;; + --trs-file) trs_file=$2; shift;; + --color-tests) color_tests=$2; shift;; + --expect-failure) expect_failure=$2; shift;; + --enable-hard-errors) enable_hard_errors=$2; shift;; + --) shift; break;; + -*) usage_error "invalid option: '$1'";; + esac + shift +done + +if test $color_tests = yes; then + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + red='' # Red. + grn='' # Green. + lgn='' # Light green. + blu='' # Blue. + mgn='' # Magenta. + std='' # No color. +else + red= grn= lgn= blu= mgn= std= +fi + +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' +trap "st=129; $do_exit" 1 +trap "st=130; $do_exit" 2 +trap "st=141; $do_exit" 13 +trap "st=143; $do_exit" 15 + +# Test script is run here. +"$@" >$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1f7ff40..130af8a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -12,7 +12,10 @@ # more about how these tests work. # +MESSAGE(STATUS "\n-- CONFIGURING LIBRARY TESTS") + SET(test_PROGRAMS + bibliotest casttest ciphertest complzss diff --git a/tests/Makefile.am b/tests/Makefile.am index afdf311..ad09283 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,16 +1,18 @@ AUTOMAKE_OPTIONS = 1.6 -INCLUDES = -I $(top_srcdir)/include +AM_CPPFLAGS = -I $(top_srcdir)/include if USE_INTERNAL_REGEX -INCLUDES += -I$(top_srcdir)/include/internal/regex +AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex endif LDADD = $(top_builddir)/lib/libsword.la SUBDIRS = cppunit -noinst_PROGRAMS = utf8norm ciphertest keytest mgrtest parsekey versekeytest vtreekeytest versemgrtest listtest casttest \ -modtest compnone complzss localetest introtest indextest configtest keycast \ -romantest testblocks filtertest rawldidxtest lextest swaptest \ - swbuftest xmltest webiftest striptest +noinst_PROGRAMS = utf8norm ciphertest keytest mgrtest parsekey versekeytest \ + vtreekeytest versemgrtest listtest casttest modtest \ + compnone complzss localetest introtest indextest \ + configtest keycast romantest testblocks filtertest \ + rawldidxtest lextest swaptest swbuftest xmltest \ + webiftest striptest osistest bibliotest if HAVE_ICU ICUPROG = icutest translittest tlitmgrtest @@ -66,7 +68,8 @@ swbuftest_SOURCES = swbuftest.cpp webiftest_SOURCES = webiftest.cpp striptest_SOURCES = striptest.cpp xmltest_SOURCES = xmltest.cpp - +osistest_SOURCES = osistest.cpp +bibliotest_SOURCES = bibliotest.cpp EXTRA_DIST = include bcppmake/Makefile.am diff --git a/tests/Makefile.in b/tests/Makefile.in index ebace29..63fec25 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,17 +90,19 @@ noinst_PROGRAMS = utf8norm$(EXEEXT) ciphertest$(EXEEXT) \ testblocks$(EXEEXT) filtertest$(EXEEXT) rawldidxtest$(EXEEXT) \ lextest$(EXEEXT) swaptest$(EXEEXT) swbuftest$(EXEEXT) \ xmltest$(EXEEXT) webiftest$(EXEEXT) striptest$(EXEEXT) \ - $(am__EXEEXT_1) $(am__EXEEXT_2) -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/bcppmake/Makefile.am $(srcdir)/testsuite/Makefile.am \ - $(srcdir)/tmp/Makefile.am + osistest$(EXEEXT) bibliotest$(EXEEXT) $(am__EXEEXT_1) \ + $(am__EXEEXT_2) +DIST_COMMON = $(srcdir)/bcppmake/Makefile.am \ + $(srcdir)/testsuite/Makefile.am $(srcdir)/tmp/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ - $(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -67,6 +113,14 @@ CONFIG_CLEAN_VPATH_FILES = @HAVE_ICU_TRUE@ tlitmgrtest$(EXEEXT) @HAVE_LIBZ_TRUE@am__EXEEXT_2 = compzip$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) +am_bibliotest_OBJECTS = bibliotest.$(OBJEXT) +bibliotest_OBJECTS = $(am_bibliotest_OBJECTS) +bibliotest_LDADD = $(LDADD) +bibliotest_DEPENDENCIES = $(top_builddir)/lib/libsword.la +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am_casttest_OBJECTS = casttest.$(OBJEXT) casttest_OBJECTS = $(am_casttest_OBJECTS) casttest_LDADD = $(LDADD) @@ -137,6 +191,10 @@ am_modtest_OBJECTS = modtest.$(OBJEXT) modtest_OBJECTS = $(am_modtest_OBJECTS) modtest_LDADD = $(LDADD) modtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la +am_osistest_OBJECTS = osistest.$(OBJEXT) +osistest_OBJECTS = $(am_osistest_OBJECTS) +osistest_LDADD = $(LDADD) +osistest_DEPENDENCIES = $(top_builddir)/lib/libsword.la am_parsekey_OBJECTS = parsekey.$(OBJEXT) parsekey_OBJECTS = $(am_parsekey_OBJECTS) parsekey_LDADD = $(LDADD) @@ -199,59 +257,107 @@ am_xmltest_OBJECTS = xmltest.$(OBJEXT) xmltest_OBJECTS = $(am_xmltest_OBJECTS) xmltest_LDADD = $(LDADD) xmltest_DEPENDENCIES = $(top_builddir)/lib/libsword.la +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(casttest_SOURCES) $(ciphertest_SOURCES) \ - $(complzss_SOURCES) $(compnone_SOURCES) $(compzip_SOURCES) \ - $(configtest_SOURCES) $(filtertest_SOURCES) $(icutest_SOURCES) \ - $(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) \ - $(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) \ - $(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) \ - $(parsekey_SOURCES) $(rawldidxtest_SOURCES) \ - $(romantest_SOURCES) $(striptest_SOURCES) $(swaptest_SOURCES) \ - $(swbuftest_SOURCES) $(testblocks_SOURCES) \ - $(tlitmgrtest_SOURCES) $(translittest_SOURCES) \ - $(utf8norm_SOURCES) $(versekeytest_SOURCES) \ - $(versemgrtest_SOURCES) $(vtreekeytest_SOURCES) \ - $(webiftest_SOURCES) $(xmltest_SOURCES) -DIST_SOURCES = $(casttest_SOURCES) $(ciphertest_SOURCES) \ - $(complzss_SOURCES) $(compnone_SOURCES) \ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +SOURCES = $(bibliotest_SOURCES) $(casttest_SOURCES) \ + $(ciphertest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) \ + $(compzip_SOURCES) $(configtest_SOURCES) $(filtertest_SOURCES) \ + $(icutest_SOURCES) $(indextest_SOURCES) $(introtest_SOURCES) \ + $(keycast_SOURCES) $(keytest_SOURCES) $(lextest_SOURCES) \ + $(listtest_SOURCES) $(localetest_SOURCES) $(mgrtest_SOURCES) \ + $(modtest_SOURCES) $(osistest_SOURCES) $(parsekey_SOURCES) \ + $(rawldidxtest_SOURCES) $(romantest_SOURCES) \ + $(striptest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) \ + $(testblocks_SOURCES) $(tlitmgrtest_SOURCES) \ + $(translittest_SOURCES) $(utf8norm_SOURCES) \ + $(versekeytest_SOURCES) $(versemgrtest_SOURCES) \ + $(vtreekeytest_SOURCES) $(webiftest_SOURCES) \ + $(xmltest_SOURCES) +DIST_SOURCES = $(bibliotest_SOURCES) $(casttest_SOURCES) \ + $(ciphertest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) \ $(am__compzip_SOURCES_DIST) $(configtest_SOURCES) \ $(filtertest_SOURCES) $(am__icutest_SOURCES_DIST) \ $(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) \ $(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) \ $(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) \ - $(parsekey_SOURCES) $(rawldidxtest_SOURCES) \ - $(romantest_SOURCES) $(striptest_SOURCES) $(swaptest_SOURCES) \ - $(swbuftest_SOURCES) $(testblocks_SOURCES) \ - $(am__tlitmgrtest_SOURCES_DIST) \ + $(osistest_SOURCES) $(parsekey_SOURCES) \ + $(rawldidxtest_SOURCES) $(romantest_SOURCES) \ + $(striptest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) \ + $(testblocks_SOURCES) $(am__tlitmgrtest_SOURCES_DIST) \ $(am__translittest_SOURCES_DIST) $(utf8norm_SOURCES) \ $(versekeytest_SOURCES) $(versemgrtest_SOURCES) \ $(vtreekeytest_SOURCES) $(webiftest_SOURCES) \ $(xmltest_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -283,7 +389,9 @@ am__relativize = \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -293,6 +401,8 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@ +CLUCENE2_LIBS = @CLUCENE2_LIBS@ CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@ CLUCENE_LIBS = @CLUCENE_LIBS@ CPP = @CPP@ @@ -318,9 +428,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GENCCODE = @GENCCODE@ -GENCMN = @GENCMN@ -GENRB = @GENRB@ GREP = @GREP@ ICU_CONFIG = @ICU_CONFIG@ ICU_IOLIBS = @ICU_IOLIBS@ @@ -341,6 +448,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -353,20 +461,29 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGDATA = @PKGDATA@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@ +SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@ +SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@ +SWORD_VERSION_NANO = @SWORD_VERSION_NANO@ +SWORD_VERSION_NUM = @SWORD_VERSION_NUM@ +SWORD_VERSION_STR = @SWORD_VERSION_STR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -403,7 +520,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -430,7 +546,7 @@ with_icu = @with_icu@ with_icusword = @with_icusword@ with_zlib = @with_zlib@ AUTOMAKE_OPTIONS = 1.6 -INCLUDES = -I $(top_srcdir)/include $(am__append_1) +AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1) LDADD = $(top_builddir)/lib/libsword.la SUBDIRS = cppunit @HAVE_ICU_FALSE@ICUPROG = @@ -469,6 +585,8 @@ swbuftest_SOURCES = swbuftest.cpp webiftest_SOURCES = webiftest.cpp striptest_SOURCES = striptest.cpp xmltest_SOURCES = xmltest.cpp +osistest_SOURCES = osistest.cpp +bibliotest_SOURCES = bibliotest.cpp EXTRA_DIST = $(swbcppdir)/filtertest.bpf $(swbcppdir)/filtertest.bpr \ $(swbcppdir)/libsword.bpf $(swbcppdir)/libsword.bpr \ $(swbcppdir)/mgrtest.bpf $(swbcppdir)/mgrtest.bpr \ @@ -504,6 +622,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/bcppmake/Makefile.am $(srcdir)/testsuite/Makefile.am $(srcdir)/tmp/Makefile.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -522,102 +641,142 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -casttest$(EXEEXT): $(casttest_OBJECTS) $(casttest_DEPENDENCIES) + +bibliotest$(EXEEXT): $(bibliotest_OBJECTS) $(bibliotest_DEPENDENCIES) $(EXTRA_bibliotest_DEPENDENCIES) + @rm -f bibliotest$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(bibliotest_OBJECTS) $(bibliotest_LDADD) $(LIBS) + +casttest$(EXEEXT): $(casttest_OBJECTS) $(casttest_DEPENDENCIES) $(EXTRA_casttest_DEPENDENCIES) @rm -f casttest$(EXEEXT) - $(CXXLINK) $(casttest_OBJECTS) $(casttest_LDADD) $(LIBS) -ciphertest$(EXEEXT): $(ciphertest_OBJECTS) $(ciphertest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(casttest_OBJECTS) $(casttest_LDADD) $(LIBS) + +ciphertest$(EXEEXT): $(ciphertest_OBJECTS) $(ciphertest_DEPENDENCIES) $(EXTRA_ciphertest_DEPENDENCIES) @rm -f ciphertest$(EXEEXT) - $(CXXLINK) $(ciphertest_OBJECTS) $(ciphertest_LDADD) $(LIBS) -complzss$(EXEEXT): $(complzss_OBJECTS) $(complzss_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(ciphertest_OBJECTS) $(ciphertest_LDADD) $(LIBS) + +complzss$(EXEEXT): $(complzss_OBJECTS) $(complzss_DEPENDENCIES) $(EXTRA_complzss_DEPENDENCIES) @rm -f complzss$(EXEEXT) - $(CXXLINK) $(complzss_OBJECTS) $(complzss_LDADD) $(LIBS) -compnone$(EXEEXT): $(compnone_OBJECTS) $(compnone_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(complzss_OBJECTS) $(complzss_LDADD) $(LIBS) + +compnone$(EXEEXT): $(compnone_OBJECTS) $(compnone_DEPENDENCIES) $(EXTRA_compnone_DEPENDENCIES) @rm -f compnone$(EXEEXT) - $(CXXLINK) $(compnone_OBJECTS) $(compnone_LDADD) $(LIBS) -compzip$(EXEEXT): $(compzip_OBJECTS) $(compzip_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(compnone_OBJECTS) $(compnone_LDADD) $(LIBS) + +compzip$(EXEEXT): $(compzip_OBJECTS) $(compzip_DEPENDENCIES) $(EXTRA_compzip_DEPENDENCIES) @rm -f compzip$(EXEEXT) - $(CXXLINK) $(compzip_OBJECTS) $(compzip_LDADD) $(LIBS) -configtest$(EXEEXT): $(configtest_OBJECTS) $(configtest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(compzip_OBJECTS) $(compzip_LDADD) $(LIBS) + +configtest$(EXEEXT): $(configtest_OBJECTS) $(configtest_DEPENDENCIES) $(EXTRA_configtest_DEPENDENCIES) @rm -f configtest$(EXEEXT) - $(CXXLINK) $(configtest_OBJECTS) $(configtest_LDADD) $(LIBS) -filtertest$(EXEEXT): $(filtertest_OBJECTS) $(filtertest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(configtest_OBJECTS) $(configtest_LDADD) $(LIBS) + +filtertest$(EXEEXT): $(filtertest_OBJECTS) $(filtertest_DEPENDENCIES) $(EXTRA_filtertest_DEPENDENCIES) @rm -f filtertest$(EXEEXT) - $(CXXLINK) $(filtertest_OBJECTS) $(filtertest_LDADD) $(LIBS) -icutest$(EXEEXT): $(icutest_OBJECTS) $(icutest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(filtertest_OBJECTS) $(filtertest_LDADD) $(LIBS) + +icutest$(EXEEXT): $(icutest_OBJECTS) $(icutest_DEPENDENCIES) $(EXTRA_icutest_DEPENDENCIES) @rm -f icutest$(EXEEXT) - $(CXXLINK) $(icutest_OBJECTS) $(icutest_LDADD) $(LIBS) -indextest$(EXEEXT): $(indextest_OBJECTS) $(indextest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(icutest_OBJECTS) $(icutest_LDADD) $(LIBS) + +indextest$(EXEEXT): $(indextest_OBJECTS) $(indextest_DEPENDENCIES) $(EXTRA_indextest_DEPENDENCIES) @rm -f indextest$(EXEEXT) - $(CXXLINK) $(indextest_OBJECTS) $(indextest_LDADD) $(LIBS) -introtest$(EXEEXT): $(introtest_OBJECTS) $(introtest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(indextest_OBJECTS) $(indextest_LDADD) $(LIBS) + +introtest$(EXEEXT): $(introtest_OBJECTS) $(introtest_DEPENDENCIES) $(EXTRA_introtest_DEPENDENCIES) @rm -f introtest$(EXEEXT) - $(CXXLINK) $(introtest_OBJECTS) $(introtest_LDADD) $(LIBS) -keycast$(EXEEXT): $(keycast_OBJECTS) $(keycast_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(introtest_OBJECTS) $(introtest_LDADD) $(LIBS) + +keycast$(EXEEXT): $(keycast_OBJECTS) $(keycast_DEPENDENCIES) $(EXTRA_keycast_DEPENDENCIES) @rm -f keycast$(EXEEXT) - $(CXXLINK) $(keycast_OBJECTS) $(keycast_LDADD) $(LIBS) -keytest$(EXEEXT): $(keytest_OBJECTS) $(keytest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(keycast_OBJECTS) $(keycast_LDADD) $(LIBS) + +keytest$(EXEEXT): $(keytest_OBJECTS) $(keytest_DEPENDENCIES) $(EXTRA_keytest_DEPENDENCIES) @rm -f keytest$(EXEEXT) - $(CXXLINK) $(keytest_OBJECTS) $(keytest_LDADD) $(LIBS) -lextest$(EXEEXT): $(lextest_OBJECTS) $(lextest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(keytest_OBJECTS) $(keytest_LDADD) $(LIBS) + +lextest$(EXEEXT): $(lextest_OBJECTS) $(lextest_DEPENDENCIES) $(EXTRA_lextest_DEPENDENCIES) @rm -f lextest$(EXEEXT) - $(CXXLINK) $(lextest_OBJECTS) $(lextest_LDADD) $(LIBS) -listtest$(EXEEXT): $(listtest_OBJECTS) $(listtest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(lextest_OBJECTS) $(lextest_LDADD) $(LIBS) + +listtest$(EXEEXT): $(listtest_OBJECTS) $(listtest_DEPENDENCIES) $(EXTRA_listtest_DEPENDENCIES) @rm -f listtest$(EXEEXT) - $(CXXLINK) $(listtest_OBJECTS) $(listtest_LDADD) $(LIBS) -localetest$(EXEEXT): $(localetest_OBJECTS) $(localetest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(listtest_OBJECTS) $(listtest_LDADD) $(LIBS) + +localetest$(EXEEXT): $(localetest_OBJECTS) $(localetest_DEPENDENCIES) $(EXTRA_localetest_DEPENDENCIES) @rm -f localetest$(EXEEXT) - $(CXXLINK) $(localetest_OBJECTS) $(localetest_LDADD) $(LIBS) -mgrtest$(EXEEXT): $(mgrtest_OBJECTS) $(mgrtest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(localetest_OBJECTS) $(localetest_LDADD) $(LIBS) + +mgrtest$(EXEEXT): $(mgrtest_OBJECTS) $(mgrtest_DEPENDENCIES) $(EXTRA_mgrtest_DEPENDENCIES) @rm -f mgrtest$(EXEEXT) - $(CXXLINK) $(mgrtest_OBJECTS) $(mgrtest_LDADD) $(LIBS) -modtest$(EXEEXT): $(modtest_OBJECTS) $(modtest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(mgrtest_OBJECTS) $(mgrtest_LDADD) $(LIBS) + +modtest$(EXEEXT): $(modtest_OBJECTS) $(modtest_DEPENDENCIES) $(EXTRA_modtest_DEPENDENCIES) @rm -f modtest$(EXEEXT) - $(CXXLINK) $(modtest_OBJECTS) $(modtest_LDADD) $(LIBS) -parsekey$(EXEEXT): $(parsekey_OBJECTS) $(parsekey_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(modtest_OBJECTS) $(modtest_LDADD) $(LIBS) + +osistest$(EXEEXT): $(osistest_OBJECTS) $(osistest_DEPENDENCIES) $(EXTRA_osistest_DEPENDENCIES) + @rm -f osistest$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(osistest_OBJECTS) $(osistest_LDADD) $(LIBS) + +parsekey$(EXEEXT): $(parsekey_OBJECTS) $(parsekey_DEPENDENCIES) $(EXTRA_parsekey_DEPENDENCIES) @rm -f parsekey$(EXEEXT) - $(CXXLINK) $(parsekey_OBJECTS) $(parsekey_LDADD) $(LIBS) -rawldidxtest$(EXEEXT): $(rawldidxtest_OBJECTS) $(rawldidxtest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(parsekey_OBJECTS) $(parsekey_LDADD) $(LIBS) + +rawldidxtest$(EXEEXT): $(rawldidxtest_OBJECTS) $(rawldidxtest_DEPENDENCIES) $(EXTRA_rawldidxtest_DEPENDENCIES) @rm -f rawldidxtest$(EXEEXT) - $(CXXLINK) $(rawldidxtest_OBJECTS) $(rawldidxtest_LDADD) $(LIBS) -romantest$(EXEEXT): $(romantest_OBJECTS) $(romantest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(rawldidxtest_OBJECTS) $(rawldidxtest_LDADD) $(LIBS) + +romantest$(EXEEXT): $(romantest_OBJECTS) $(romantest_DEPENDENCIES) $(EXTRA_romantest_DEPENDENCIES) @rm -f romantest$(EXEEXT) - $(CXXLINK) $(romantest_OBJECTS) $(romantest_LDADD) $(LIBS) -striptest$(EXEEXT): $(striptest_OBJECTS) $(striptest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(romantest_OBJECTS) $(romantest_LDADD) $(LIBS) + +striptest$(EXEEXT): $(striptest_OBJECTS) $(striptest_DEPENDENCIES) $(EXTRA_striptest_DEPENDENCIES) @rm -f striptest$(EXEEXT) - $(CXXLINK) $(striptest_OBJECTS) $(striptest_LDADD) $(LIBS) -swaptest$(EXEEXT): $(swaptest_OBJECTS) $(swaptest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(striptest_OBJECTS) $(striptest_LDADD) $(LIBS) + +swaptest$(EXEEXT): $(swaptest_OBJECTS) $(swaptest_DEPENDENCIES) $(EXTRA_swaptest_DEPENDENCIES) @rm -f swaptest$(EXEEXT) - $(CXXLINK) $(swaptest_OBJECTS) $(swaptest_LDADD) $(LIBS) -swbuftest$(EXEEXT): $(swbuftest_OBJECTS) $(swbuftest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(swaptest_OBJECTS) $(swaptest_LDADD) $(LIBS) + +swbuftest$(EXEEXT): $(swbuftest_OBJECTS) $(swbuftest_DEPENDENCIES) $(EXTRA_swbuftest_DEPENDENCIES) @rm -f swbuftest$(EXEEXT) - $(CXXLINK) $(swbuftest_OBJECTS) $(swbuftest_LDADD) $(LIBS) -testblocks$(EXEEXT): $(testblocks_OBJECTS) $(testblocks_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(swbuftest_OBJECTS) $(swbuftest_LDADD) $(LIBS) + +testblocks$(EXEEXT): $(testblocks_OBJECTS) $(testblocks_DEPENDENCIES) $(EXTRA_testblocks_DEPENDENCIES) @rm -f testblocks$(EXEEXT) - $(CXXLINK) $(testblocks_OBJECTS) $(testblocks_LDADD) $(LIBS) -tlitmgrtest$(EXEEXT): $(tlitmgrtest_OBJECTS) $(tlitmgrtest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(testblocks_OBJECTS) $(testblocks_LDADD) $(LIBS) + +tlitmgrtest$(EXEEXT): $(tlitmgrtest_OBJECTS) $(tlitmgrtest_DEPENDENCIES) $(EXTRA_tlitmgrtest_DEPENDENCIES) @rm -f tlitmgrtest$(EXEEXT) - $(CXXLINK) $(tlitmgrtest_OBJECTS) $(tlitmgrtest_LDADD) $(LIBS) -translittest$(EXEEXT): $(translittest_OBJECTS) $(translittest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(tlitmgrtest_OBJECTS) $(tlitmgrtest_LDADD) $(LIBS) + +translittest$(EXEEXT): $(translittest_OBJECTS) $(translittest_DEPENDENCIES) $(EXTRA_translittest_DEPENDENCIES) @rm -f translittest$(EXEEXT) - $(CXXLINK) $(translittest_OBJECTS) $(translittest_LDADD) $(LIBS) -utf8norm$(EXEEXT): $(utf8norm_OBJECTS) $(utf8norm_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(translittest_OBJECTS) $(translittest_LDADD) $(LIBS) + +utf8norm$(EXEEXT): $(utf8norm_OBJECTS) $(utf8norm_DEPENDENCIES) $(EXTRA_utf8norm_DEPENDENCIES) @rm -f utf8norm$(EXEEXT) - $(CXXLINK) $(utf8norm_OBJECTS) $(utf8norm_LDADD) $(LIBS) -versekeytest$(EXEEXT): $(versekeytest_OBJECTS) $(versekeytest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(utf8norm_OBJECTS) $(utf8norm_LDADD) $(LIBS) + +versekeytest$(EXEEXT): $(versekeytest_OBJECTS) $(versekeytest_DEPENDENCIES) $(EXTRA_versekeytest_DEPENDENCIES) @rm -f versekeytest$(EXEEXT) - $(CXXLINK) $(versekeytest_OBJECTS) $(versekeytest_LDADD) $(LIBS) -versemgrtest$(EXEEXT): $(versemgrtest_OBJECTS) $(versemgrtest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(versekeytest_OBJECTS) $(versekeytest_LDADD) $(LIBS) + +versemgrtest$(EXEEXT): $(versemgrtest_OBJECTS) $(versemgrtest_DEPENDENCIES) $(EXTRA_versemgrtest_DEPENDENCIES) @rm -f versemgrtest$(EXEEXT) - $(CXXLINK) $(versemgrtest_OBJECTS) $(versemgrtest_LDADD) $(LIBS) -vtreekeytest$(EXEEXT): $(vtreekeytest_OBJECTS) $(vtreekeytest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(versemgrtest_OBJECTS) $(versemgrtest_LDADD) $(LIBS) + +vtreekeytest$(EXEEXT): $(vtreekeytest_OBJECTS) $(vtreekeytest_DEPENDENCIES) $(EXTRA_vtreekeytest_DEPENDENCIES) @rm -f vtreekeytest$(EXEEXT) - $(CXXLINK) $(vtreekeytest_OBJECTS) $(vtreekeytest_LDADD) $(LIBS) -webiftest$(EXEEXT): $(webiftest_OBJECTS) $(webiftest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(vtreekeytest_OBJECTS) $(vtreekeytest_LDADD) $(LIBS) + +webiftest$(EXEEXT): $(webiftest_OBJECTS) $(webiftest_DEPENDENCIES) $(EXTRA_webiftest_DEPENDENCIES) @rm -f webiftest$(EXEEXT) - $(CXXLINK) $(webiftest_OBJECTS) $(webiftest_LDADD) $(LIBS) -xmltest$(EXEEXT): $(xmltest_OBJECTS) $(xmltest_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(webiftest_OBJECTS) $(webiftest_LDADD) $(LIBS) + +xmltest$(EXEEXT): $(xmltest_OBJECTS) $(xmltest_DEPENDENCIES) $(EXTRA_xmltest_DEPENDENCIES) @rm -f xmltest$(EXEEXT) - $(CXXLINK) $(xmltest_OBJECTS) $(xmltest_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(xmltest_OBJECTS) $(xmltest_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -625,6 +784,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibliotest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/casttest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ciphertest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complzss.Po@am__quote@ @@ -642,6 +802,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localetest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mgrtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modtest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osistest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsekey.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawldidxtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/romantest.Po@am__quote@ @@ -659,25 +820,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltest.Po@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -686,22 +847,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -716,57 +880,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -782,12 +901,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -799,15 +913,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -816,6 +926,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -852,13 +977,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -893,10 +1015,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -979,12 +1106,11 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstPROGRAMS ctags ctags-recursive distclean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -994,8 +1120,8 @@ uninstall-am: install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/bibliotest.cpp b/tests/bibliotest.cpp new file mode 100644 index 0000000..821ee87 --- /dev/null +++ b/tests/bibliotest.cpp @@ -0,0 +1,43 @@ +/****************************************************************************** + * + * bibliotest.cpp - + * + * $Id: bibliotest.cpp 2940 2013-08-03 06:53:35Z chrislit $ + * + * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include <swmgr.h> +#include <swtext.h> +#include <versekey.h> +#include <iostream> +#ifndef NO_SWORD_NAMESPACE +using namespace sword; +#endif + +int main(int argc, char **argv) { + SWMgr mymgr; + ModMap::iterator it; + if ( argc > 1 ) { + SWModule *module = mymgr.Modules[argv[1]]; + std::cout << module->getBibliography() << "\n"; + return 0; + } + else { + std::cout << "Usage: bibliography <ModuleName>"<< "\n"; + return 1; + } +} diff --git a/tests/casttest.cpp b/tests/casttest.cpp index ceec51e..37388e9 100644 --- a/tests/casttest.cpp +++ b/tests/casttest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * casttest.cpp - + * + * $Id: casttest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/ciphertest.cpp b/tests/ciphertest.cpp index f34f994..5c5936a 100644 --- a/tests/ciphertest.cpp +++ b/tests/ciphertest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * ciphertest.cpp - + * + * $Id: ciphertest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,7 +35,7 @@ int main(int argc, char **argv) { } - int encipher = atoi(argv[2]); + long encipher = atoi(argv[2]); SWFilter *filter = new CipherFilter(argv[1]); diff --git a/tests/complzss.cpp b/tests/complzss.cpp index 4bf9dd5..923354b 100644 --- a/tests/complzss.cpp +++ b/tests/complzss.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * complzss.cpp - + * + * $Id: complzss.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/compnone.cpp b/tests/compnone.cpp index 452b191..b8e982d 100644 --- a/tests/compnone.cpp +++ b/tests/compnone.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * compnone.cpp - + * + * $Id: compnone.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/compzip.cpp b/tests/compzip.cpp index 58900bf..7dd0cf2 100644 --- a/tests/compzip.cpp +++ b/tests/compzip.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * compzip.cpp - + * + * $Id: compzip.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/configtest.cpp b/tests/configtest.cpp index 4e68d93..d196f07 100644 --- a/tests/configtest.cpp +++ b/tests/configtest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * configtest.cpp - + * + * $Id: configtest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/cppunit/Makefile.in b/tests/cppunit/Makefile.in index 737ba61..e6d5aa9 100644 --- a/tests/cppunit/Makefile.in +++ b/tests/cppunit/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,13 +81,14 @@ target_triplet = @target@ @HAVE_CPPUNIT_TRUE@TESTS = LibSword$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests/cppunit -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ - $(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -58,32 +103,283 @@ am_LibSword_OBJECTS = LibSword-main.$(OBJEXT) \ LibSword_OBJECTS = $(am_LibSword_OBJECTS) LibSword_LDADD = $(LDADD) LibSword_DEPENDENCIES = $(top_builddir)/lib/libsword.la -LibSword_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LibSword_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(LibSword_CXXFLAGS) \ $(CXXFLAGS) $(LibSword_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(LibSword_SOURCES) DIST_SOURCES = $(LibSword_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -93,6 +389,8 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@ +CLUCENE2_LIBS = @CLUCENE2_LIBS@ CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@ CLUCENE_LIBS = @CLUCENE_LIBS@ CPP = @CPP@ @@ -118,9 +416,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GENCCODE = @GENCCODE@ -GENCMN = @GENCMN@ -GENRB = @GENRB@ GREP = @GREP@ ICU_CONFIG = @ICU_CONFIG@ ICU_IOLIBS = @ICU_IOLIBS@ @@ -141,6 +436,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -153,20 +449,29 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGDATA = @PKGDATA@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@ +SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@ +SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@ +SWORD_VERSION_NANO = @SWORD_VERSION_NANO@ +SWORD_VERSION_NUM = @SWORD_VERSION_NUM@ +SWORD_VERSION_STR = @SWORD_VERSION_STR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -203,7 +508,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -237,7 +541,7 @@ swcppunitpdir = $(top_srcdir)/tests/cppunit all: all-am .SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj +.SUFFIXES: .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -277,9 +581,10 @@ clean-checkPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -LibSword$(EXEEXT): $(LibSword_OBJECTS) $(LibSword_DEPENDENCIES) + +LibSword$(EXEEXT): $(LibSword_OBJECTS) $(LibSword_DEPENDENCIES) $(EXTRA_LibSword_DEPENDENCIES) @rm -f LibSword$(EXEEXT) - $(LibSword_LINK) $(LibSword_OBJECTS) $(LibSword_LDADD) $(LIBS) + $(AM_V_CXXLD)$(LibSword_LINK) $(LibSword_OBJECTS) $(LibSword_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -294,95 +599,95 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibSword-versekey_test.Po@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< LibSword-main.o: main.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-main.o -MD -MP -MF $(DEPDIR)/LibSword-main.Tpo -c -o LibSword-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/LibSword-main.Tpo $(DEPDIR)/LibSword-main.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='LibSword-main.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-main.o -MD -MP -MF $(DEPDIR)/LibSword-main.Tpo -c -o LibSword-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-main.Tpo $(DEPDIR)/LibSword-main.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='LibSword-main.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp LibSword-main.obj: main.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-main.obj -MD -MP -MF $(DEPDIR)/LibSword-main.Tpo -c -o LibSword-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/LibSword-main.Tpo $(DEPDIR)/LibSword-main.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cpp' object='LibSword-main.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-main.obj -MD -MP -MF $(DEPDIR)/LibSword-main.Tpo -c -o LibSword-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-main.Tpo $(DEPDIR)/LibSword-main.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cpp' object='LibSword-main.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi` LibSword-stringmgr_test.o: stringmgr_test.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-stringmgr_test.o -MD -MP -MF $(DEPDIR)/LibSword-stringmgr_test.Tpo -c -o LibSword-stringmgr_test.o `test -f 'stringmgr_test.cpp' || echo '$(srcdir)/'`stringmgr_test.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/LibSword-stringmgr_test.Tpo $(DEPDIR)/LibSword-stringmgr_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='stringmgr_test.cpp' object='LibSword-stringmgr_test.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-stringmgr_test.o -MD -MP -MF $(DEPDIR)/LibSword-stringmgr_test.Tpo -c -o LibSword-stringmgr_test.o `test -f 'stringmgr_test.cpp' || echo '$(srcdir)/'`stringmgr_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-stringmgr_test.Tpo $(DEPDIR)/LibSword-stringmgr_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='stringmgr_test.cpp' object='LibSword-stringmgr_test.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-stringmgr_test.o `test -f 'stringmgr_test.cpp' || echo '$(srcdir)/'`stringmgr_test.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-stringmgr_test.o `test -f 'stringmgr_test.cpp' || echo '$(srcdir)/'`stringmgr_test.cpp LibSword-stringmgr_test.obj: stringmgr_test.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-stringmgr_test.obj -MD -MP -MF $(DEPDIR)/LibSword-stringmgr_test.Tpo -c -o LibSword-stringmgr_test.obj `if test -f 'stringmgr_test.cpp'; then $(CYGPATH_W) 'stringmgr_test.cpp'; else $(CYGPATH_W) '$(srcdir)/stringmgr_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/LibSword-stringmgr_test.Tpo $(DEPDIR)/LibSword-stringmgr_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='stringmgr_test.cpp' object='LibSword-stringmgr_test.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-stringmgr_test.obj -MD -MP -MF $(DEPDIR)/LibSword-stringmgr_test.Tpo -c -o LibSword-stringmgr_test.obj `if test -f 'stringmgr_test.cpp'; then $(CYGPATH_W) 'stringmgr_test.cpp'; else $(CYGPATH_W) '$(srcdir)/stringmgr_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-stringmgr_test.Tpo $(DEPDIR)/LibSword-stringmgr_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='stringmgr_test.cpp' object='LibSword-stringmgr_test.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-stringmgr_test.obj `if test -f 'stringmgr_test.cpp'; then $(CYGPATH_W) 'stringmgr_test.cpp'; else $(CYGPATH_W) '$(srcdir)/stringmgr_test.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-stringmgr_test.obj `if test -f 'stringmgr_test.cpp'; then $(CYGPATH_W) 'stringmgr_test.cpp'; else $(CYGPATH_W) '$(srcdir)/stringmgr_test.cpp'; fi` LibSword-swbuf_test.o: swbuf_test.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-swbuf_test.o -MD -MP -MF $(DEPDIR)/LibSword-swbuf_test.Tpo -c -o LibSword-swbuf_test.o `test -f 'swbuf_test.cpp' || echo '$(srcdir)/'`swbuf_test.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/LibSword-swbuf_test.Tpo $(DEPDIR)/LibSword-swbuf_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='swbuf_test.cpp' object='LibSword-swbuf_test.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-swbuf_test.o -MD -MP -MF $(DEPDIR)/LibSword-swbuf_test.Tpo -c -o LibSword-swbuf_test.o `test -f 'swbuf_test.cpp' || echo '$(srcdir)/'`swbuf_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-swbuf_test.Tpo $(DEPDIR)/LibSword-swbuf_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='swbuf_test.cpp' object='LibSword-swbuf_test.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-swbuf_test.o `test -f 'swbuf_test.cpp' || echo '$(srcdir)/'`swbuf_test.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-swbuf_test.o `test -f 'swbuf_test.cpp' || echo '$(srcdir)/'`swbuf_test.cpp LibSword-swbuf_test.obj: swbuf_test.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-swbuf_test.obj -MD -MP -MF $(DEPDIR)/LibSword-swbuf_test.Tpo -c -o LibSword-swbuf_test.obj `if test -f 'swbuf_test.cpp'; then $(CYGPATH_W) 'swbuf_test.cpp'; else $(CYGPATH_W) '$(srcdir)/swbuf_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/LibSword-swbuf_test.Tpo $(DEPDIR)/LibSword-swbuf_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='swbuf_test.cpp' object='LibSword-swbuf_test.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-swbuf_test.obj -MD -MP -MF $(DEPDIR)/LibSword-swbuf_test.Tpo -c -o LibSword-swbuf_test.obj `if test -f 'swbuf_test.cpp'; then $(CYGPATH_W) 'swbuf_test.cpp'; else $(CYGPATH_W) '$(srcdir)/swbuf_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-swbuf_test.Tpo $(DEPDIR)/LibSword-swbuf_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='swbuf_test.cpp' object='LibSword-swbuf_test.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-swbuf_test.obj `if test -f 'swbuf_test.cpp'; then $(CYGPATH_W) 'swbuf_test.cpp'; else $(CYGPATH_W) '$(srcdir)/swbuf_test.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-swbuf_test.obj `if test -f 'swbuf_test.cpp'; then $(CYGPATH_W) 'swbuf_test.cpp'; else $(CYGPATH_W) '$(srcdir)/swbuf_test.cpp'; fi` LibSword-url_test.o: url_test.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-url_test.o -MD -MP -MF $(DEPDIR)/LibSword-url_test.Tpo -c -o LibSword-url_test.o `test -f 'url_test.cpp' || echo '$(srcdir)/'`url_test.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/LibSword-url_test.Tpo $(DEPDIR)/LibSword-url_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='url_test.cpp' object='LibSword-url_test.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-url_test.o -MD -MP -MF $(DEPDIR)/LibSword-url_test.Tpo -c -o LibSword-url_test.o `test -f 'url_test.cpp' || echo '$(srcdir)/'`url_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-url_test.Tpo $(DEPDIR)/LibSword-url_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='url_test.cpp' object='LibSword-url_test.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-url_test.o `test -f 'url_test.cpp' || echo '$(srcdir)/'`url_test.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-url_test.o `test -f 'url_test.cpp' || echo '$(srcdir)/'`url_test.cpp LibSword-url_test.obj: url_test.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-url_test.obj -MD -MP -MF $(DEPDIR)/LibSword-url_test.Tpo -c -o LibSword-url_test.obj `if test -f 'url_test.cpp'; then $(CYGPATH_W) 'url_test.cpp'; else $(CYGPATH_W) '$(srcdir)/url_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/LibSword-url_test.Tpo $(DEPDIR)/LibSword-url_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='url_test.cpp' object='LibSword-url_test.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-url_test.obj -MD -MP -MF $(DEPDIR)/LibSword-url_test.Tpo -c -o LibSword-url_test.obj `if test -f 'url_test.cpp'; then $(CYGPATH_W) 'url_test.cpp'; else $(CYGPATH_W) '$(srcdir)/url_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-url_test.Tpo $(DEPDIR)/LibSword-url_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='url_test.cpp' object='LibSword-url_test.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-url_test.obj `if test -f 'url_test.cpp'; then $(CYGPATH_W) 'url_test.cpp'; else $(CYGPATH_W) '$(srcdir)/url_test.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-url_test.obj `if test -f 'url_test.cpp'; then $(CYGPATH_W) 'url_test.cpp'; else $(CYGPATH_W) '$(srcdir)/url_test.cpp'; fi` LibSword-versekey_test.o: versekey_test.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-versekey_test.o -MD -MP -MF $(DEPDIR)/LibSword-versekey_test.Tpo -c -o LibSword-versekey_test.o `test -f 'versekey_test.cpp' || echo '$(srcdir)/'`versekey_test.cpp -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/LibSword-versekey_test.Tpo $(DEPDIR)/LibSword-versekey_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='versekey_test.cpp' object='LibSword-versekey_test.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-versekey_test.o -MD -MP -MF $(DEPDIR)/LibSword-versekey_test.Tpo -c -o LibSword-versekey_test.o `test -f 'versekey_test.cpp' || echo '$(srcdir)/'`versekey_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-versekey_test.Tpo $(DEPDIR)/LibSword-versekey_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='versekey_test.cpp' object='LibSword-versekey_test.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-versekey_test.o `test -f 'versekey_test.cpp' || echo '$(srcdir)/'`versekey_test.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-versekey_test.o `test -f 'versekey_test.cpp' || echo '$(srcdir)/'`versekey_test.cpp LibSword-versekey_test.obj: versekey_test.cpp -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-versekey_test.obj -MD -MP -MF $(DEPDIR)/LibSword-versekey_test.Tpo -c -o LibSword-versekey_test.obj `if test -f 'versekey_test.cpp'; then $(CYGPATH_W) 'versekey_test.cpp'; else $(CYGPATH_W) '$(srcdir)/versekey_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/LibSword-versekey_test.Tpo $(DEPDIR)/LibSword-versekey_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='versekey_test.cpp' object='LibSword-versekey_test.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-versekey_test.obj -MD -MP -MF $(DEPDIR)/LibSword-versekey_test.Tpo -c -o LibSword-versekey_test.obj `if test -f 'versekey_test.cpp'; then $(CYGPATH_W) 'versekey_test.cpp'; else $(CYGPATH_W) '$(srcdir)/versekey_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-versekey_test.Tpo $(DEPDIR)/LibSword-versekey_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='versekey_test.cpp' object='LibSword-versekey_test.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-versekey_test.obj `if test -f 'versekey_test.cpp'; then $(CYGPATH_W) 'versekey_test.cpp'; else $(CYGPATH_W) '$(srcdir)/versekey_test.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-versekey_test.obj `if test -f 'versekey_test.cpp'; then $(CYGPATH_W) 'versekey_test.cpp'; else $(CYGPATH_W) '$(srcdir)/versekey_test.cpp'; fi` mostlyclean-libtool: -rm -f *.lo @@ -390,26 +695,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -421,15 +715,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -438,101 +728,187 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +LibSword.log: LibSword$(EXEEXT) + @p='LibSword$(EXEEXT)'; \ + b='LibSword'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -580,11 +956,19 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -668,9 +1052,9 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -680,7 +1064,7 @@ uninstall-am: installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am #all: check diff --git a/tests/cppunit/main.cpp b/tests/cppunit/main.cpp index e528619..9c740d5 100644 --- a/tests/cppunit/main.cpp +++ b/tests/cppunit/main.cpp @@ -1,10 +1,10 @@ /****************************************************************************** * - * LibSword tests + * main.cpp - LibSword tests * - * $Id: main.cpp 2327 2009-04-22 11:42:33Z scribe $ + * $Id: main.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/cppunit/stringmgr_test.cpp b/tests/cppunit/stringmgr_test.cpp index 652534c..3383b52 100644 --- a/tests/cppunit/stringmgr_test.cpp +++ b/tests/cppunit/stringmgr_test.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * stringmgr_test.cpp - + * + * $Id: stringmgr_test.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/cppunit/swbuf_test.cpp b/tests/cppunit/swbuf_test.cpp index d49fa61..9e6df3d 100644 --- a/tests/cppunit/swbuf_test.cpp +++ b/tests/cppunit/swbuf_test.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swbuf_test.cpp - + * + * $Id: swbuf_test.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/cppunit/url_test.cpp b/tests/cppunit/url_test.cpp index 093dad2..18cf6a8 100644 --- a/tests/cppunit/url_test.cpp +++ b/tests/cppunit/url_test.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * url_test.cpp - + * + * $Id: url_test.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/cppunit/versekey_test.cpp b/tests/cppunit/versekey_test.cpp index 63b6fd2..1c204b7 100644 --- a/tests/cppunit/versekey_test.cpp +++ b/tests/cppunit/versekey_test.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * versekey_test.cpp - + * + * $Id: versekey_test.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/filtertest.cpp b/tests/filtertest.cpp index 8aa750c..c6cfd4e 100644 --- a/tests/filtertest.cpp +++ b/tests/filtertest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * filtertest.cpp - + * + * $Id: filtertest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -20,6 +25,7 @@ #include <filemgr.h> #include <papyriplain.h> #include <utf8utf16.h> +#include <rtfhtml.h> #include <sysdata.h> //#include <swmgr.h> #ifndef NO_SWORD_NAMESPACE @@ -29,12 +35,13 @@ using namespace std; int main(int argc, char **argv) { - UTF8UTF16 filter; +// UTF8UTF16 filter; + RTFHTML filter; // PapyriPlain filter; // FileDesc *fd = (argc > 1) ? FileMgr::getSystemFileMgr()->open(argv[1], FileMgr::RDONLY) : 0; - SWBuf lineBuffer = "This is t<e>xt which has papy-\nri markings in it.\n L[et's be] sure it gets--\n cleaned up well for s(earching)"; + SWBuf lineBuffer = "T\\u12345?his is t<e>xt which has papy-\nri markings in it.\n L[et's be] sure it gets--\n cleaned up well for s(earching)"; if (argc > 1 && !strcmp(argv[1], "-v")) { std::cout << "Original:\n\n"; @@ -52,23 +59,24 @@ int main(int argc, char **argv) { fd = FileMgr::getSystemFileMgr()->open(argv[1], FileMgr::RDONLY); } - cout << "\xff\xfe"; // UTF16LE file signature +// cout << "\xff\xfe"; // UTF16LE file signature while (!fd || FileMgr::getLine(fd, lineBuffer)) { lineBuffer += "\n"; filter.processText(lineBuffer); -/* Simply way to output byte stream +// Simply way to output byte stream for (unsigned int i = 0; i < lineBuffer.size(); ++i) { std::cout << lineBuffer[i]; } -*/ +/* // Example showing safe to cast to u16 stream unsigned int size = lineBuffer.size() / 2; __u16 *wcharBuf = (__u16 *)lineBuffer.getRawData(); for (unsigned int i = 0; i < size; ++i) { std::wcout << (wchar_t)wcharBuf[i]; // must cast for correct output and because wchar_t is different size on linux we couldn't declare out wcharBuf a wchar_t * } +*/ if (!fd) break; } diff --git a/tests/icutest.cpp b/tests/icutest.cpp index 3f525b7..e1f6038 100644 --- a/tests/icutest.cpp +++ b/tests/icutest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * icutest.cpp - + * + * $Id: icutest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/indextest.cpp b/tests/indextest.cpp index 4f44f95..6d0a670 100644 --- a/tests/indextest.cpp +++ b/tests/indextest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * indextest.cpp - + * + * $Id: indextest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,10 +35,10 @@ int main(int argc, char **argv) { if (bbe) { VerseKey vk; - vk.Persist(1); + vk.setPersist(true); bbe->setKey(vk); - for (; !bbe->Error(); (*bbe)++ ) { - std::cout << vk.Index() << std::endl; + for (; !bbe->popError(); (*bbe)++ ) { + std::cout << vk.getIndex() << std::endl; } } return 0; diff --git a/tests/installmgrtest.cpp b/tests/installmgrtest.cpp index 4d3ce96..aa3acfd 100644 --- a/tests/installmgrtest.cpp +++ b/tests/installmgrtest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * installmgrtest.cpp - + * + * $Id: installmgrtest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -26,4 +31,3 @@ int main(int argc, char **argv) { inst.Refresh(); } - diff --git a/tests/introtest.cpp b/tests/introtest.cpp index ea75f44..462b1c6 100644 --- a/tests/introtest.cpp +++ b/tests/introtest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * introtest.cpp - + * + * $Id: introtest.cpp 2931 2013-07-31 13:07:26Z scribe $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,90 +35,90 @@ int main(int argc, char **argv) { RawText mod("."); VerseKey vk; - vk.Headings(1); - vk.AutoNormalize(0); - vk.Persist(1); + vk.setIntros(true); + vk.setAutoNormalize(false); + vk.setPersist(true); mod.setKey(vk); - vk.Verse(0); - vk.Chapter(0); - vk.Book(0); - vk.Testament(0); + vk.setVerse(0); + vk.setChapter(0); + vk.setBook(0); + vk.setTestament(0); mod << "Module heading text"; - vk.Verse(0); - vk.Chapter(0); - vk.Book(0); - vk.Testament(1); + vk.setVerse(0); + vk.setChapter(0); + vk.setBook(0); + vk.setTestament(1); mod << "OT heading text"; - vk.Testament(1); - vk.Book(1); - vk.Chapter(0); - vk.Verse(0); + vk.setTestament(1); + vk.setBook(1); + vk.setChapter(0); + vk.setVerse(0); mod << "Gen heading text"; - vk.Testament(1); - vk.Book(1); - vk.Chapter(1); - vk.Verse(0); + vk.setTestament(1); + vk.setBook(1); + vk.setChapter(1); + vk.setVerse(0); mod << "Gen 1 heading text"; - vk.Testament(1); - vk.Book(1); - vk.Chapter(1); - vk.Verse(1); + vk.setTestament(1); + vk.setBook(1); + vk.setChapter(1); + vk.setVerse(1); mod << "Gen 1:1 text"; - vk.Testament(0); - vk.Book(0); - vk.Chapter(0); - vk.Verse(0); + vk.setTestament(0); + vk.setBook(0); + vk.setChapter(0); + vk.setVerse(0); - std::cout << "Module heading text ?= " << (const char*)mod << std::endl; + std::cout << "Module heading text ?= " << mod.renderText() << std::endl; - vk.Testament(1); - vk.Book(0); - vk.Chapter(0); - vk.Verse(0); + vk.setTestament(1); + vk.setBook(0); + vk.setChapter(0); + vk.setVerse(0); - std::cout << "OT heading text ?= " << (const char*)mod << std::endl; + std::cout << "OT heading text ?= " << mod.renderText() << std::endl; - vk.Testament(1); - vk.Book(1); - vk.Chapter(0); - vk.Verse(0); + vk.setTestament(1); + vk.setBook(1); + vk.setChapter(0); + vk.setVerse(0); - std::cout << "Gen heading text ?= " << (const char*)mod << std::endl; + std::cout << "Gen heading text ?= " << mod.renderText() << std::endl; - vk.Testament(1); - vk.Book(1); - vk.Chapter(1); - vk.Verse(0); + vk.setTestament(1); + vk.setBook(1); + vk.setChapter(1); + vk.setVerse(0); - std::cout << "Gen 1 heading text ?= " << (const char*)mod << std::endl; + std::cout << "Gen 1 heading text ?= " << mod.renderText() << std::endl; - vk.Testament(1); - vk.Book(1); - vk.Chapter(1); - vk.Verse(1); + vk.setTestament(1); + vk.setBook(1); + vk.setChapter(1); + vk.setVerse(1); - std::cout << "Gen 1:1 text ?= " << (const char*)mod << std::endl; + std::cout << "Gen 1:1 text ?= " << mod.renderText() << std::endl; /* old introtest SWModule *mhc = mymgr.Modules["MHC"]; if (mhc) { VerseKey vk; - vk.Headings(1); - vk.AutoNormalize(0); - vk.Persist(1); + vk.setIntros(true); + vk.setAutoNormalize(false); + vk.setPersist(true); vk = "jas 0:0"; std::cout << vk << ":\n"; mhc->setKey(vk); diff --git a/tests/keycast.cpp b/tests/keycast.cpp index 3818279..2da50c9 100644 --- a/tests/keycast.cpp +++ b/tests/keycast.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * keycast.cpp - + * + * $Id: keycast.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/keytest.cpp b/tests/keytest.cpp index 6b22007..9fbc841 100644 --- a/tests/keytest.cpp +++ b/tests/keytest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * keytest.cpp - + * + * $Id: keytest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -47,15 +52,15 @@ int main(int argc, char **argv) bla = "James 1:19"; else bla = argv[2]; - std::cout << "\n Headings: " << (bool)bla.Headings() << "\n"; + std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n"; std::cout << " (.Index(Index()+1))\n"; max = (argc < 4) ? 10 : atoi(argv[3]); for (loop = 0; loop < max; loop++) { - index = bla.Index(); + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")"; - bla.Index(index+1); + bla.setIndex(index+1); std::cout << "-> " << (const char *)bla << "\n"; } @@ -66,37 +71,37 @@ int main(int argc, char **argv) else bla = argv[2]; for (loop = max; loop; loop--) { - index = bla.Index(); + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")"; - bla.Index(index-1); + bla.setIndex(index-1); std::cout << "-> " << (const char *)bla << "\n"; } std::cout << "-----------------\n"; - bla.Headings(true); - std::cout << "\n Headings: " << (bool)bla.Headings() << "\n"; + bla.setIntros(true); + std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n"; std::cout << " key++\n"; if (argc < 2) bla = "Matthew 1:5"; else bla = argv[2]; - for (loop = 0; loop < max && !bla.Error(); loop++,bla++) { - index = bla.Index(); + for (loop = 0; loop < max && !bla.popError(); loop++,bla++) { + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")\n"; } std::cout << "-----------------\n"; - bla.Headings(true); - std::cout << "\n Headings: " << (bool)bla.Headings() << "\n"; + bla.setIntros(true); + std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n"; std::cout << " key--\n"; if (argc < 2) bla = "Matthew 1:5"; else bla = argv[2]; - for (loop = max; loop && !bla.Error(); loop--, bla--) { - index = bla.Index(); + for (loop = max; loop && !bla.popError(); loop--, bla--) { + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")\n"; } @@ -107,7 +112,7 @@ int main(int argc, char **argv) else bla = argv[2]; for (loop = max; loop; loop--, bla--) { - index = bla.Index(); + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")\n"; } @@ -118,7 +123,7 @@ int main(int argc, char **argv) else bla = argv[2]; for (loop = max; loop; loop--, bla++) { - index = bla.Index(); + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")\n"; } @@ -129,7 +134,7 @@ int main(int argc, char **argv) else bla = argv[2]; for (loop = max; loop; loop--, bla++) { - index = bla.Index(); + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")\n"; } @@ -137,14 +142,14 @@ int main(int argc, char **argv) std::cout << "-----------------\n"; std::cout << "-------- Headings ---------\n"; - bla.Headings(1); + bla.setIntros(true); if (argc < 2) bla = "Matthew 1:5"; else bla = argv[2]; for (loop = max; loop; loop--, bla--) { - index = bla.Index(); + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")\n"; } @@ -155,7 +160,7 @@ int main(int argc, char **argv) else bla = argv[2]; for (loop = max; loop; loop--, bla--) { - index = bla.Index(); + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")\n"; } @@ -166,7 +171,7 @@ int main(int argc, char **argv) else bla = argv[2]; for (loop = max; loop; loop--, bla++) { - index = bla.Index(); + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")\n"; } @@ -177,7 +182,7 @@ int main(int argc, char **argv) else bla = argv[2]; for (loop = max; loop; loop--, bla++) { - index = bla.Index(); + index = bla.getIndex(); std::cout << (const char *)bla << "(" << index << ")\n"; } @@ -187,23 +192,23 @@ int main(int argc, char **argv) bla = "Revelation of John 23:19"; std::cout << "bla = \"Revelation of John 23:19\"\n"; std::cout << "(const char *)bla = " << (const char *)bla << "\n"; - std::cout << "bla.Error() = " << (int)bla.Error() << " \n"; + std::cout << "bla.popError() = " << (int)bla.popError() << " \n"; std::cout << "bla++ \n"; bla++; - std::cout << "bla.Error() = " << (int)bla.Error() << " \n"; + std::cout << "bla.popError() = " << (int)bla.popError() << " \n"; - bla.Headings(0); - for (bla = BOTTOM; !bla.Error(); bla.Book(bla.Book()-1)) + bla.setIntros(false); + for (bla = BOTTOM; !bla.popError(); bla.setBook(bla.getBook()-1)) std::cout << (const char *)bla << "\n"; - bla.Testament(1); + bla.setTestament(1); bla = BOTTOM; - std::cout << bla.TestamentIndex() << "\n"; - std::cout << bla.Index() << "\n"; + std::cout << bla.getTestamentIndex() << "\n"; + std::cout << bla.getIndex() << "\n"; std::cout << bla << "\n"; - bla.Testament(2); + bla.setTestament(2); bla = BOTTOM; - std::cout << bla.TestamentIndex() << "\n"; - std::cout << bla.Index() << "\n"; + std::cout << bla.getTestamentIndex() << "\n"; + std::cout << bla.getIndex() << "\n"; std::cout << bla << "\n"; return 0; } diff --git a/tests/lextest.cpp b/tests/lextest.cpp index 4d1f084..8cf1535 100644 --- a/tests/lextest.cpp +++ b/tests/lextest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * lextest.cpp - + * + * $Id: lextest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/listtest.cpp b/tests/listtest.cpp index 0bcfeed..50df61e 100644 --- a/tests/listtest.cpp +++ b/tests/listtest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * listtest.cpp - + * + * $Id: listtest.cpp 2893 2013-07-16 03:07:02Z scribe $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -31,15 +36,15 @@ int main(int argc, char **argv) SWKey text; VerseKey vk("jn 1:1", "jn 1:12"); vk = "jas 1:19"; - cout << "\nError should be set: " << ((vk.Error()) ? "set":"not set"); + cout << "\nError should be set: " << ((vk.popError()) ? "set":"not set"); text = (const char *)vk; cout << "\nshould be jn 1.12: " << text << "\n"; vk = "mat 1:19"; - cout << "\nError should be set: " << ((vk.Error()) ? "set":"not set"); + cout << "\nError should be set: " << ((vk.popError()) ? "set":"not set"); text = (const char *)vk; cout << "\nshould be jn 1.1: " << text << "\n"; vk = "jn 1:7"; - cout << "\nError should not be set: " << ((vk.Error()) ? "set":"not set"); + cout << "\nError should not be set: " << ((vk.popError()) ? "set":"not set"); text = (const char *)vk; cout << "\nshould be jn 1.7: " << text << "\n"; @@ -59,13 +64,13 @@ int main(int argc, char **argv) lk2 << lk; lk2 << vk2; lk2 << "test2"; - for (lk2 = TOP; !lk2.Error(); lk2++) { + for (lk2 = TOP; !lk2.popError(); lk2++) { cout << (const char *) lk2 << "\n"; } cout << "\n\n---------\n"; - lk2 = VerseKey().ParseVerseList("1jn-2jn;mk1.9", 0, true); + lk2 = VerseKey().parseVerseList("1jn-2jn;mk1.9", 0, true); // c-tor not bound setting, just parsing to jn.1.1 VerseKey yoyo("john"); @@ -91,23 +96,23 @@ int main(int argc, char **argv) */ - for (lk2 = TOP; !lk2.Error(); lk2++) + for (lk2 = TOP; !lk2.popError(); lk2++) cout << (const char *) lk2 << "\n"; - lk.ClearList(); + lk.clear(); lk << "john 3:16"; - cout << "\nCount should be 1: " << lk.Count(); + cout << "\nCount should be 1: " << lk.getCount(); - lk = vk.ParseVerseList("mat;mark;luke", vk, true); + lk = vk.parseVerseList("mat;mark;luke", vk, true); lk = (VerseKey)"mark 3:16"; - cout << "\nError should not be set: " << ((lk.Error()) ? "set":"not set"); + cout << "\nError should not be set: " << ((lk.popError()) ? "set":"not set"); lk = (VerseKey)"john 3:16"; - cout << "\nError should be set: " << ((lk.Error()) ? "set":"not set"); - lk = vk.ParseVerseList("mk 3:16", vk, true); + cout << "\nError should be set: " << ((lk.popError()) ? "set":"not set"); + lk = vk.parseVerseList("mk 3:16", vk, true); lk = (VerseKey)"john 3:16"; - cout << "\nError should be set: " << ((lk.Error()) ? "set":"not set"); + cout << "\nError should be set: " << ((lk.popError()) ? "set":"not set"); lk = (VerseKey)"mark 3:16"; - cout << "\nError should not be set: " << ((lk.Error()) ? "set":"not set"); + cout << "\nError should not be set: " << ((lk.popError()) ? "set":"not set"); cout << "\n\n"; return 0; diff --git a/tests/localetest.cpp b/tests/localetest.cpp index e1a0e7e..26f6b28 100644 --- a/tests/localetest.cpp +++ b/tests/localetest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * localetest.cpp - + * + * $Id: localetest.cpp 3005 2014-01-09 04:06:11Z greg.hellings $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,9 +33,9 @@ int main(int argc, char **argv) { exit(-1); } - LocaleMgr lm; + LocaleMgr *lm = LocaleMgr::getSystemLocaleMgr(); - std::cout << lm.translate(argv[2], argv[1]) << "\n"; + std::cout << lm->translate(argv[2], argv[1]) << "\n"; /* VerseKey bla; diff --git a/tests/mgrtest.cpp b/tests/mgrtest.cpp index acebf88..dbc9f14 100644 --- a/tests/mgrtest.cpp +++ b/tests/mgrtest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * mgrtest.cpp - + * + * $Id: mgrtest.cpp 2931 2013-07-31 13:07:26Z scribe $ + * + * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -41,21 +46,21 @@ int main(int argc, char **argv) { ModMap::iterator it; for (it = mymgr.Modules.begin(); it != mymgr.Modules.end(); it++) { - std::cout << "[" << (*it).second->Name() << "] (Writable: " << (it->second->isWritable()?"Yes":"No") << ") [" << (*it).second->Description() << "]\n"; + std::cout << "[" << (*it).second->getName() << "] (Writable: " << (it->second->isWritable()?"Yes":"No") << ") [" << (*it).second->getDescription() << "]\n"; std::cout << "AbsoluteDataPath = " << it->second->getConfigEntry("AbsoluteDataPath") << "\n"; std::cout << "Has Feature HebrewDef = " << it->second->getConfig().has("Feature", "HebrewDef") << "\n"; - if ((!strcmp((*it).second->Type(), "Biblical Texts")) || (!strcmp((*it).second->Type(), "Commentaries"))) { + if ((!strcmp((*it).second->getType(), "Biblical Texts")) || (!strcmp((*it).second->getType(), "Commentaries"))) { it->second->setKey("James 1:19"); - std::cout << (const char *) *(*it).second << "\n\n"; + std::cout << (*it).second->renderText() << "\n\n"; } } SWModule *mhc = mymgr.Modules["MHC"]; if (mhc) { - std::cout << "MHC, Lang = " << mhc->Lang() << "\n\n"; - for (mhc->Key("Gen 1:1"); mhc->Key() < (VerseKey) "Gen 1:10"; (*mhc)++) - std::cout << (const char *) *mhc << "\n"; + std::cout << "MHC, Lang = " << mhc->getLanguage() << "\n\n"; + for (mhc->setKey("Gen 1:1"); *mhc->getKey() < (VerseKey) "Gen 1:10"; (*mhc)++) + std::cout << mhc->renderText() << "\n"; } if (sysConf) diff --git a/tests/modtest.cpp b/tests/modtest.cpp index 7b946ee..8f03f0e 100644 --- a/tests/modtest.cpp +++ b/tests/modtest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * modtest.cpp - + * + * $Id: modtest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -28,11 +33,11 @@ int main(int argc, char **argv) { ModMap::iterator it; SWModule *module = mymgr.Modules["KJV"]; VerseKey parser; - ListKey lk = parser.ParseVerseList("mal4:6-rev", parser, true); - lk.Persist(1); - module->SetKey(lk); + ListKey lk = parser.parseVerseList("mal4:6-rev", parser, true); + lk.setPersist(true); + module->setKey(lk); (*module) = TOP; - std::cout << module->KeyText() << "\n"; + std::cout << module->getKeyText() << "\n"; return 0; } diff --git a/tests/osistest.cpp b/tests/osistest.cpp new file mode 100644 index 0000000..210f749 --- /dev/null +++ b/tests/osistest.cpp @@ -0,0 +1,111 @@ +/****************************************************************************** + * + * osistest.cpp - + * + * $Id: osistest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 20122013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include <iostream> + +#include <swmgr.h> +#include <markupfiltmgr.h> +#include <swmodule.h> +#include <versekey.h> + +using namespace std; +using namespace sword; + + +void outputCurrentVerse(SWModule *module) { + + module->renderText(); + + cout << "Key:\n"; + cout << module->getKeyText() << "\n"; + cout << "-------\n"; + + cout << "Preverse Header 0:\nRaw:\n"; + SWBuf header = module->getEntryAttributes()["Heading"]["Preverse"]["0"]; + cout << header << endl; + cout << "-------\n"; + cout << "Rendered Header:\n"; + cout << module->renderText(header) << endl; + cout << "-------\n"; + cout << "CSS:\n"; + cout << module->getRenderHeader() << endl; + cout << "-------\n"; + cout << "RenderText:\n"; + cout << module->renderText() << endl; + cout << "-------\n"; + cout << "-------\n\n"; +} + + +int main(int argc, char **argv) { + + if (argc != 2) { + cerr << "\nusage: " << *argv << " <modName>\n" << endl; + exit(-1); + } + + SWMgr library(new MarkupFilterMgr(FMT_XHTML)); + library.setGlobalOption("Headings", "On"); + + SWModule *module = library.getModule(argv[1]); + + if (!module) { + cerr << "\nCouldn't file modules: " << argv[1] << "\n" << endl; + exit(-2); + } + + module->setKey("Ps.3.1"); + outputCurrentVerse(module); + + module->setKey("Mark.1.14"); + outputCurrentVerse(module); + + + cout << "\nWhitespace tests around headings:\n"; + ((VerseKey *)module->getKey())->setIntros(true); + *module = TOP; + // module heading + cout << module->renderText() << "\n"; + (*module)++; + // testament heading + cout << module->renderText() << "\n"; + (*module)++; + // book heading + cout << module->renderText() << "\n"; + (*module)++; + // chapter heading + cout << module->renderText() << "\n"; + (*module)++; + // verse body + module->renderText(); + SWBuf header = module->getEntryAttributes()["Heading"]["Preverse"]["0"]; + cout << module->renderText(header) << endl; + cout << "[ " << module->getKeyText() << " ] " << module->renderText() << "\n"; + (*module)++; + // verse body + module->renderText(); + header = module->getEntryAttributes()["Heading"]["Preverse"]["0"]; + cout << module->renderText(header) << endl; + cout << "[ " << module->getKeyText() << " ] " << module->renderText() << "\n"; + + return 0; +} diff --git a/tests/outputcps.cpp b/tests/outputcps.cpp index 88e3688..5fe74fe 100644 --- a/tests/outputcps.cpp +++ b/tests/outputcps.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * outputcps.cpp - + * + * $Id: outputcps.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/parsekey.cpp b/tests/parsekey.cpp index 3e53b82..03802fc 100644 --- a/tests/parsekey.cpp +++ b/tests/parsekey.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * parsekey.cpp - + * + * $Id: parsekey.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -26,8 +31,8 @@ using namespace sword; #endif int main(int argc, char **argv) { - if ((argc < 2) || (argc > 7)) { - std::cerr << "usage: " << *argv << " <\"string to parse\"> [locale_name] [v11n] [context] [echo params 1|0] [test-in-set-verse]\n"; + if ((argc < 2) || (argc > 8)) { + std::cerr << "usage: " << *argv << " <\"string to parse\"> [locale_name] [v11n] [context] [echo params 1|0] [test-in-set-verse 1|0] [intros 1|0]\n"; exit(-1); } @@ -42,14 +47,20 @@ int main(int argc, char **argv) { const char *context = (argc > 4) ? argv[4] : "gen.1.1"; + bool echo = (argc > 5) ? !strcmp(argv[5], "1") : false; + bool inSetTest = (argc > 6) ? !strcmp(argv[6], "1") : false; + bool intros = (argc > 7) ? !strcmp(argv[7], "1") : false; + + DefaultVSKey.setIntros(intros); + SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG); DefaultVSKey.validateCurrentLocale(); DefaultVSKey = context; - - ListKey verses = DefaultVSKey.ParseVerseList(argv[1], DefaultVSKey, true); - if ((argc > 5) && (argv[5][0] == '1')) { + ListKey verses = DefaultVSKey.parseVerseList(argv[1], DefaultVSKey, true); + + if (echo) { for (int i = 1; i < argc; i++) { if (i > 1) std::cout << " "; std::cout << argv[i]; @@ -63,9 +74,9 @@ int main(int argc, char **argv) { } */ - if (argc > 6) { - verses.setText(argv[4]); - std::cout << "Verse is" << ((verses.Error()) ? " NOT" : "") << " in set.\n\n"; + if (inSetTest) { + verses.setText(context); + std::cout << "Verse is" << ((verses.popError()) ? " NOT" : "") << " in set.\n\n"; } return 0; diff --git a/tests/rawldidxtest.cpp b/tests/rawldidxtest.cpp index 4aad6b8..bd47f0e 100644 --- a/tests/rawldidxtest.cpp +++ b/tests/rawldidxtest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * rawldidxtest.cpp - + * + * $Id: rawldidxtest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/refsystest.cpp b/tests/refsystest.cpp index 502d429..e41acf9 100644 --- a/tests/refsystest.cpp +++ b/tests/refsystest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * refsystest.cpp - + * + * $Id: refsystest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/romantest.cpp b/tests/romantest.cpp index 7f57257..cb0e026 100644 --- a/tests/romantest.cpp +++ b/tests/romantest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * romantest.cpp - + * + * $Id: romantest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/striptest.cpp b/tests/striptest.cpp index e7eecaa..8013481 100644 --- a/tests/striptest.cpp +++ b/tests/striptest.cpp @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * striptest.cpp - + * + * $Id: striptest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #include <swmgr.h> #include <swmodule.h> #include <iostream> @@ -20,13 +42,13 @@ int main(int argc, char **argv) { library.setGlobalOption(*it, "Off"); } book->setKey(keyText.c_str()); - SWBuf entryStripped = book->StripText(); - cout << "Module: " << book->Description() << "\t Key: " << book->getKeyText() << "\n"; + SWBuf entryStripped = book->stripText(); + cout << "Module: " << book->getDescription() << "\t Key: " << book->getKeyText() << "\n"; cout << "RawEntry:\n" << book->getRawEntry() << "\n"; cout << "StripText:\n" << entryStripped << "\n"; cout << "Search Target: " << searchText << "\n"; - cout << "Search Target StripText: " << book->StripText(searchText) << "\n"; - cout << "Found: " << ((strstr(entryStripped.c_str(), book->StripText(searchText))) ? "true":"false") << endl; + cout << "Search Target StripText: " << book->stripText(searchText) << "\n"; + cout << "Found: " << ((strstr(entryStripped.c_str(), book->stripText(searchText))) ? "true":"false") << endl; return 0; } diff --git a/tests/swaptest.cpp b/tests/swaptest.cpp index 040a233..f3713d0 100644 --- a/tests/swaptest.cpp +++ b/tests/swaptest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swaptest.cpp - + * + * $Id: swaptest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/swbuftest.cpp b/tests/swbuftest.cpp index 512df09..2703efd 100644 --- a/tests/swbuftest.cpp +++ b/tests/swbuftest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swbuftest.cpp - + * + * $Id: swbuftest.cpp 2982 2013-09-15 13:33:03Z scribe $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -21,6 +26,8 @@ #define BASEI 102400000L #include <swbuf.h> +#include <utilstr.h> + typedef sword::SWBuf StringType; //#include <string> @@ -28,6 +35,8 @@ typedef sword::SWBuf StringType; using std::cout; using std::cerr; +using sword::utf8ToWChar; +using sword::wcharToUTF8; void markTime() { static clock_t start = clock(); @@ -132,6 +141,8 @@ void insertStringTest() { } int main(int argc, char **argv) { + + bool showTimings = !(argc > 1 && !strcmp(argv[1], "--no-timings")); StringType x; cout << "x should be (): (" << x << ")\n"; cout << "size should be 0: " << x.size() << "\n"; @@ -152,6 +163,11 @@ int main(int argc, char **argv) { cout << "Prefix should be (prefix): " << prefixTest.stripPrefix(':') << "\n"; cout << "Value should be (value): " << prefixTest << "\n"; + x = utf8ToWChar("ⲉⲛⲧâ²â²¡â²›â²Ÿâ²©â²§â²‰"); + cout << (wchar_t *)x.getRawData() << "\n"; + x = wcharToUTF8((wchar_t *)x.getRawData()); + cout << x << "\n"; + // y.appendFormatted(" from %d %s running %02.05f miles", 4, "dogs", 1.9f); // cout << "should be (hello wurld hello wurld from 4 dogs running 1.90000 miles): (" << y << ")\n"; // y += '!'; @@ -159,18 +175,18 @@ int main(int argc, char **argv) { // y.append(y.c_str(),5); // cout << "should be (hello wurld hello wurld from 4 dogs running 1.90000 miles!hello): (" << y << ")\n"; - markTime(); + if (showTimings) markTime(); appendChTest(); - markTime(); + if (showTimings) markTime(); appendStringTest(); - markTime(); + if (showTimings) markTime(); subscriptTest(); - markTime(); + if (showTimings) markTime(); ctorAssignTest(); - markTime(); + if (showTimings) markTime(); compareTest(); - markTime(); + if (showTimings) markTime(); insertStringTest(); - markTime(); + if (showTimings) markTime(); } diff --git a/tests/testblocks.cpp b/tests/testblocks.cpp index f0f6e84..96e2253 100644 --- a/tests/testblocks.cpp +++ b/tests/testblocks.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * testblocks.cpp - + * + * $Id: testblocks.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/testsuite/osis.good b/tests/testsuite/osis.good new file mode 100644 index 0000000..87c58c3 --- /dev/null +++ b/tests/testsuite/osis.good @@ -0,0 +1,106 @@ +SUCCESS: ../../utilities/osis2mod: has finished its work and will now rest +Key: +Psalms 3:1 +------- +Preverse Header 0: +Raw: +<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.
+------- +Rendered Header: +

A Psalm of David, when he fled from Absalom his son.

+ +
+ +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChangeSupplied { font-style: italic; } + .small, .sub, .sup { font-size: .83em } + .sub { vertical-align: sub } + .sup { vertical-align: super } + .indent1 { margin-left: 10px } + .indent2 { margin-left: 20px } + .indent3 { margin-left: 30px } + .indent4 { margin-left: 40px } + +------- +RenderText: + Lord, how are they increased that trouble me!
+many are they that rise up against me.
+ +------- +------- + +Key: +Mark 1:14 +------- +Preverse Header 0: +Raw: +
The Beginning of the Ministry of Jesus (<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>)
+------- +Rendered Header: +

The Beginning of the Ministry of Jesus

+ +

(Matt 4:12–22; Luke 4:14, 15; 5:1-11)

+ +
+ +------- +CSS: + .divineName { font-variant: small-caps; } + .wordsOfJesus { color: red; } + .transChangeSupplied { font-style: italic; } + .small, .sub, .sup { font-size: .83em } + .sub { vertical-align: sub } + .sup { vertical-align: super } + .indent1 { margin-left: 10px } + .indent2 { margin-left: 20px } + .indent3 { margin-left: 30px } + .indent4 { margin-left: 40px } + +------- +RenderText: + Now after that John was put in prison, Jesus came into Galilee, preaching the gospel of the kingdom of God, +------- +------- + + +Whitespace tests around headings: + + +

Old Testament

+ +

THE FIRST BOOK OF MOSES CALLED GENESIS

+ +

Introduction and Outline

+ +
+This is the Book of Genesis, the first book in the Bible. It may be outlined as follows:
+
+
    +
  • 1Creation of Heaven and Earth, 1:1-2:4a
    • +
  • 2Creation of Man and Woman, 2:4b-25
    • +
  • 3Fall, 3:1-24
    • +
  • ...
    • +
+
+Tables work like this: + + + +
Column 1 Label Column 2 Label
Column 1, Row 1 Column 2, Row 1
Column 1, Row 2 Column 2, Row 2
+
+ +

From Creation to Abraham (1:1–11:9)

+ + +

Creation of the Heavens and the Earth

+ +
+ +[ Genesis 1:1 ] In the beginning God created the heaven and the earth.
+ +
+ +[ Genesis 1:2 ] Text of verse 2. diff --git a/tests/testsuite/osis.sh b/tests/testsuite/osis.sh new file mode 100755 index 0000000..689e64d --- /dev/null +++ b/tests/testsuite/osis.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +rm -rf osis/ +mkdir -p osis/mods.d +mkdir -p osis/modules + +cat > osis/mods.d/osisreference.conf <&1 | grep -v \$Rev + +cd osis && ../../osistest OSISReference diff --git a/tests/testsuite/osisReference.xml b/tests/testsuite/osisReference.xml new file mode 100644 index 0000000..d07f774 --- /dev/null +++ b/tests/testsuite/osisReference.xml @@ -0,0 +1,183 @@ + + + + + +
+ + King James Version (1769) with Strongs Numbers and Morphology + Bible.KJV + Gen-Rev + Bible.KJV + + + Bible.KJV + + + Dict.Strongs + + + Dict.Robinsons + + + Dict.osmorph + + + Dict.oslemma + +
+
+ Old Testament +
+ THE FIRST BOOK OF MOSES CALLED GENESIS +
+ Introduction and Outline +

+ This is the Book of Genesis, the first book in the Bible. It may be outlined as follows: +

+

+ + 1Creation of Heaven and Earth, 1:1-2:4a + 2Creation of Man and Woman, 2:4b-25 + 3Fall, 3:1-24 + ... + +

+

+ Tables work like this: + + + Column 1 Label + Column 2 Label + + + Column 1, Row 1 + Column 2, Row 1 + + + Column 1, Row 2 + Column 2, Row 2 + +
+

+
+ +
+ From Creation to Abraham (1:1–11:9) +
+ Creation of the Heavens and the Earth +

+ + In the beginning + God + created + the heaven + and + the earth. + +

+

+ Text of verse 2. + + Text of verse 3. + + 2 Cor 4:6 + + + + And God saw the light, that + it was good: + and God divided the light from the darkness. + the light from…: Heb. between the light and between the darkness + + + ×•Ö·×™Ö´Ö¼×§Ö°×¨Ö¸Ö¨× + ×Ö±×œÖ¹×”Ö´Ö¤×™× + לָ×ֹור֙ + ×™Ö¹Ö”×•× + וְלַחֹ֖שֶ×ךְ + ×§Ö¸Ö£×¨Ö¸× + לָ֑יְלָה + וַֽיְהִי־עֶ֥רֶב + וַֽיְהִי־בֹ֖קֶר + ×™Ö¹Ö¥×•× + ×ֶחָֽד׃ + פ + +

+ +
+
+
+
+ THE BOOK OF PSALMS + + PSALM 3. +
+ A Psalm of David, when he fled from Absalom his son. +

+ + + Lord, how are they increased that trouble me! + many are they that rise up against me. + + + Many there be which say of my soul, + There is no help for him in God. + Selah. + + + + + +

+
+ +
+
+
+ New Testament +
+ THE GOSPEL ACCORDING TO <abbr expansion="Saint">ST.</abbr> MARK + + +And He was in the wilderness forty days being tempted by Satan; and He was with the wild beasts, and the angels were ministering to Him. + +
+ The Beginning of the Ministry of Jesus + (<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; + <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; + <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>) + +

+ + Now + after that + John + was put in prison, + Jesus + came + into + Galilee, + preaching + the gospel + of the kingdom + of God, + + + + And saying, + The time is fulfilled, and the kingdom of God is at hand: repent ye, and believe the gospel +good news. + +

+
+ +
+
+ + diff --git a/tests/testsuite/sword.conf b/tests/testsuite/sword.conf new file mode 100644 index 0000000..a8ae13b --- /dev/null +++ b/tests/testsuite/sword.conf @@ -0,0 +1,2 @@ +[Install] +LocalePath=../.. diff --git a/tests/testsuite/versekeytest.good b/tests/testsuite/versekeytest.good index 08b233c..5540c6a 100644 --- a/tests/testsuite/versekeytest.good +++ b/tests/testsuite/versekeytest.good @@ -1,3 +1,9 @@ +Should be: [ Testament 1 Heading ] +[ Testament 1 Heading ] + +Should be: [ Testament 1 Heading ] +[ Testament 1 Heading ] + single multiple x: Amos 1:5 @@ -10,6 +16,9 @@ Error: 1: Acts 28:31 Normalization on; headings on ==== +jn.3.50: John 4:13 +++: John 4:14 +--: John 4:13 MAXVERSE: John 4:54 MAXCHAPTER: John 21:1 TOP: [ Module Heading ] @@ -18,6 +27,9 @@ BOTTOM: Revelation of John 22:21 Normalization off; headings on ==== jn.3.50: John 3:50 +++: John 3:51 +--: John 3:50 +MAXVERSE: John 3:36 MAXCHAPTER: John 21:1 TOP: [ Module Heading ] BOTTOM: Revelation of John 22:21 @@ -35,6 +47,9 @@ BOTTOM: Revelation of John 22:21 Normalization off; headings off ==== jn.3.50: John 3:50 +++: John 3:51 +--: John 3:50 +MAXVERSE: John 3:36 MAXCHAPTER: John 21:1 TOP: Genesis 1:1 BOTTOM: Revelation of John 22:21 diff --git a/tests/testsuite/verseparsing.good b/tests/testsuite/verseparsing.good index b7292d1..ee46d68 100644 --- a/tests/testsuite/verseparsing.good +++ b/tests/testsuite/verseparsing.good @@ -1,3 +1,5 @@ +jn.1.1-2.5,9,3;7.9 en KJV ge 1: John 1:1-John 2:5; John 2:9; John 2:3; John 7:9 +jn.1.1-2.5 en KJV ge 1: John 1:1-John 2:5 1jn.2.3 en KJV ge 1: I John 2:3 1 jn.2.3 en KJV ge 1: I John 2:3 Ijn.2.3 en KJV ge 1: I John 2:3 @@ -54,15 +56,22 @@ I. jn 2:3 en KJV ge 1: I John 2:3 1Jn 1:1 ;3:10 en KJV ge 1: I John 1:1; I John 3:10 1Jn 1:1 ; 3:10 en KJV ge 1: I John 1:1; I John 3:10 1Jn 1:1a ; 3:10b en KJV ge 1: I John 1:1a; I John 3:10b -1Jn 1:1-2a; 3:10b-11 en KJV ge 1: I John 1:1-Revelation of John 22:21; I John 3:10b-I John 3:11 -1Jn 1:1c;3:10d-12e,13 en KJV ge 1: I John 1:1c; I John 3:10d; I John 3:13 +1Jn 1:1-2a; 3:10b-11 en KJV ge 1: I John 1:1-I John 1:2a; I John 3:10b-I John 3:11 +1Jn 1:1c;3:10d-12e,13 en KJV ge 1: I John 1:1c; I John 3:10d-I John 3:12e; I John 3:13 +Luke 2:45b-3:1a;3:1b-7;3:8-14;3:15-21a en KJV ge 1: Luke 2:45b-Luke 3:1a; Luke 3:1b-Luke 3:7; Luke 3:8-Luke 3:14; Luke 3:15-Luke 3:21a 1Jn1.1f; 3:10ff en KJV ge 1: I John 1:1-I John 1:2; I John 3:10-I John 3:24 1Jn1.1ff;3:10f en KJV ge 1: I John 1:1-I John 1:10; I John 3:10-I John 3:11 1Jn1.1,8ff; 3:10-12,14f,17ff en KJV ge 1: I John 1:1; I John 1:8-I John 1:10; I John 3:10-I John 3:12; I John 3:14-I John 3:15; I John 3:17-I John 3:24 +1Jn2.3f. en KJV ge 1: I John 2:3-I John 2:4 +1Jn2.3ff. en KJV ge 1: I John 2:3-I John 2:29 Song of 3:5 en KJV ge 1: Song of Solomon 3:5 Song of Sol 3:5 en KJV ge 1: Song of Solomon 3:5 Revelation of John 1:1 en KJV ge 1: Revelation of John 1:1 - +Matt.Inscriptio en KJV ge 1 0 1: Matthew 0:0 +Matt.Subscriptio en KJV ge 1 0 1: Matthew 1:0 +Matt Inscriptio en KJV ge 1 0 1: Matthew 0:0 +Matt Inscriptio en KJV ge 1 0 1: Matthew 0:0 +Matt subsc en KJV ge 1 0 1: Matthew 1:0 Gen en KJV ge 1: Genesis 1:1-Genesis 50:26 Genes en KJV ge 1: Genesis 1:1-Genesis 50:26 Exod en KJV ge 1: Exodus 1:1-Exodus 40:38 diff --git a/tests/testsuite/verseparsing.sh b/tests/testsuite/verseparsing.sh index d405f0f..aa6ae25 100755 --- a/tests/testsuite/verseparsing.sh +++ b/tests/testsuite/verseparsing.sh @@ -1,7 +1,7 @@ #!/bin/sh #****************************************************************************** # -# $Id: verseparsing.sh 2573 2010-10-17 21:15:48Z scribe $ +# $Id: verseparsing.sh 2796 2013-04-11 16:18:45Z scribe $ # # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society @@ -18,6 +18,9 @@ # General Public License for more details. # +../parsekey "jn.1.1-2.5,9,3;7.9" en KJV ge 1 +../parsekey "jn.1.1-2.5" en KJV ge 1 + ../parsekey "1jn.2.3" en KJV ge 1 ../parsekey "1 jn.2.3" en KJV ge 1 ../parsekey "Ijn.2.3" en KJV ge 1 @@ -82,19 +85,31 @@ ../parsekey "1Jn 1:1 ; 3:10" en KJV ge 1 ../parsekey "1Jn 1:1a ; 3:10b" en KJV ge 1 -### These two are not quite right yet +### Suffix parsing ../parsekey "1Jn 1:1-2a; 3:10b-11" en KJV ge 1 ../parsekey "1Jn 1:1c;3:10d-12e,13" en KJV ge 1 +../parsekey "Luke 2:45b-3:1a;3:1b-7;3:8-14;3:15-21a" en KJV ge 1 ../parsekey "1Jn1.1f; 3:10ff" en KJV ge 1 ../parsekey "1Jn1.1ff;3:10f" en KJV ge 1 ../parsekey "1Jn1.1,8ff; 3:10-12,14f,17ff" en KJV ge 1 +../parsekey "1Jn2.3f." en KJV ge 1 +../parsekey "1Jn2.3ff." en KJV ge 1 ### check for 'f' in book name which might trigger 'and following' ../parsekey "Song of 3:5" en KJV ge 1 ../parsekey "Song of Sol 3:5" en KJV ge 1 ../parsekey "Revelation of John 1:1" en KJV ge 1 +### check for 'inscriptio' and 'subscriptio' special chapters which parse to Book 0:0 and Book 1:0 respectively (for INTF) +../parsekey "Matt.Inscriptio" en KJV ge 1 0 1 +../parsekey "Matt.Subscriptio" en KJV ge 1 0 1 +../parsekey "Matt Inscriptio" en KJV ge 1 0 1 +../parsekey "Matt Inscriptio" en KJV ge 1 0 1 +../parsekey "Matt subsc" en KJV ge 1 0 1 + + + en_abbrevs=" Gen Genes Exod Ex Exo Lev Le Levi Num Nu Numb Deut Deu De Josh Jos Joshu Judg Jdg Judge Ruth Ru Rut 1Sam 1Sa 1Samu 2Sam 2Sa 2Samu 1Kgs 1Ki 1King diff --git a/tests/tlitmgrtest.cpp b/tests/tlitmgrtest.cpp index 4278f22..d7c0b1b 100644 --- a/tests/tlitmgrtest.cpp +++ b/tests/tlitmgrtest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * tlitmgrtest.cpp - + * + * $Id: tlitmgrtest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/translittest.cpp b/tests/translittest.cpp index 90596c7..a0ec9d3 100644 --- a/tests/translittest.cpp +++ b/tests/translittest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * translittest.cpp - + * + * $Id: translittest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/tests/utf8norm.cpp b/tests/utf8norm.cpp index 1f1e7f2..a992a2e 100644 --- a/tests/utf8norm.cpp +++ b/tests/utf8norm.cpp @@ -1,3 +1,25 @@ +/****************************************************************************** + * + * utf8norm.cpp - + * + * $Id: utf8norm.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #include #include #include diff --git a/tests/versekeytest.cpp b/tests/versekeytest.cpp index 02cfe75..4ae064e 100644 --- a/tests/versekeytest.cpp +++ b/tests/versekeytest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * versekeytest.cpp - + * + * $Id: versekeytest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -31,11 +36,46 @@ using namespace sword; using std::cout; using std::endl; +class _System { +public: +class Out { +public: + void println(const char *x) { cout << x << endl; } + void println(int x) { cout << x << endl; } +} out; +} System; + int main(int argc, char **argv) { + VerseKey vk; +/* + vk.setTestament(2); + vk.setBook(4); + vk.setChapter(3); + vk.setVerse(1); + System.out.println(vk.getText()); + System.out.println(vk.getIndex()); + System.out.println(vk.getTestamentIndex()); + vk.setVersificationSystem("KJVA"); + System.out.println(vk.getText()); + System.out.println(vk.getIndex()); + System.out.println(vk.getTestamentIndex()); + System.out.println("decrementing..."); + vk.setVersificationSystem("KJV"); + vk.decrement(); + System.out.println(vk.getText()); + System.out.println(vk.getIndex()); + System.out.println(vk.getTestamentIndex()); + vk.setVersificationSystem("KJVA"); + System.out.println(vk.getText()); + System.out.println(vk.getIndex()); + System.out.println(vk.getTestamentIndex()); +*/ + + /* VerseKey currentVerse; -currentVerse.AutoNormalize(0); -currentVerse.Headings(1); +currentVerse.setAutoNormalize(true); +currentVerse.setIntros(true); currentVerse.Persist(1); currentVerse = "jn2"; cout << currentVerse << endl; @@ -44,18 +84,25 @@ cout << currentVerse << endl; SWModule *mod = mgr.getModule("KJVgb"); */ VerseKey *parser = new VerseKey(); //(VerseKey *)mod->CreateKey(); + parser->setIntros(true); - ListKey scope = parser->ParseVerseList("amos 2:2", *parser, true); + ListKey result = parser->parseVerseList("[ Testament 1 Heading ]"); + cout << "Should be: [ Testament 1 Heading ]\n" << result << "\n\n"; - cout << ((scope++ == scope) ? "single" : "multiple") << "\n"; + parser->setText("[ Testament 1 Heading ]"); + cout << "Should be: [ Testament 1 Heading ]\n" << *parser << "\n\n"; - scope = parser->ParseVerseList("amos", *parser, true); + result.clear(); + + ListKey scope = parser->parseVerseList("amos 2:2", *parser, true); cout << ((scope++ == scope) ? "single" : "multiple") << "\n"; - scope = parser->ParseVerseList("amos", *parser, true); + scope = parser->parseVerseList("amos", *parser, true); + + cout << ((scope++ == scope) ? "single" : "multiple") << "\n"; - ListKey result; + scope = parser->parseVerseList("amos", *parser, true); scope++; scope++; @@ -77,28 +124,28 @@ cout << currentVerse << endl; std::cout << result.getText() << "\n"; const char *bounds = "lk,acts"; - scope = parser->ParseVerseList(bounds, *parser, true); + scope = parser->parseVerseList(bounds, *parser, true); VerseKey boundTest("lk", "acts"); boundTest.setText("Is.1.13"); - std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n"; + std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n"; boundTest.setText("1Sam.21.1"); - std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n"; + std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n"; boundTest.setText("acts.5.1"); - std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n"; + std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n"; boundTest.setText("rom.5.1"); - std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n"; + std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n"; *x = "Is.1.13"; scope = *x; -// if (scope == x) std::cout << "Error restricting bounds: " << x.getText() << " is in " << bounds << "\n"; - if (!scope.Error()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n"; + if (scope == *x) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n"; + if (!scope.popError()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n"; *x = "1Sam.21.1"; scope = *x; - if (!scope.Error()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n"; + if (!scope.popError()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n"; /* VerseKey *y = (VerseKey *)mod->CreateKey(); @@ -118,21 +165,18 @@ cout << currentVerse << endl; (*mod)--; cout << mod->getKeyText() << "\n"; */ - VerseKey vk; cout << "\nNormalization on; headings on ====\n\n"; - vk.AutoNormalize(1); - vk.Headings(1); + vk.setAutoNormalize(true); + vk.setIntros(true); vk = "jn3.50"; -/* TODO: these report 1 number off from what I think they should report cout << "jn.3.50: " << vk << "\n"; vk++; cout << "++: " << vk << "\n"; vk--; cout << "--: " << vk << "\n"; -*/ vk = MAXVERSE; cout << "MAXVERSE: " << vk << "\n"; vk = MAXCHAPTER; @@ -144,19 +188,17 @@ cout << currentVerse << endl; cout << "\nNormalization off; headings on ====\n\n"; - vk.AutoNormalize(0); - vk.Headings(1); + vk.setAutoNormalize(false); + vk.setIntros(true); vk = "jn3.50"; cout << "jn.3.50: " << vk << "\n"; -/* TODO: These probably are undefined and likely to be ok vk++; cout << "++: " << vk << "\n"; vk--; cout << "--: " << vk << "\n"; vk = MAXVERSE; cout << "MAXVERSE: " << vk << "\n"; -*/ vk = MAXCHAPTER; cout << "MAXCHAPTER: " << vk << "\n"; vk = TOP; @@ -166,8 +208,8 @@ cout << currentVerse << endl; cout << "\nNormalization on; headings off ====\n\n"; - vk.AutoNormalize(1); - vk.Headings(0); + vk.setAutoNormalize(true); + vk.setIntros(false); vk = "jn3.50"; cout << "jn.3.50: " << vk << "\n"; @@ -186,19 +228,17 @@ cout << currentVerse << endl; cout << "\nNormalization off; headings off ====\n\n"; - vk.AutoNormalize(0); - vk.Headings(0); + vk.setAutoNormalize(false); + vk.setIntros(false); vk = "jn3.50"; cout << "jn.3.50: " << vk << "\n"; -/* TODO: These probably are undefined and likely to be ok vk++; cout << "++: " << vk << "\n"; vk--; cout << "--: " << vk << "\n"; vk = MAXVERSE; cout << "MAXVERSE: " << vk << "\n"; -*/ vk = MAXCHAPTER; cout << "MAXCHAPTER: " << vk << "\n"; vk = TOP; @@ -208,11 +248,11 @@ cout << currentVerse << endl; VerseKey yo = "jn.3.16"; VerseKey yo2 = yo++; - cout << yo2 << ": " << (int)yo2.Error() << endl; + cout << yo2 << ": " << (int)yo2.popError() << endl; VerseKey vkey; VerseKey tmpkey = "1sam 1:1"; - vkey.AutoNormalize(1); // line 147 + vkey.setAutoNormalize(true); vkey = tmpkey; int chapter = (vkey.getChapter()-1); vkey.setChapter(chapter); diff --git a/tests/versemgrtest.cpp b/tests/versemgrtest.cpp index 8d5ec98..1b51763 100644 --- a/tests/versemgrtest.cpp +++ b/tests/versemgrtest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * versemgrtest.cpp - + * + * $Id: versemgrtest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -19,7 +24,7 @@ #include #include -#include +#include #ifndef NO_SWORD_NAMESPACE using namespace sword; #endif @@ -31,10 +36,10 @@ int main(int argc, char **argv) { const char *v11n = (argc > 1) ? argv[1] : "KJV"; - VerseMgr *vmgr = VerseMgr::getSystemVerseMgr(); - const VerseMgr::System *system = vmgr->getVersificationSystem(v11n); + VersificationMgr *vmgr = VersificationMgr::getSystemVersificationMgr(); + const VersificationMgr::System *system = vmgr->getVersificationSystem(v11n); int bookCount = system->getBookCount(); - const VerseMgr::Book *lastBook = system->getBook(bookCount-1); + const VersificationMgr::Book *lastBook = system->getBook(bookCount-1); int chapMax = lastBook->getChapterMax(); int verseMax = lastBook->getVerseMax(chapMax); long offsetMax = system->getOffsetFromVerse(bookCount-1, chapMax, verseMax); diff --git a/tests/vtreekeytest.cpp b/tests/vtreekeytest.cpp index 50418f9..3443bd1 100644 --- a/tests/vtreekeytest.cpp +++ b/tests/vtreekeytest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * vtreekeytest.cpp - + * + * $Id: vtreekeytest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -36,12 +41,12 @@ int main(int argc, char **argv) { SWMgr mgr; SWModule *mod = mgr.getModule("KJVgb"); - VerseKey *key1 = (VerseKey *)mod->CreateKey(); + VerseKey *key1 = (VerseKey *)mod->createKey(); - key1->Testament(2); - key1->Book(4); - key1->Chapter(2); - key1->Verse(3); + key1->setTestament(2); + key1->setBook(4); + key1->setChapter(2); + key1->setVerse(3); cout << "\n" << key1->getText() << ":\n\n"; @@ -54,7 +59,7 @@ int main(int argc, char **argv) { cout << "\n" << keys2.getRangeText() << ":\n\n"; - keys = key1->ParseVerseList("Lk.4.5"); + keys = key1->parseVerseList("Lk.4.5"); cout << "\n" << key1->getText() << ":\n\n"; @@ -70,18 +75,18 @@ int main(int argc, char **argv) { cout << "\nListkey persist key iteration test\n\n"; - keys = key1->ParseVerseList("mat1", 0, true); + keys = key1->parseVerseList("mat1", 0, true); - for (keys = TOP; !keys.Error(); keys++) { + for (keys = TOP; !keys.popError(); keys++) { cout << "\n" << keys.getText() << ":\n" << endl; } - keys.Persist(1); + keys.setPersist(true); mod->setKey(keys); - for ((*mod) = TOP; !mod->Error(); (*mod)++) { + for ((*mod) = TOP; !mod->popError(); (*mod)++) { cout << "\n" << mod->getKeyText() << ":\n" << endl; } diff --git a/tests/webiftest.cpp b/tests/webiftest.cpp index 7b3bc4e..3e5cba6 100644 --- a/tests/webiftest.cpp +++ b/tests/webiftest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * webiftest.cpp - + * + * $Id: webiftest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -53,7 +58,7 @@ int main(int argc, char **argv) { module = mgr.Modules.begin()->second; } module->setKey(keyName); - std::cout << module->RenderText() << std::endl<< std::endl<< std::endl; + std::cout << module->renderText() << std::endl<< std::endl<< std::endl; //------------------------ @@ -66,7 +71,7 @@ int main(int argc, char **argv) { } module->setKey(keyName); - std::cout << module->RenderText() << std::endl; + std::cout << module->renderText() << std::endl; return 0; } diff --git a/tests/xmltest.cpp b/tests/xmltest.cpp index d8e8eda..158017d 100644 --- a/tests/xmltest.cpp +++ b/tests/xmltest.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * xmltest.cpp - + * + * $Id: xmltest.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/usrinst.sh b/usrinst.sh index 59ef824..41463eb 100755 --- a/usrinst.sh +++ b/usrinst.sh @@ -1,10 +1,11 @@ #!/bin/sh #****************************************************************************** -# Convenience script specifying most common development options to ./configure +# usrinst.sh - Convenience script specifying most common development options +# to ./configure # -# $Id: usrinst.sh 2486 2009-12-07 04:02:43Z scribe $ +# $Id: usrinst.sh 2986 2013-10-05 12:32:49Z scribe $ # -# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) +# Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society # P. O. Box 2528 # Tempe, AZ 85280-2528 @@ -21,15 +22,21 @@ # OPTIONS="--prefix=/usr $OPTIONS" -OPTIONS="--libdir=/usr/lib64 $OPTIONS" +if [ -d /usr/lib64 ] +then + OPTIONS="--libdir=/usr/lib64 $OPTIONS" +else + OPTIONS="--libdir=/usr/lib $OPTIONS" +fi OPTIONS="--sysconfdir=/etc $OPTIONS" OPTIONS="--without-conf $OPTIONS" OPTIONS="--disable-shared $OPTIONS" -OPTIONS="--enable-debug $OPTIONS" +#OPTIONS="--enable-debug $OPTIONS" #OPTIONS="--enable-profile $OPTIONS" -#OPTIONS="--without-icu $OPTIONS" +#OPTIONS="--with-cxx11regex $OPTIONS" #OPTIONS="--with-icusword $OPTIONS" +#OPTIONS="--without-icu $OPTIONS" #OPTIONS="--without-clucene $OPTIONS" #OPTIONS="--without-curl $OPTIONS" diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt index 3d510f1..822961d 100644 --- a/utilities/CMakeLists.txt +++ b/utilities/CMakeLists.txt @@ -88,7 +88,7 @@ ENDIF(BUILDING_SHARED) # FOREACH(UTIL ${install_UTILITIES}) INSTALL(TARGETS ${UTIL} - DESTINATION ${SWORD_INSTALL_DIR}/bin + DESTINATION ${BINDIR} COMPONENT utilities ) ENDFOREACH(UTIL ${install_UTILITIES}) @@ -113,7 +113,7 @@ ELSE(BUILDING_SHARED) TARGET_LINK_LIBRARIES(diatheke sword_static) ENDIF(BUILDING_SHARED) INSTALL(TARGETS diatheke - DESTINATION ${SWORD_INSTALL_DIR}/bin + DESTINATION ${BINDIR} COMPONENT utilities ) diff --git a/utilities/Makefile.am b/utilities/Makefile.am index a8c1c8e..ecebb50 100644 --- a/utilities/Makefile.am +++ b/utilities/Makefile.am @@ -1,16 +1,16 @@ AUTOMAKE_OPTIONS = 1.6 SUBDIRS = diatheke -INCLUDES = -I $(top_srcdir)/include +AM_CPPFLAGS = -I $(top_srcdir)/include if USE_INTERNAL_REGEX -INCLUDES += -I$(top_srcdir)/include/internal/regex +AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex endif LDADD = $(top_builddir)/lib/libsword.la noinst_PROGRAMS = cipherraw lexdump \ -stepdump step2vpl gbfidx modwrite addvs emptyvss \ -addgb genbookutil treeidxutil + stepdump step2vpl gbfidx modwrite addvs emptyvss \ + addgb genbookutil treeidxutil addld -bin_PROGRAMS = mod2imp mod2osis osis2mod tei2mod vs2osisref vs2osisreftxt mod2vpl \ - mkfastmod vpl2mod imp2vs installmgr xml2gbs imp2gbs addld imp2ld +bin_PROGRAMS = mod2imp mod2osis osis2mod tei2mod vs2osisref vs2osisreftxt \ + mod2vpl mkfastmod vpl2mod imp2vs installmgr xml2gbs imp2gbs imp2ld if HAVE_LIBZ diff --git a/utilities/Makefile.in b/utilities/Makefile.in index e305d52..88e720e 100644 --- a/utilities/Makefile.in +++ b/utilities/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,23 +83,24 @@ target_triplet = @target@ noinst_PROGRAMS = cipherraw$(EXEEXT) lexdump$(EXEEXT) \ stepdump$(EXEEXT) step2vpl$(EXEEXT) gbfidx$(EXEEXT) \ modwrite$(EXEEXT) addvs$(EXEEXT) emptyvss$(EXEEXT) \ - addgb$(EXEEXT) genbookutil$(EXEEXT) treeidxutil$(EXEEXT) + addgb$(EXEEXT) genbookutil$(EXEEXT) treeidxutil$(EXEEXT) \ + addld$(EXEEXT) bin_PROGRAMS = mod2imp$(EXEEXT) mod2osis$(EXEEXT) osis2mod$(EXEEXT) \ tei2mod$(EXEEXT) vs2osisref$(EXEEXT) vs2osisreftxt$(EXEEXT) \ mod2vpl$(EXEEXT) mkfastmod$(EXEEXT) vpl2mod$(EXEEXT) \ imp2vs$(EXEEXT) installmgr$(EXEEXT) xml2gbs$(EXEEXT) \ - imp2gbs$(EXEEXT) addld$(EXEEXT) imp2ld$(EXEEXT) \ - $(am__EXEEXT_1) -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/bcppmake/Makefile.am $(srcdir)/kylixmake/Makefile.am \ - $(srcdir)/perl/Makefile.am + imp2gbs$(EXEEXT) imp2ld$(EXEEXT) $(am__EXEEXT_1) +DIST_COMMON = $(srcdir)/bcppmake/Makefile.am \ + $(srcdir)/kylixmake/Makefile.am $(srcdir)/perl/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp subdir = utilities ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ - $(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -69,6 +114,10 @@ am_addgb_OBJECTS = addgb.$(OBJEXT) addgb_OBJECTS = $(am_addgb_OBJECTS) addgb_LDADD = $(LDADD) addgb_DEPENDENCIES = $(top_builddir)/lib/libsword.la +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am_addld_OBJECTS = addld.$(OBJEXT) addld_OBJECTS = $(am_addld_OBJECTS) addld_LDADD = $(LDADD) @@ -173,28 +222,58 @@ am_xml2gbs_OBJECTS = xml2gbs.$(OBJEXT) xml2gbs_OBJECTS = $(am_xml2gbs_OBJECTS) xml2gbs_LDADD = $(LDADD) xml2gbs_DEPENDENCIES = $(top_builddir)/lib/libsword.la +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) \ $(cipherraw_SOURCES) $(emptyvss_SOURCES) $(gbfidx_SOURCES) \ $(genbookutil_SOURCES) $(imp2gbs_SOURCES) $(imp2ld_SOURCES) \ @@ -215,18 +294,44 @@ DIST_SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) \ $(stepdump_SOURCES) $(tei2mod_SOURCES) $(treeidxutil_SOURCES) \ $(vpl2mod_SOURCES) $(vs2osisref_SOURCES) \ $(vs2osisreftxt_SOURCES) $(xml2gbs_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -258,7 +363,9 @@ am__relativize = \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -268,6 +375,8 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@ +CLUCENE2_LIBS = @CLUCENE2_LIBS@ CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@ CLUCENE_LIBS = @CLUCENE_LIBS@ CPP = @CPP@ @@ -293,9 +402,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GENCCODE = @GENCCODE@ -GENCMN = @GENCMN@ -GENRB = @GENRB@ GREP = @GREP@ ICU_CONFIG = @ICU_CONFIG@ ICU_IOLIBS = @ICU_IOLIBS@ @@ -316,6 +422,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -328,20 +435,29 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGDATA = @PKGDATA@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@ +SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@ +SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@ +SWORD_VERSION_NANO = @SWORD_VERSION_NANO@ +SWORD_VERSION_NUM = @SWORD_VERSION_NUM@ +SWORD_VERSION_STR = @SWORD_VERSION_STR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -378,7 +494,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -406,7 +521,7 @@ with_icusword = @with_icusword@ with_zlib = @with_zlib@ AUTOMAKE_OPTIONS = 1.6 SUBDIRS = diatheke -INCLUDES = -I $(top_srcdir)/include $(am__append_1) +AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1) LDADD = $(top_builddir)/lib/libsword.la @HAVE_LIBZ_FALSE@ZLIBPROG = @HAVE_LIBZ_TRUE@ZLIBPROG = mod2zmod @@ -489,6 +604,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/bcppmake/Makefile.am $(srcdir)/kylixmake/Makefile.am $(srcdir)/perl/Makefile.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -500,14 +616,19 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -528,7 +649,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -550,87 +672,114 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -addgb$(EXEEXT): $(addgb_OBJECTS) $(addgb_DEPENDENCIES) + +addgb$(EXEEXT): $(addgb_OBJECTS) $(addgb_DEPENDENCIES) $(EXTRA_addgb_DEPENDENCIES) @rm -f addgb$(EXEEXT) - $(CXXLINK) $(addgb_OBJECTS) $(addgb_LDADD) $(LIBS) -addld$(EXEEXT): $(addld_OBJECTS) $(addld_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(addgb_OBJECTS) $(addgb_LDADD) $(LIBS) + +addld$(EXEEXT): $(addld_OBJECTS) $(addld_DEPENDENCIES) $(EXTRA_addld_DEPENDENCIES) @rm -f addld$(EXEEXT) - $(CXXLINK) $(addld_OBJECTS) $(addld_LDADD) $(LIBS) -addvs$(EXEEXT): $(addvs_OBJECTS) $(addvs_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(addld_OBJECTS) $(addld_LDADD) $(LIBS) + +addvs$(EXEEXT): $(addvs_OBJECTS) $(addvs_DEPENDENCIES) $(EXTRA_addvs_DEPENDENCIES) @rm -f addvs$(EXEEXT) - $(CXXLINK) $(addvs_OBJECTS) $(addvs_LDADD) $(LIBS) -cipherraw$(EXEEXT): $(cipherraw_OBJECTS) $(cipherraw_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(addvs_OBJECTS) $(addvs_LDADD) $(LIBS) + +cipherraw$(EXEEXT): $(cipherraw_OBJECTS) $(cipherraw_DEPENDENCIES) $(EXTRA_cipherraw_DEPENDENCIES) @rm -f cipherraw$(EXEEXT) - $(CXXLINK) $(cipherraw_OBJECTS) $(cipherraw_LDADD) $(LIBS) -emptyvss$(EXEEXT): $(emptyvss_OBJECTS) $(emptyvss_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(cipherraw_OBJECTS) $(cipherraw_LDADD) $(LIBS) + +emptyvss$(EXEEXT): $(emptyvss_OBJECTS) $(emptyvss_DEPENDENCIES) $(EXTRA_emptyvss_DEPENDENCIES) @rm -f emptyvss$(EXEEXT) - $(CXXLINK) $(emptyvss_OBJECTS) $(emptyvss_LDADD) $(LIBS) -gbfidx$(EXEEXT): $(gbfidx_OBJECTS) $(gbfidx_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(emptyvss_OBJECTS) $(emptyvss_LDADD) $(LIBS) + +gbfidx$(EXEEXT): $(gbfidx_OBJECTS) $(gbfidx_DEPENDENCIES) $(EXTRA_gbfidx_DEPENDENCIES) @rm -f gbfidx$(EXEEXT) - $(CXXLINK) $(gbfidx_OBJECTS) $(gbfidx_LDADD) $(LIBS) -genbookutil$(EXEEXT): $(genbookutil_OBJECTS) $(genbookutil_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(gbfidx_OBJECTS) $(gbfidx_LDADD) $(LIBS) + +genbookutil$(EXEEXT): $(genbookutil_OBJECTS) $(genbookutil_DEPENDENCIES) $(EXTRA_genbookutil_DEPENDENCIES) @rm -f genbookutil$(EXEEXT) - $(CXXLINK) $(genbookutil_OBJECTS) $(genbookutil_LDADD) $(LIBS) -imp2gbs$(EXEEXT): $(imp2gbs_OBJECTS) $(imp2gbs_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(genbookutil_OBJECTS) $(genbookutil_LDADD) $(LIBS) + +imp2gbs$(EXEEXT): $(imp2gbs_OBJECTS) $(imp2gbs_DEPENDENCIES) $(EXTRA_imp2gbs_DEPENDENCIES) @rm -f imp2gbs$(EXEEXT) - $(CXXLINK) $(imp2gbs_OBJECTS) $(imp2gbs_LDADD) $(LIBS) -imp2ld$(EXEEXT): $(imp2ld_OBJECTS) $(imp2ld_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(imp2gbs_OBJECTS) $(imp2gbs_LDADD) $(LIBS) + +imp2ld$(EXEEXT): $(imp2ld_OBJECTS) $(imp2ld_DEPENDENCIES) $(EXTRA_imp2ld_DEPENDENCIES) @rm -f imp2ld$(EXEEXT) - $(CXXLINK) $(imp2ld_OBJECTS) $(imp2ld_LDADD) $(LIBS) -imp2vs$(EXEEXT): $(imp2vs_OBJECTS) $(imp2vs_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(imp2ld_OBJECTS) $(imp2ld_LDADD) $(LIBS) + +imp2vs$(EXEEXT): $(imp2vs_OBJECTS) $(imp2vs_DEPENDENCIES) $(EXTRA_imp2vs_DEPENDENCIES) @rm -f imp2vs$(EXEEXT) - $(CXXLINK) $(imp2vs_OBJECTS) $(imp2vs_LDADD) $(LIBS) -installmgr$(EXEEXT): $(installmgr_OBJECTS) $(installmgr_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(imp2vs_OBJECTS) $(imp2vs_LDADD) $(LIBS) + +installmgr$(EXEEXT): $(installmgr_OBJECTS) $(installmgr_DEPENDENCIES) $(EXTRA_installmgr_DEPENDENCIES) @rm -f installmgr$(EXEEXT) - $(CXXLINK) $(installmgr_OBJECTS) $(installmgr_LDADD) $(LIBS) -lexdump$(EXEEXT): $(lexdump_OBJECTS) $(lexdump_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(installmgr_OBJECTS) $(installmgr_LDADD) $(LIBS) + +lexdump$(EXEEXT): $(lexdump_OBJECTS) $(lexdump_DEPENDENCIES) $(EXTRA_lexdump_DEPENDENCIES) @rm -f lexdump$(EXEEXT) - $(LINK) $(lexdump_OBJECTS) $(lexdump_LDADD) $(LIBS) -mkfastmod$(EXEEXT): $(mkfastmod_OBJECTS) $(mkfastmod_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(lexdump_OBJECTS) $(lexdump_LDADD) $(LIBS) + +mkfastmod$(EXEEXT): $(mkfastmod_OBJECTS) $(mkfastmod_DEPENDENCIES) $(EXTRA_mkfastmod_DEPENDENCIES) @rm -f mkfastmod$(EXEEXT) - $(CXXLINK) $(mkfastmod_OBJECTS) $(mkfastmod_LDADD) $(LIBS) -mod2imp$(EXEEXT): $(mod2imp_OBJECTS) $(mod2imp_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(mkfastmod_OBJECTS) $(mkfastmod_LDADD) $(LIBS) + +mod2imp$(EXEEXT): $(mod2imp_OBJECTS) $(mod2imp_DEPENDENCIES) $(EXTRA_mod2imp_DEPENDENCIES) @rm -f mod2imp$(EXEEXT) - $(CXXLINK) $(mod2imp_OBJECTS) $(mod2imp_LDADD) $(LIBS) -mod2osis$(EXEEXT): $(mod2osis_OBJECTS) $(mod2osis_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(mod2imp_OBJECTS) $(mod2imp_LDADD) $(LIBS) + +mod2osis$(EXEEXT): $(mod2osis_OBJECTS) $(mod2osis_DEPENDENCIES) $(EXTRA_mod2osis_DEPENDENCIES) @rm -f mod2osis$(EXEEXT) - $(CXXLINK) $(mod2osis_OBJECTS) $(mod2osis_LDADD) $(LIBS) -mod2vpl$(EXEEXT): $(mod2vpl_OBJECTS) $(mod2vpl_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(mod2osis_OBJECTS) $(mod2osis_LDADD) $(LIBS) + +mod2vpl$(EXEEXT): $(mod2vpl_OBJECTS) $(mod2vpl_DEPENDENCIES) $(EXTRA_mod2vpl_DEPENDENCIES) @rm -f mod2vpl$(EXEEXT) - $(CXXLINK) $(mod2vpl_OBJECTS) $(mod2vpl_LDADD) $(LIBS) -mod2zmod$(EXEEXT): $(mod2zmod_OBJECTS) $(mod2zmod_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(mod2vpl_OBJECTS) $(mod2vpl_LDADD) $(LIBS) + +mod2zmod$(EXEEXT): $(mod2zmod_OBJECTS) $(mod2zmod_DEPENDENCIES) $(EXTRA_mod2zmod_DEPENDENCIES) @rm -f mod2zmod$(EXEEXT) - $(CXXLINK) $(mod2zmod_OBJECTS) $(mod2zmod_LDADD) $(LIBS) -modwrite$(EXEEXT): $(modwrite_OBJECTS) $(modwrite_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(mod2zmod_OBJECTS) $(mod2zmod_LDADD) $(LIBS) + +modwrite$(EXEEXT): $(modwrite_OBJECTS) $(modwrite_DEPENDENCIES) $(EXTRA_modwrite_DEPENDENCIES) @rm -f modwrite$(EXEEXT) - $(CXXLINK) $(modwrite_OBJECTS) $(modwrite_LDADD) $(LIBS) -osis2mod$(EXEEXT): $(osis2mod_OBJECTS) $(osis2mod_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(modwrite_OBJECTS) $(modwrite_LDADD) $(LIBS) + +osis2mod$(EXEEXT): $(osis2mod_OBJECTS) $(osis2mod_DEPENDENCIES) $(EXTRA_osis2mod_DEPENDENCIES) @rm -f osis2mod$(EXEEXT) - $(CXXLINK) $(osis2mod_OBJECTS) $(osis2mod_LDADD) $(LIBS) -step2vpl$(EXEEXT): $(step2vpl_OBJECTS) $(step2vpl_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(osis2mod_OBJECTS) $(osis2mod_LDADD) $(LIBS) + +step2vpl$(EXEEXT): $(step2vpl_OBJECTS) $(step2vpl_DEPENDENCIES) $(EXTRA_step2vpl_DEPENDENCIES) @rm -f step2vpl$(EXEEXT) - $(CXXLINK) $(step2vpl_OBJECTS) $(step2vpl_LDADD) $(LIBS) -stepdump$(EXEEXT): $(stepdump_OBJECTS) $(stepdump_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(step2vpl_OBJECTS) $(step2vpl_LDADD) $(LIBS) + +stepdump$(EXEEXT): $(stepdump_OBJECTS) $(stepdump_DEPENDENCIES) $(EXTRA_stepdump_DEPENDENCIES) @rm -f stepdump$(EXEEXT) - $(CXXLINK) $(stepdump_OBJECTS) $(stepdump_LDADD) $(LIBS) -tei2mod$(EXEEXT): $(tei2mod_OBJECTS) $(tei2mod_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(stepdump_OBJECTS) $(stepdump_LDADD) $(LIBS) + +tei2mod$(EXEEXT): $(tei2mod_OBJECTS) $(tei2mod_DEPENDENCIES) $(EXTRA_tei2mod_DEPENDENCIES) @rm -f tei2mod$(EXEEXT) - $(CXXLINK) $(tei2mod_OBJECTS) $(tei2mod_LDADD) $(LIBS) -treeidxutil$(EXEEXT): $(treeidxutil_OBJECTS) $(treeidxutil_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(tei2mod_OBJECTS) $(tei2mod_LDADD) $(LIBS) + +treeidxutil$(EXEEXT): $(treeidxutil_OBJECTS) $(treeidxutil_DEPENDENCIES) $(EXTRA_treeidxutil_DEPENDENCIES) @rm -f treeidxutil$(EXEEXT) - $(CXXLINK) $(treeidxutil_OBJECTS) $(treeidxutil_LDADD) $(LIBS) -vpl2mod$(EXEEXT): $(vpl2mod_OBJECTS) $(vpl2mod_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(treeidxutil_OBJECTS) $(treeidxutil_LDADD) $(LIBS) + +vpl2mod$(EXEEXT): $(vpl2mod_OBJECTS) $(vpl2mod_DEPENDENCIES) $(EXTRA_vpl2mod_DEPENDENCIES) @rm -f vpl2mod$(EXEEXT) - $(CXXLINK) $(vpl2mod_OBJECTS) $(vpl2mod_LDADD) $(LIBS) -vs2osisref$(EXEEXT): $(vs2osisref_OBJECTS) $(vs2osisref_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(vpl2mod_OBJECTS) $(vpl2mod_LDADD) $(LIBS) + +vs2osisref$(EXEEXT): $(vs2osisref_OBJECTS) $(vs2osisref_DEPENDENCIES) $(EXTRA_vs2osisref_DEPENDENCIES) @rm -f vs2osisref$(EXEEXT) - $(CXXLINK) $(vs2osisref_OBJECTS) $(vs2osisref_LDADD) $(LIBS) -vs2osisreftxt$(EXEEXT): $(vs2osisreftxt_OBJECTS) $(vs2osisreftxt_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(vs2osisref_OBJECTS) $(vs2osisref_LDADD) $(LIBS) + +vs2osisreftxt$(EXEEXT): $(vs2osisreftxt_OBJECTS) $(vs2osisreftxt_DEPENDENCIES) $(EXTRA_vs2osisreftxt_DEPENDENCIES) @rm -f vs2osisreftxt$(EXEEXT) - $(CXXLINK) $(vs2osisreftxt_OBJECTS) $(vs2osisreftxt_LDADD) $(LIBS) -xml2gbs$(EXEEXT): $(xml2gbs_OBJECTS) $(xml2gbs_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(vs2osisreftxt_OBJECTS) $(vs2osisreftxt_LDADD) $(LIBS) + +xml2gbs$(EXEEXT): $(xml2gbs_OBJECTS) $(xml2gbs_DEPENDENCIES) $(EXTRA_xml2gbs_DEPENDENCIES) @rm -f xml2gbs$(EXEEXT) - $(CXXLINK) $(xml2gbs_OBJECTS) $(xml2gbs_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(xml2gbs_OBJECTS) $(xml2gbs_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -667,46 +816,46 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml2gbs.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -715,22 +864,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -745,57 +897,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -811,12 +918,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -828,15 +930,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -845,6 +943,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -881,13 +994,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -925,10 +1035,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1011,24 +1126,22 @@ ps-am: uninstall-am: uninstall-binPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS clean-generic clean-libtool \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/utilities/addcomment.cpp b/utilities/addcomment.cpp index b764774..46de6a7 100644 --- a/utilities/addcomment.cpp +++ b/utilities/addcomment.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * addcomment.cpp - + * + * $Id: addcomment.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/addgb.cpp b/utilities/addgb.cpp index 41c99fa..5aef649 100644 --- a/utilities/addgb.cpp +++ b/utilities/addgb.cpp @@ -1,5 +1,11 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * addgb.cpp - Utility to create/modify a GenBook module by adding a single + * entry + * + * $Id: addgb.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -81,7 +87,7 @@ int main(int argc, char **argv) { // Do some initialization stuff TreeKeyIdx *treeKey = new TreeKeyIdx(argv[2]); - if (treeKey->Error()) { + if (treeKey->popError()) { treeKey->create(argv[2]); delete treeKey; treeKey = new TreeKeyIdx(argv[2]); diff --git a/utilities/addld.cpp b/utilities/addld.cpp index 0f9a0f2..7e43361 100644 --- a/utilities/addld.cpp +++ b/utilities/addld.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * addld.cpp - Utility to build/modify an LD module by adding a single entry + * + * $Id: addld.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -79,8 +84,8 @@ int main(int argc, char **argv) { if (fourbyte) { char buffer[1048576]; //this is the max size of any entry RawLD4 mod(argv[2]); // open our datapath with our RawText driver. - SWKey* key = mod.CreateKey(); - key->Persist(1); // the magical setting + SWKey* key = mod.createKey(); + key->setPersist(true); // the magical setting // Set our VerseKey *key = argv[3]; @@ -99,8 +104,8 @@ int main(int argc, char **argv) { #ifndef EXCLUDEZLIB char buffer[1048576]; //this is the max size of any entry zLD mod(argv[2], 0, 0, 200, new ZipCompress()); // open our datapath with our RawText driver. - SWKey* key = mod.CreateKey(); - key->Persist(1); // the magical setting + SWKey* key = mod.createKey(); + key->setPersist(true); // the magical setting // Set our VerseKey *key = argv[3]; @@ -122,8 +127,8 @@ int main(int argc, char **argv) { else { char buffer[65536]; //this is the max size of any entry RawLD mod(argv[2]); // open our datapath with our RawText driver. - SWKey* key = mod.CreateKey(); - key->Persist(1); // the magical setting + SWKey* key = mod.createKey(); + key->setPersist(true); // the magical setting // Set our VerseKey *key = argv[3]; @@ -145,8 +150,8 @@ int main(int argc, char **argv) { // Do some initialization stuff if (fourbyte) { RawLD4 mod(argv[2]); // open our datapath with our RawText driver. - SWKey* key = mod.CreateKey(); - key->Persist(1); // the magical setting + SWKey* key = mod.createKey(); + key->setPersist(true); // the magical setting *key = argv[3]; mod.setKey(*key); @@ -155,8 +160,8 @@ int main(int argc, char **argv) { } else if (compress) { zLD mod(argv[2]); // open our datapath with our RawText driver. - SWKey* key = mod.CreateKey(); - key->Persist(1); // the magical setting + SWKey* key = mod.createKey(); + key->setPersist(true); // the magical setting *key = argv[3]; mod.setKey(*key); @@ -166,8 +171,8 @@ int main(int argc, char **argv) { } else { RawLD mod(argv[2]); // open our datapath with our RawText driver. - SWKey* key = mod.CreateKey(); - key->Persist(1); // the magical setting + SWKey* key = mod.createKey(); + key->setPersist(true); // the magical setting *key = argv[3]; mod.setKey(*key); diff --git a/utilities/addvs.cpp b/utilities/addvs.cpp index 02f34fa..270154b 100644 --- a/utilities/addvs.cpp +++ b/utilities/addvs.cpp @@ -1,5 +1,11 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * addvs.cpp - Utility to create/modify a VerseKey module by adding a single + * entry + * + * $Id: addvs.cpp 2893 2013-07-16 03:07:02Z scribe $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -60,21 +66,21 @@ int main(int argc, char **argv) { char buffer[65536]; //this is the max size of any entry RawText * mod = new RawText(argv[2]); // open our datapath with our RawText driver. VerseKey *vkey = new VerseKey; - vkey->Headings(1); - vkey->AutoNormalize(0); - vkey->Persist(1); // the magical setting + vkey->setIntros(true); + vkey->setAutoNormalize(false); + vkey->setPersist(true); // the magical setting *vkey = argv[3]; // Set our VerseKey mod->setKey(*vkey); - if (!vkey->Chapter()) { + if (!vkey->getChapter()) { // bad hack >> // 0:0 is Book intro // (chapter):0 is Chapter intro // // 0:2 is Module intro // 0:1 is Testament intro - int backstep = vkey->Verse(); - vkey->Verse(0); + int backstep = vkey->getVerse(); + vkey->setVerse(0); *mod -= backstep; // << bad hack @@ -90,19 +96,19 @@ int main(int argc, char **argv) { mod->setEntry(buffer, entrysize); // save text to module at current position } else { - ListKey listkey = vkey->ParseVerseList(argv[3], "Gen1:1", true); + ListKey listkey = vkey->parseVerseList(argv[3], "Gen1:1", true); int i; bool havefirst = false; VerseKey firstverse; - for (i = 0; i < listkey.Count(); i++) { - VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.GetElement(i)); + for (i = 0; i < listkey.getCount(); i++) { + VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.getElement(i)); if (element) { - mod->Key(element->LowerBound()); - VerseKey finalkey = element->UpperBound(); - std::cout << (const char*)mod->Key() << "-" << (const char*)finalkey << std::endl; + mod->setKey(element->getLowerBound()); + VerseKey finalkey = element->getUpperBound(); + std::cout << mod->getKeyText() << "-" << (const char*)finalkey << std::endl; if (!havefirst) { havefirst = true; - firstverse = mod->Key(); + firstverse = *mod->getKey(); FILE *infile; // case: add from text file //Open our data file and read its contents into the buffer @@ -116,22 +122,22 @@ int main(int argc, char **argv) { std::cout << "f" << (const char*)firstverse << std::endl; (*mod)++; } - while (mod->Key() <= finalkey) { - std::cout << (const char*)mod->Key() << std::endl; + while (*mod->getKey() <= finalkey) { + std::cout << mod->getKeyText() << std::endl; *(SWModule*)mod << &firstverse; (*mod)++; } } else { if (havefirst) { - mod->Key(*listkey.GetElement(i)); + mod->setKey(*listkey.getElement(i)); *(SWModule*)mod << &firstverse; - std::cout << (const char*)mod->Key() << std::endl; + std::cout << mod->getKeyText() << std::endl; } else { - mod->Key(*listkey.GetElement(i)); + mod->setKey(*listkey.getElement(i)); havefirst = true; - firstverse = mod->Key(); + firstverse = *mod->getKey(); FILE *infile; // case: add from text file //Open our data file and read its contents into the buffer @@ -163,15 +169,15 @@ int main(int argc, char **argv) { else if (!strcmp(argv[1], "-d") && argc == 4) { RawText mod(argv[2]); // open our datapath with our RawText driver. VerseKey *vkey = new VerseKey; - vkey->Headings(1); - vkey->AutoNormalize(0); - vkey->Persist(1); // the magical setting + vkey->setIntros(true); + vkey->setAutoNormalize(false); + vkey->setPersist(true); // the magical setting // Set our VerseKey mod.setKey(*vkey); *vkey = argv[3]; - if (!vkey->Chapter()) + if (!vkey->getChapter()) { // bad hack >> // 0:0 is Book intro @@ -179,8 +185,8 @@ int main(int argc, char **argv) { // // 0:2 is Module intro // 0:1 is Testament intro - int backstep = vkey->Verse(); - vkey->Verse(0); + int backstep = vkey->getVerse(); + vkey->setVerse(0); mod -= backstep; // << bad hack } diff --git a/utilities/bcppmake/addgb.bpr b/utilities/bcppmake/addgb.bpr index 058e82c..6a6900d 100644 --- a/utilities/bcppmake/addgb.bpr +++ b/utilities/bcppmake/addgb.bpr @@ -123,4 +123,4 @@ ActiveLang= ProjectLang= RootDir= - + \ No newline at end of file diff --git a/utilities/bcppmake/addld.bpr b/utilities/bcppmake/addld.bpr index 7d17bdc..802a76b 100644 --- a/utilities/bcppmake/addld.bpr +++ b/utilities/bcppmake/addld.bpr @@ -123,4 +123,4 @@ ActiveLang= ProjectLang= RootDir= - + \ No newline at end of file diff --git a/utilities/bcppmake/addvs.bpr b/utilities/bcppmake/addvs.bpr index 23efd76..9b65752 100644 --- a/utilities/bcppmake/addvs.bpr +++ b/utilities/bcppmake/addvs.bpr @@ -123,4 +123,4 @@ ActiveLang= ProjectLang= RootDir= - + \ No newline at end of file diff --git a/utilities/bcppmake/diatheke.bpr b/utilities/bcppmake/diatheke.bpr index bd8ad36..5d3e4a6 100644 --- a/utilities/bcppmake/diatheke.bpr +++ b/utilities/bcppmake/diatheke.bpr @@ -32,7 +32,7 @@ - + @@ -79,10 +79,11 @@ ProductVersion=1.0.0.0 Comments= [HistoryLists\hlIncludePath] -Count=3 -Item0=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include -Item1=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include\ -Item2=..\diatheke;$(BCB)\include;$(BCB)\include\vcl +Count=4 +Item0=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\include\internal\regex +Item1=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include +Item2=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include\ +Item3=..\diatheke;$(BCB)\include;$(BCB)\include\vcl [HistoryLists\hlLibraryPath] Count=2 diff --git a/utilities/bcppmake/tei2mod.bpr b/utilities/bcppmake/tei2mod.bpr index 0691824..bec58cd 100644 --- a/utilities/bcppmake/tei2mod.bpr +++ b/utilities/bcppmake/tei2mod.bpr @@ -120,4 +120,4 @@ ActiveLang= ProjectLang= RootDir= - + \ No newline at end of file diff --git a/utilities/bcppmake/treeidxutil.bpr b/utilities/bcppmake/treeidxutil.bpr index c04ef8c..8c3caed 100644 --- a/utilities/bcppmake/treeidxutil.bpr +++ b/utilities/bcppmake/treeidxutil.bpr @@ -119,4 +119,4 @@ ActiveLang= ProjectLang= RootDir= - + \ No newline at end of file diff --git a/utilities/bcppmake/utilities.bpg b/utilities/bcppmake/utilities.bpg index 6d2e99b..4ce943f 100644 --- a/utilities/bcppmake/utilities.bpg +++ b/utilities/bcppmake/utilities.bpg @@ -13,8 +13,7 @@ PROJECTS = icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib \ osis2mod.exe mod2zmod.exe mod2vpl.exe mkfastmod.exe imp2gbs.exe vpl2mod.exe \ imp2ld.exe imp2vs.exe mod2imp.exe cipherraw.exe step2vpl.exe stepdump.exe \ mod2osis.exe vs2osisref.exe vs2osisreftxt.exe xml2gbs.exe diatheke.exe \ - installmgr.exe tei2mod.exe emptyvss.exe addgb.exe addld.exe addvs.exe \ - treeidxutil.exe + installmgr.exe tei2mod.exe addgb.exe addld.exe addvs.exe treeidxutil.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ @@ -123,10 +122,6 @@ addvs.exe: addvs.bpr $(ROOT)\bin\bpr2mak $** $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak -emptyvss.exe: emptyvss.bpr - $(ROOT)\bin\bpr2mak $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - vs2osisreftxt.exe: vs2osisreftxt.bpr $(ROOT)\bin\bpr2mak $** $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak diff --git a/utilities/bcppmake/vs2osisreftxt.bpr b/utilities/bcppmake/vs2osisreftxt.bpr index 70049a2..9615797 100644 --- a/utilities/bcppmake/vs2osisreftxt.bpr +++ b/utilities/bcppmake/vs2osisreftxt.bpr @@ -119,4 +119,4 @@ ActiveLang= ProjectLang= RootDir= - + \ No newline at end of file diff --git a/utilities/cipherraw.cpp b/utilities/cipherraw.cpp index 1d0df9c..a8de3e7 100644 --- a/utilities/cipherraw.cpp +++ b/utilities/cipherraw.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * cipherraw.cpp - Utility to encipher a raw (uncompressed) module + * + * $Id: cipherraw.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -79,18 +84,18 @@ int main(int argc, char **argv) { write(oxfd[1], &lzoffset, 4); write(oxfd[1], &lzsize, 2); - key.AutoNormalize(0); - key.Headings(1); - for (key.Index(0); (!key.Error()); key++) { - rawdrv->findOffset(key.Testament(), key.Index(), &offset, &size); + key.setAutoNormalize(false); + key.setIntros(true); + for (key.setIndex(0); (!key.popError()); key++) { + rawdrv->findOffset(key.getTestament(), key.getIndex(), &offset, &size); printf("%s: OLD offset: %ld; size: %d\n", (const char *)key, offset, size); if ((offset == loffset) && (size == lsize)) { printf("using previous offset,size %d\n", size); - offset = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR); + offset = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR); printf("%ld %ld %d \n", offset, lzoffset, lzsize); - write(oxfd[key.Testament() - 1], &lzoffset, 4); - write(oxfd[key.Testament() - 1], &lzsize, 2); + write(oxfd[key.getTestament() - 1], &lzoffset, 4); + write(oxfd[key.getTestament() - 1], &lzsize, 2); } else { lsize = size; @@ -98,22 +103,22 @@ int main(int argc, char **argv) { if (size) { SWBuf tmpbuf; - rawdrv->readText(key.Testament(), offset, size, tmpbuf); + rawdrv->readText(key.getTestament(), offset, size, tmpbuf); zobj->Buf(tmpbuf.c_str(), size); unsigned long ulSize = size; zobj->cipherBuf(&ulSize); size = (unsigned int)ulSize; } - offset = lseek(ofd[key.Testament() - 1], 0, SEEK_CUR); - tmpoff = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR); + offset = lseek(ofd[key.getTestament() - 1], 0, SEEK_CUR); + tmpoff = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR); printf("%s: (%ld) NEW offset: %ld; size: %d\n", (const char *)key, tmpoff, offset, size); - write(oxfd[key.Testament() - 1], &offset, 4); + write(oxfd[key.getTestament() - 1], &offset, 4); unsigned long ulSize = size; if (size) - write(ofd[key.Testament() - 1], zobj->cipherBuf(&ulSize), size); + write(ofd[key.getTestament() - 1], zobj->cipherBuf(&ulSize), size); size = (unsigned int)ulSize; lzoffset = offset; - write(oxfd[key.Testament() - 1], &size, 2); + write(oxfd[key.getTestament() - 1], &size, 2); lzsize = size; } } diff --git a/utilities/diatheke/Makefile.in b/utilities/diatheke/Makefile.in index 6d35bb2..c76a8c5 100644 --- a/utilities/diatheke/Makefile.in +++ b/utilities/diatheke/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,15 +81,16 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ bin_PROGRAMS = diatheke$(EXEEXT) -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/cgi/Makefile.am +DIST_COMMON = $(srcdir)/cgi/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp $(noinst_HEADERS) \ + README subdir = utilities/diatheke ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ - $(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -60,28 +105,77 @@ am_diatheke_OBJECTS = diatheke.$(OBJEXT) corediatheke.$(OBJEXT) \ diatheke_OBJECTS = $(am_diatheke_OBJECTS) diatheke_LDADD = $(LDADD) diatheke_DEPENDENCIES = $(top_builddir)/lib/libsword.la +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(diatheke_SOURCES) DIST_SOURCES = $(diatheke_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -91,6 +185,8 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@ +CLUCENE2_LIBS = @CLUCENE2_LIBS@ CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@ CLUCENE_LIBS = @CLUCENE_LIBS@ CPP = @CPP@ @@ -116,9 +212,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GENCCODE = @GENCCODE@ -GENCMN = @GENCMN@ -GENRB = @GENRB@ GREP = @GREP@ ICU_CONFIG = @ICU_CONFIG@ ICU_IOLIBS = @ICU_IOLIBS@ @@ -139,6 +232,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -151,20 +245,29 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGDATA = @PKGDATA@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@ +SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@ +SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@ +SWORD_VERSION_NANO = @SWORD_VERSION_NANO@ +SWORD_VERSION_NUM = @SWORD_VERSION_NUM@ +SWORD_VERSION_STR = @SWORD_VERSION_STR@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -201,7 +304,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -263,6 +365,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/cgi/Makefile.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -274,14 +377,19 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -302,7 +410,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -315,9 +424,10 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -diatheke$(EXEEXT): $(diatheke_OBJECTS) $(diatheke_DEPENDENCIES) + +diatheke$(EXEEXT): $(diatheke_OBJECTS) $(diatheke_DEPENDENCIES) $(EXTRA_diatheke_DEPENDENCIES) @rm -f diatheke$(EXEEXT) - $(CXXLINK) $(diatheke_OBJECTS) $(diatheke_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(diatheke_OBJECTS) $(diatheke_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -334,25 +444,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlcgi.Po@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -360,26 +470,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -391,15 +490,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -408,6 +503,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -459,10 +569,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -546,19 +661,19 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/utilities/diatheke/README b/utilities/diatheke/README index 5f1a793..7421a6d 100644 --- a/utilities/diatheke/README +++ b/utilities/diatheke/README @@ -1,4 +1,4 @@ -Diatheke Suite release 4.0 +Diatheke Suite by Chris Little This suite is intended for use with libraries and modules from @@ -7,10 +7,10 @@ the SWORD Project, available at http://www.crosswire.org/ The latest versions of this suite and its components are available at http://www.crosswire.org/sword/diatheke -Version 4.0 of this suite consists of the following components: +This suite consists of the following components: -Diatheke 4.0 - a command line utility, good for lots of stuff -Diatheke/CGI 4.0 - a PERL CGI module interface to Diatheke 4.0 +Diatheke - a command line utility, good for lots of stuff +Diatheke/CGI - a PERL CGI module interface to Diatheke 4.0 -------------------------------------------------------------------- INSTALLING Diatheke/CGI @@ -47,29 +47,36 @@ default page to create a custom index.html for your users. ---------------------------------------------------------------------- VERSION HISTORY -4.0 July 8, 2001. +4.6 July 16, 2013 + Updated for Sword 1.7.0. + +4.5 + +4.0 July 8, 2001 Updated to Sword 1.5.2 with innumerable bug fixes. Now builds properly for Win32 using VC++. Diatheke/Tcl and HANDiatheke were omitted, for the moment from this release, but are still available in the CVS. -3.0 March 31, 2001. +3.0 March 31, 2001 Self-generating HTML page for the lazy (Diatheke/CGI). Localization support. (Diatheke and Diatheke/CGI). -2.5 Now supports ThML. Numerous bugfixes. December 10, 2000. +2.5 December 10, 2000 + Now supports ThML. Numerous bugfixes. Includes Diatheke 3.0, Diatheke/CGI 3.0, Diatheke/Tcl 3.0, and HANDiatheke 3.0 (initial version, but version-synced) -2.0 First public release, including Diatheke 2.0, Diatheke/CGI - 2.0, and Diatheke/Tcl 2.5. October 23, 1999. +2.0 October 23, 1999. + First public release, including Diatheke 2.0, Diatheke/CGI + 2.0, and Diatheke/Tcl 2.5. ----------------------------------------------------------------------- COPYRIGHT The Diatheke Suite and its components, Diatheke, Diatheke/CGI, and -Diatheke/Tcl are Copyright 1999, 2000, 2001 by CrossWire Bible Society. -HANDiatheke is Copyright 2000, 2001 by CrossWire Bible Society. +Diatheke/Tcl are Copyright 1999-2013 by CrossWire Bible Society. +HANDiatheke is Copyright 2000-2001 by CrossWire Bible Society. The Diatheke Suite and all of its components are licensed through the GNU General Public License and are intended for free distribution. See http://www.gnu.org/copyleft/gpl.html for details. diff --git a/utilities/diatheke/cgi/dia-def.pl b/utilities/diatheke/cgi/dia-def.pl index 206aaa6..d50ef9b 100755 --- a/utilities/diatheke/cgi/dia-def.pl +++ b/utilities/diatheke/cgi/dia-def.pl @@ -1,21 +1,25 @@ #!/usr/bin/perl -# * -# * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) -# * CrossWire Bible Society -# * P. O. Box 2528 -# * Tempe, AZ 85280-2528 -# * -# * This program is free software; you can redistribute it and/or modify it -# * under the terms of the GNU General Public License as published by the -# * Free Software Foundation version 2. -# * -# * This program is distributed in the hope that it will be useful, but -# * WITHOUT ANY WARRANTY; without even the implied warranty of -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# * General Public License for more details. -# * - +#****************************************************************************** +# +# dia-def.pl - +# +# $Id: dia-def.pl 2841 2013-06-29 10:58:08Z chrislit $ +# +# Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) +# CrossWire Bible Society +# P. O. Box 2528 +# Tempe, AZ 85280-2528 +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation version 2. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# #change this variable to hostname of your server @values = split(/\&/,$ENV{'QUERY_STRING'}); diff --git a/utilities/diatheke/cgi/diatheke.pl b/utilities/diatheke/cgi/diatheke.pl index 8150d2c..c15bdf6 100755 --- a/utilities/diatheke/cgi/diatheke.pl +++ b/utilities/diatheke/cgi/diatheke.pl @@ -11,21 +11,26 @@ ### server: http://www.crosswire.org/swordweb/ ######################################################################## -# * -# * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) -# * CrossWire Bible Society -# * P. O. Box 2528 -# * Tempe, AZ 85280-2528 -# * -# * This program is free software; you can redistribute it and/or modify it -# * under the terms of the GNU General Public License as published by the -# * Free Software Foundation version 2. -# * -# * This program is distributed in the hope that it will be useful, but -# * WITHOUT ANY WARRANTY; without even the implied warranty of -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# * General Public License for more details. -# * +#****************************************************************************** +# +# diatheke.pl - +# +# $Id: diatheke.pl 2841 2013-06-29 10:58:08Z chrislit $ +# +# Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) +# CrossWire Bible Society +# P. O. Box 2528 +# Tempe, AZ 85280-2528 +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation version 2. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# # Typical Linux/Unix settings diff --git a/utilities/diatheke/corediatheke.cpp b/utilities/diatheke/corediatheke.cpp index 9b4a8f1..37f9448 100644 --- a/utilities/diatheke/corediatheke.cpp +++ b/utilities/diatheke/corediatheke.cpp @@ -1,9 +1,10 @@ -// Diatheke 4.2 by Chris Little -// Copyright 1999-2009 by CrossWire Bible Society -// http://www.crosswire.org/sword/diatheke - -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * corediatheke.cpp - + * + * $Id: corediatheke.cpp 2931 2013-07-31 13:07:26Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -19,6 +20,11 @@ * */ +/****************************************************************************** + * Diatheke by Chris Little + * http://www.crosswire.org/sword/diatheke + */ + #include "corediatheke.h" #include #include @@ -64,40 +70,40 @@ void systemquery(const char * key, ostream* output){ if (types) *output << "Biblical Texts:\n"; for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { target = it->second; - if (!strcmp(target->Type(), "Biblical Texts")) { - if (names) *output << target->Name(); + if (!strcmp(target->getType(), "Biblical Texts")) { + if (names) *output << target->getName(); if (names && descriptions) *output << " : "; - if (descriptions) *output << target->Description(); + if (descriptions) *output << target->getDescription(); *output << endl; } } if (types) *output << "Commentaries:\n"; for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { target = it->second; - if (!strcmp(target->Type(), "Commentaries")) { - if (names) *output << target->Name(); + if (!strcmp(target->getType(), "Commentaries")) { + if (names) *output << target->getName(); if (names && descriptions) *output << " : "; - if (descriptions) *output << target->Description(); + if (descriptions) *output << target->getDescription(); *output << endl; } } if (types) *output << "Dictionaries:\n"; for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { target = it->second; - if (!strcmp(target->Type(), "Lexicons / Dictionaries")) { - if (names) *output << target->Name(); + if (!strcmp(target->getType(), "Lexicons / Dictionaries")) { + if (names) *output << target->getName(); if (names && descriptions) *output << " : "; - if (descriptions) *output << target->Description(); + if (descriptions) *output << target->getDescription(); *output << endl; } } if (types) *output << "Generic books:\n"; for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { target = it->second; - if (!strcmp(target->Type(), "Generic Books")) { - if (names) *output << target->Name(); + if (!strcmp(target->getType(), "Generic Books")) { + if (names) *output << target->getName(); if (names && descriptions) *output << " : "; - if (descriptions) *output << target->Description(); + if (descriptions) *output << target->getDescription(); *output << endl; } } @@ -105,7 +111,7 @@ void systemquery(const char * key, ostream* output){ } } -void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAIN, unsigned char outputencoding = ENC_UTF8, unsigned long optionfilters = 0, unsigned char searchtype = ST_NONE, const char *range = 0, const char *text = 0, const char *locale = 0, const char *ref = 0, ostream* output = &cout, const char *script = 0, signed short variants = 0) { +void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAIN, unsigned char outputencoding = ENC_UTF8, unsigned long optionfilters = 0, unsigned char searchtype = ST_NONE, const char *range = 0, const char *text = 0, const char *locale = 0, const char *ref = 0, ostream* output = &cout, const char *script = 0, signed char variants = 0) { static DiathekeMgr manager(NULL, NULL, false, outputencoding, outputformat, ((OP_BIDI & optionfilters) == OP_BIDI), ((OP_ARSHAPE & optionfilters) == OP_ARSHAPE)); @@ -140,14 +146,14 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI return; } target = (*it).second; - SWKey *p = target->CreateKey(); + SWKey *p = target->createKey(); VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p); if (!parser) { delete p; parser = new VerseKey(); } - if ((sit = manager.config->Sections.find((*it).second->Name())) != manager.config->Sections.end()) { + if ((sit = manager.config->Sections.find((*it).second->getName())) != manager.config->Sections.end()) { if ((eit = (*sit).second.find("SourceType")) != (*sit).second.end()) { if (!::stricmp((char *)(*eit).second.c_str(), "GBF")) inputformat = FMT_GBF; @@ -180,7 +186,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << "Other"; } *output << ";"; - *output << target->Type(); + *output << target->getType(); *output << ";"; delete parser; return; @@ -188,83 +194,53 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI if (searchtype) querytype = QT_SEARCH; - else if (!strcmp(target->Type(), "Biblical Texts")) + else if (!strcmp(target->getType(), "Biblical Texts")) querytype = QT_BIBLE; - else if (!strcmp(target->Type(), "Commentaries")) + else if (!strcmp(target->getType(), "Commentaries")) querytype = QT_COMM; - else if (!strcmp(target->Type(), "Lexicons / Dictionaries")) + else if (!strcmp(target->getType(), "Lexicons / Dictionaries")) querytype = QT_LD; - else if (!strcmp(target->Type(), "Generic Books")) + else if (!strcmp(target->getType(), "Generic Books")) querytype = QT_LD; - if (optionfilters & OP_FOOTNOTES) - manager.setGlobalOption("Footnotes","On"); - else - manager.setGlobalOption("Footnotes","Off"); - if (optionfilters & OP_HEADINGS) - manager.setGlobalOption("Headings","On"); - else - manager.setGlobalOption("Headings","Off"); - if (optionfilters & OP_STRONGS) - manager.setGlobalOption("Strong's Numbers","On"); - else - manager.setGlobalOption("Strong's Numbers","Off"); - if (optionfilters & OP_MORPH) - manager.setGlobalOption("Morphological Tags","On"); - else - manager.setGlobalOption("Morphological Tags","Off"); - if (optionfilters & OP_CANTILLATION) - manager.setGlobalOption("Hebrew Cantillation","On"); - else - manager.setGlobalOption("Hebrew Cantillation","Off"); - if (optionfilters & OP_HEBREWPOINTS) - manager.setGlobalOption("Hebrew Vowel Points","On"); - else - manager.setGlobalOption("Hebrew Vowel Points","Off"); - if (optionfilters & OP_GREEKACCENTS) - manager.setGlobalOption("Greek Accents","On"); - else - manager.setGlobalOption("Greek Accents","Off"); - if (optionfilters & OP_LEMMAS) - manager.setGlobalOption("Lemmas","On"); - else - manager.setGlobalOption("Lemmas","Off"); - if (optionfilters & OP_SCRIPREF) - manager.setGlobalOption("Cross-references","On"); - else - manager.setGlobalOption("Cross-references","Off"); - if (optionfilters & OP_RED) - manager.setGlobalOption("Words of Christ in Red","On"); - else - manager.setGlobalOption("Words of Christ in Red","Off"); - if (optionfilters & OP_VARIANTS && variants) { - if (variants == -1) - manager.setGlobalOption("Variants", "All Readings"); - else if (variants == 1) - manager.setGlobalOption("Variants", "Secondary Readings"); + manager.setGlobalOption("Footnotes", (optionfilters & OP_FOOTNOTES) ? "On": "Off"); + manager.setGlobalOption("Headings", (optionfilters & OP_HEADINGS) ? "On": "Off"); + manager.setGlobalOption("Strong's Numbers", (optionfilters & OP_STRONGS) ? "On": "Off"); + manager.setGlobalOption("Morphological Tags", (optionfilters & OP_MORPH) ? "On": "Off"); + manager.setGlobalOption("Hebrew Cantillation", (optionfilters & OP_CANTILLATION) ? "On": "Off"); + manager.setGlobalOption("Hebrew Vowel Points", (optionfilters & OP_HEBREWPOINTS) ? "On": "Off"); + manager.setGlobalOption("Greek Accents", (optionfilters & OP_GREEKACCENTS) ? "On": "Off"); + manager.setGlobalOption("Lemmas", (optionfilters & OP_LEMMAS) ? "On": "Off"); + manager.setGlobalOption("Cross-references", (optionfilters & OP_SCRIPREF) ? "On": "Off"); + manager.setGlobalOption("Words of Christ in Red", (optionfilters & OP_REDLETTERWORDS) ? "On": "Off"); + manager.setGlobalOption("Arabic Vowel Points", (optionfilters & OP_ARABICPOINTS) ? "On": "Off"); + manager.setGlobalOption("Glosses", (optionfilters & OP_GLOSSES) ? "On": "Off"); + manager.setGlobalOption("Transliterated Forms", (optionfilters & OP_XLIT) ? "On": "Off"); + manager.setGlobalOption("Enumerations", (optionfilters & OP_ENUM) ? "On": "Off"); + + manager.setGlobalOption("Transliteration", (optionfilters & OP_TRANSLITERATOR && script) ? script : "Off"); + + + if ((optionfilters & OP_VARIANTS) && variants) { + if (variants == -1) + manager.setGlobalOption("Textual Variants", "All Readings"); + else if (variants == 1) + manager.setGlobalOption("Textual Variants", "Secondary Reading"); } else - manager.setGlobalOption("Variants", "Primary Readings"); + manager.setGlobalOption("Textual Variants", "Primary Reading"); - if (optionfilters & OP_TRANSLITERATOR && script) - manager.setGlobalOption("Transliteration", script); - else - manager.setGlobalOption("Transliteration", "Off"); - if (optionfilters & OP_ARABICPOINTS) - manager.setGlobalOption("Arabic Vowel Points","On"); - else - manager.setGlobalOption("Arabic Vowel Points","Off"); if (querytype == QT_SEARCH) { //this test is just to determine if we've got SWKeys or VerseKeys - if (!strcmp(target->Type(), "Biblical Texts")) + if (!strcmp(target->getType(), "Biblical Texts")) querytype = QT_BIBLE; - else if (!strcmp(target->Type(), "Commentaries")) + else if (!strcmp(target->getType(), "Commentaries")) querytype = QT_BIBLE; - else if (!strcmp(target->Type(), "Lexicons / Dictionaries")) + else if (!strcmp(target->getType(), "Lexicons / Dictionaries")) querytype = QT_LD; - else if (!strcmp(target->Type(), "Generic Books")) + else if (!strcmp(target->getType(), "Generic Books")) querytype = QT_LD; //do search stuff @@ -277,13 +253,13 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << "\"-- "; if (range) { - ListKey scope = parser->ParseVerseList(range, "Gen 1:1", true); - listkey = target->Search(ref, st, REG_ICASE, &scope); + ListKey scope = parser->parseVerseList(range, "Gen 1:1", true); + listkey = target->search(ref, st, REG_ICASE, &scope); } - else listkey = target->Search(ref, st, REG_ICASE); + else listkey = target->search(ref, st, REG_ICASE); if (strlen((const char*)listkey)) { - if (!listkey.Error()) { + if (!listkey.popError()) { if (outputformat == FMT_CGI) *output << ""; if (querytype == QT_BIBLE) { *parser = listkey; @@ -293,7 +269,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI if (outputformat == FMT_CGI) *output << ""; } listkey++; - while (!listkey.Error()) { + while (!listkey.popError()) { *output << " ; "; if (outputformat == FMT_CGI) *output << ""; if (querytype == QT_BIBLE) { @@ -307,17 +283,17 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << " -- "; char *temp = new char[10]; - sprintf(temp, "%u", listkey.Count()); + sprintf(temp, "%u", listkey.getCount()); *output << temp; delete [] temp; *output << " matches total ("; - *output << target->Name(); + *output << target->getName(); *output << ")\n"; } else { *output << "none ("; - *output << target->Name(); + *output << target->getName(); *output << ")\n"; } } @@ -327,7 +303,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI target->setKey(ref); - const char * text = (const char *) *target; + SWBuf text = target->renderText(); if (outputformat == FMT_RTF) { *output << "{\\rtf1\\ansi{\\fonttbl{\\f0\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f1\\fdecor\\fprq2 "; @@ -337,13 +313,13 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << "Times New Roman"; *output << ";}}"; } - else if (outputformat == FMT_HTML) { + else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML) { *output << ""; } - if (strlen(text)) { - *output << (char*)target->KeyText(); - if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { + if (text.length()) { + *output << (char*)target->getKeyText(); + if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { *output << ": "; @@ -355,7 +331,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << ": "; } *output << text; - if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { + if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { *output << ""; } else if (outputformat == FMT_RTF) { @@ -363,7 +339,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI } *output << "("; - *output << target->Name(); + *output << target->getName(); *output << ")\n"; } @@ -376,14 +352,14 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI else if (querytype == QT_BIBLE || querytype == QT_COMM) { //do commentary/Bible stuff - if ((sit = manager.config->Sections.find((*it).second->Name())) != manager.config->Sections.end()) { + if ((sit = manager.config->Sections.find((*it).second->getName())) != manager.config->Sections.end()) { if ((eit = (*sit).second.find("Font")) != (*sit).second.end()) { font = (char *)(*eit).second.c_str(); if (strlen(font) == 0) font = 0; } } - listkey = parser->ParseVerseList(ref, "Gen1:1", true); + listkey = parser->parseVerseList(ref, "Gen1:1", true); int i; if (outputformat == FMT_RTF) { @@ -394,18 +370,18 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << "Times New Roman"; *output << ";}{\\f7\\froman\\fcharset2\\fprq2 Symbol;}}"; } - else if (outputformat == FMT_HTML) { + else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML) { *output << ""; } - for (i = 0; i < listkey.Count() && maxverses; i++) { - VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.GetElement(i)); + for (i = 0; i < listkey.getCount() && maxverses; i++) { + VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.getElement(i)); if (element && element->isBoundSet()) { - target->Key(element->LowerBound()); - *parser = element->UpperBound(); - while (maxverses && target->Key() <= *parser) { - *output << (char*)target->KeyText(); - if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { + target->setKey(element->getLowerBound()); + *parser = element->getUpperBound(); + while (maxverses && *target->getKey() <= *parser) { + *output << (char*)target->getKeyText(); + if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { *output << ": "; @@ -416,15 +392,15 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI else { *output << ": "; } - *output << (const char*)*target; - if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { + *output << target->renderText(); + if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { *output << ""; } else if (outputformat == FMT_RTF) { *output << "}"; } - if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) + if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) *output << "
"; else if (outputformat == FMT_OSIS) *output << ""; @@ -435,16 +411,16 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << "\n"; - if (target->Key() == *parser) + if (*target->getKey() == *parser) break; maxverses--; (*target)++; } } else { - target->Key(*listkey.GetElement(i)); - *output << (char*)target->KeyText(); - if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { + target->setKey(*listkey.getElement(i)); + *output << (char*)target->getKeyText(); + if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { *output << ": "; @@ -455,15 +431,15 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI else { *output << ": "; } - *output << (const char*)*target; - if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { + *output << target->renderText(); + if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { *output << ""; } else if (outputformat == FMT_RTF) { *output << "}"; } - if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) + if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) *output << "
"; else if (outputformat == FMT_OSIS) *output << ""; @@ -478,7 +454,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI } *output << "("; - *output << target->Name(); + *output << target->getName(); *output << ")\n"; if (outputformat == FMT_RTF) { diff --git a/utilities/diatheke/corediatheke.h b/utilities/diatheke/corediatheke.h index 2ad4801..833825e 100644 --- a/utilities/diatheke/corediatheke.h +++ b/utilities/diatheke/corediatheke.h @@ -1,9 +1,10 @@ -// Diatheke 4.2 by Chris Little -// Copyright 1999-2009 by CrossWire Bible Society -// http://www.crosswire.org/sword/diatheke - -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * corediatheke.h - + * + * $Id: corediatheke.h 2900 2013-07-16 07:48:52Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -19,6 +20,11 @@ * */ +/****************************************************************************** + * Diatheke 4.5 by Chris Little + * http://www.crosswire.org/sword/diatheke + */ + #include #include @@ -34,26 +40,30 @@ #define OP_NONE 0 #define OP_STRONGS 1 -#define OP_FOOTNOTES 2 -#define OP_HEADINGS 4 -#define OP_MORPH 8 -#define OP_CANTILLATION 16 -#define OP_HEBREWPOINTS 32 -#define OP_GREEKACCENTS 64 -#define OP_TRANSLITERATOR 128 -#define OP_LEMMAS 256 -#define OP_SCRIPREF 512 -#define OP_ARSHAPE 1024 -#define OP_BIDI 2048 -#define OP_VARIANTS 4096 -#define OP_RED 8192 -#define OP_ARABICPOINTS 16384 +#define OP_FOOTNOTES (1<<1) +#define OP_HEADINGS (1<<2) +#define OP_MORPH (1<<3) +#define OP_CANTILLATION (1<<4) +#define OP_HEBREWPOINTS (1<<5) +#define OP_GREEKACCENTS (1<<6) +#define OP_TRANSLITERATOR (1<<7) +#define OP_LEMMAS (1<<8) +#define OP_SCRIPREF (1<<9) +#define OP_ARSHAPE (1<<10) +#define OP_BIDI (1<<11) +#define OP_VARIANTS (1<<12) +#define OP_REDLETTERWORDS (1<<13) +#define OP_ARABICPOINTS (1<<14) +#define OP_GLOSSES (1<<15) +#define OP_XLIT (1<<16) +#define OP_ENUM (1<<17) + #define ST_NONE 0 -#define ST_REGEX 1 //0 -#define ST_PHRASE 2 // -1 +#define ST_REGEX 1 // 0 +#define ST_PHRASE 2 // -1 #define ST_MULTIWORD 3 // -2 using namespace std; int hasalpha (char * string); -void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *range, const char *text, const char *locale, const char *ref, ostream* output, const char* script, signed short variants); +void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *range, const char *text, const char *locale, const char *ref, ostream* output, const char* script, signed char variants); diff --git a/utilities/diatheke/diafiltmgr.cpp b/utilities/diatheke/diafiltmgr.cpp index 83b41ef..be091a9 100644 --- a/utilities/diatheke/diafiltmgr.cpp +++ b/utilities/diatheke/diafiltmgr.cpp @@ -1,7 +1,10 @@ /****************************************************************************** - * diafiltmgr.cpp * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * diafiltmgr.cpp - DiathekeFilterMgr + * + * $Id: diafiltmgr.cpp 2843 2013-06-29 11:22:27Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -62,22 +64,22 @@ DiathekeFilterMgr::~DiathekeFilterMgr() { } void DiathekeFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) { - switch (module->Markup()) { + switch (module->getMarkup()) { case FMT_THML: if (fromthml) - module->AddRenderFilter(fromthml); + module->addRenderFilter(fromthml); break; case FMT_GBF: if (fromgbf) - module->AddRenderFilter(fromgbf); + module->addRenderFilter(fromgbf); break; case FMT_PLAIN: if (fromplain) - module->AddRenderFilter(fromplain); + module->addRenderFilter(fromplain); break; case FMT_OSIS: if (fromosis) - module->AddRenderFilter(fromosis); + module->addRenderFilter(fromosis); break; } EncodingFilterMgr::AddRenderFilters(module, section); @@ -97,19 +99,19 @@ char DiathekeFilterMgr::Markup(char mark) { CreateFilters(markup); for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++) - switch (module->second->Markup()) { + switch (module->second->getMarkup()) { case FMT_THML: if (oldthml != fromthml) { if (oldthml) { if (!fromthml) { - module->second->RemoveRenderFilter(oldthml); + module->second->removeRenderFilter(oldthml); } else { - module->second->ReplaceRenderFilter(oldthml, fromthml); + module->second->replaceRenderFilter(oldthml, fromthml); } } else if (fromthml) { - module->second->AddRenderFilter(fromthml); + module->second->addRenderFilter(fromthml); } } break; @@ -117,14 +119,14 @@ char DiathekeFilterMgr::Markup(char mark) { if (oldgbf != fromgbf) { if (oldgbf) { if (!fromgbf) { - module->second->RemoveRenderFilter(oldgbf); + module->second->removeRenderFilter(oldgbf); } else { - module->second->ReplaceRenderFilter(oldgbf, fromgbf); + module->second->replaceRenderFilter(oldgbf, fromgbf); } } else if (fromgbf) { - module->second->AddRenderFilter(fromgbf); + module->second->addRenderFilter(fromgbf); } break; } @@ -132,14 +134,14 @@ char DiathekeFilterMgr::Markup(char mark) { if (oldplain != fromplain) { if (oldplain) { if (!fromplain) { - module->second->RemoveRenderFilter(oldplain); + module->second->removeRenderFilter(oldplain); } else { - module->second->ReplaceRenderFilter(oldplain, fromplain); + module->second->replaceRenderFilter(oldplain, fromplain); } } else if (fromplain) { - module->second->AddRenderFilter(fromplain); + module->second->addRenderFilter(fromplain); } break; } @@ -147,14 +149,14 @@ char DiathekeFilterMgr::Markup(char mark) { if (oldosis != fromosis) { if (oldosis) { if (!fromosis) { - module->second->RemoveRenderFilter(oldosis); + module->second->removeRenderFilter(oldosis); } else { - module->second->ReplaceRenderFilter(oldosis, fromosis); + module->second->replaceRenderFilter(oldosis, fromosis); } } else if (fromosis) { - module->second->AddRenderFilter(fromosis); + module->second->addRenderFilter(fromosis); } break; } @@ -200,7 +202,7 @@ void DiathekeFilterMgr::CreateFilters(char markup) { fromosis = NULL; break; case FMT_HTML: - fromplain = new PLAINHTML(); + fromplain = NULL; fromthml = new ThMLHTML(); fromgbf = new GBFHTML(); fromosis = NULL; diff --git a/utilities/diatheke/diafiltmgr.h b/utilities/diatheke/diafiltmgr.h index 0acdf1a..120fc6e 100644 --- a/utilities/diatheke/diafiltmgr.h +++ b/utilities/diatheke/diafiltmgr.h @@ -1,7 +1,10 @@ /****************************************************************************** - * diafiltmgr.h * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) + * diafiltmgr.h - DiathekeFilterMgr + * + * $Id: diafiltmgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/diatheke/diatheke.cpp b/utilities/diatheke/diatheke.cpp index 30add7b..159e3a5 100644 --- a/utilities/diatheke/diatheke.cpp +++ b/utilities/diatheke/diatheke.cpp @@ -1,9 +1,10 @@ -// Diatheke 4.5 by Chris Little -// Copyright 1999-2009 by CrossWire Bible Society -// http://www.crosswire.org/sword/diatheke - -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * diatheke.cpp - + * + * $Id: diatheke.cpp 2903 2013-07-16 11:11:18Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -19,6 +20,11 @@ * */ +/****************************************************************************** + * Diatheke 4.6 by Chris Little + * http://www.crosswire.org/sword/diatheke + */ + #include "corediatheke.h" #include "diathekemgr.h" #include "diafiltmgr.h" @@ -31,14 +37,14 @@ using std::cout; void printsyntax() { //if we got this far without exiting, something went wrong, so print syntax - fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.5\n"); - fprintf (stderr, "Copyright 1999-2009 by the CrossWire Bible Society\n"); + fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.6\n"); + fprintf (stderr, "Copyright 1999-2013 by the CrossWire Bible Society\n"); fprintf (stderr, "http://www.crosswire.org/sword/diatheke/\n"); - fprintf (stderr, "usage: \n "); - fprintf (stderr, "diatheke <-b module_name> [-s search_type] [-r search_range]\n"); - fprintf (stderr, "[-o option_filters] [-m maximum_verses] [-f output_format]\n"); - fprintf (stderr, "[-e output_encoding] [-t script] [-v variant#(-1=all|0|1)]\n"); - fprintf (stderr, "[-l locale] <-k query_key>\n"); + fprintf (stderr, "\n"); + fprintf (stderr, "usage: diatheke <-b module_name> [-s search_type] [-r search_range]\n"); + fprintf (stderr, " [-o option_filters] [-m maximum_verses] [-f output_format]\n"); + fprintf (stderr, " [-e output_encoding] [-v variant#(-1=all|0|1)]\n"); + fprintf (stderr, " [-l locale] <-k query_key>\n"); fprintf (stderr, "\n"); fprintf (stderr, "If is \"system\" you may use these system keys: \"modulelist\",\n"); fprintf (stderr, "\"modulelistnames\", and \"localelist\"."); @@ -48,15 +54,18 @@ void printsyntax() { fprintf (stderr, " f (Footnotes), m (Morphology), h (Section Headings),\n"); fprintf (stderr, " c (Cantillation), v (Hebrew Vowels), a (Greek Accents), p (Arabic Vowels)\n"); fprintf (stderr, " l (Lemmas), s (Scripture Crossrefs), r (Arabic Shaping),\n"); - fprintf (stderr, " b (Bi-Directional Reordering), x (Red Words of Christ)\n"); + fprintf (stderr, " b (Bi-Directional Reordering), w (Red Words of Christ),\n"); + fprintf (stderr, " g (Glosses/Ruby), e (Word Enumerations),\n"); + fprintf (stderr, " x (Encoded Transliterations), t (Algorithmic Transliterations via ICU)\n"); fprintf (stderr, "Maximum verses may be any integer value\n"); - fprintf (stderr, "Valid output_format values are: GBF, ThML, RTF, HTML, OSIS, CGI, and plain (def)\n"); + fprintf (stderr, "Valid output_format values are: GBF, ThML, RTF, HTML, HTMLHREF, XHTML, OSIS,\n"); + fprintf (stderr, " CGI, and plain (def)\n"); fprintf (stderr, "Valid output_encoding values are: Latin1, UTF8 (def), UTF16, HTML, and RTF\n"); fprintf (stderr, "Valid locale values depend on installed locales. en is default.\n"); fprintf (stderr, "The query_key must be the last argument because all following\n"); - fprintf (stderr, " arguments are added to the key.\n\n"); - + fprintf (stderr, " arguments are added to the key.\n"); + fprintf (stderr, "\n"); fprintf (stderr, "Example usage:\n"); fprintf (stderr, " diatheke -b KJV -o fmnx -k Jn 3:16\n"); fprintf (stderr, " diatheke -b WHNU -t Latin -o mn -k Mt 24\n"); @@ -68,9 +77,10 @@ int main(int argc, char **argv) int maxverses = -1; unsigned char outputformat = FMT_PLAIN, searchtype = ST_NONE, outputencoding = ENC_UTF8; unsigned long optionfilters = OP_NONE; - char *text = 0, *locale = 0, *ref = 0, *script = 0, *range = 0; + char *text = 0, *locale = 0, *ref = 0, *range = 0; + char script[] = "Latin"; // for the moment, only this target script is supported signed short variants = 0; - + char runquery = 0; // used to check that we have enough arguments to perform a legal query // (a querytype & text = 1 and a ref = 2) @@ -141,10 +151,18 @@ int main(int argc, char **argv) optionfilters |= OP_ARSHAPE; if (strchr(argv[i+1], 'b')) optionfilters |= OP_BIDI; - if (strchr(argv[i+1], 'x')) - optionfilters |= OP_RED; + if (strchr(argv[i+1], 'w')) + optionfilters |= OP_REDLETTERWORDS; if (strchr(argv[i+1], 'p')) optionfilters |= OP_ARABICPOINTS; + if (strchr(argv[i+1], 'g')) + optionfilters |= OP_GLOSSES; + if (strchr(argv[i+1], 'x')) + optionfilters |= OP_XLIT; + if (strchr(argv[i+1], 'e')) + optionfilters |= OP_ENUM; + if (strchr(argv[i+1], 't')) + optionfilters |= OP_TRANSLITERATOR; i++; } } @@ -170,6 +188,10 @@ int main(int argc, char **argv) outputformat = FMT_HTML; i++; } + else if (!::stricmp("xhtml", argv[i+1])) { + outputformat = FMT_XHTML; + i++; + } else if (!::stricmp("rtf", argv[i+1])) { outputformat = FMT_RTF; i++; @@ -226,6 +248,7 @@ int main(int argc, char **argv) i++; } } + /* else if (!::stricmp("-t", argv[i])) { if (i+1 <= argc) { script = argv[i+1]; @@ -233,6 +256,7 @@ int main(int argc, char **argv) i++; } } + */ } diff --git a/utilities/diatheke/diatheke.sln b/utilities/diatheke/diatheke.sln new file mode 100644 index 0000000..9d360da --- /dev/null +++ b/utilities/diatheke/diatheke.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diatheke", "diatheke.vcxproj", "{891A765C-5503-4FED-B427-7AE1413DB264}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.ActiveCfg = Debug|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.Build.0 = Debug|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.ActiveCfg = Release|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/utilities/diatheke/diatheke.vcproj b/utilities/diatheke/diatheke.vcproj deleted file mode 100644 index 3aa55b9..0000000 --- a/utilities/diatheke/diatheke.vcproj +++ /dev/null @@ -1,709 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/diatheke/diatheke.vcxproj b/utilities/diatheke/diatheke.vcxproj new file mode 100644 index 0000000..7f698c1 --- /dev/null +++ b/utilities/diatheke/diatheke.vcxproj @@ -0,0 +1,198 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {891A765C-5503-4FED-B427-7AE1413DB264} + + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\Debug\ + .\Debug\ + true + .\Release\ + .\Release\ + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + .\Debug/diatheke.tlb + + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + .\Debug/diatheke.pch + .\Debug/ + .\Debug/ + .\Debug/ + true + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies) + .\Debug/diatheke.exe + true + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + .\Debug/diatheke.pdb + Console + false + + + MachineX86 + false + + + true + .\Debug/diatheke.bsc + + + + + .\Release/diatheke.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/diatheke.pch + .\Release/ + .\Release/ + .\Release/ + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies) + .\Release/diatheke.exe + true + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + .\Release/diatheke.pdb + Console + false + + + MachineX86 + + + true + .\Release/diatheke.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/utilities/diatheke/diathekemgr.cpp b/utilities/diatheke/diathekemgr.cpp index 93351c0..a64b570 100644 --- a/utilities/diatheke/diathekemgr.cpp +++ b/utilities/diatheke/diathekemgr.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * diathekemgr.cpp - DiathekeMgr + * + * $Id: diathekemgr.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -79,10 +84,10 @@ void DiathekeMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) #ifdef _ICU_ if (shape) { - module->AddRenderFilter(arshaping); + module->addRenderFilter(arshaping); } if (bidi && rtl) { - module->AddRenderFilter(bidireorder); + module->addRenderFilter(bidireorder); } #endif SWMgr::AddRenderFilters(module, section); @@ -103,7 +108,7 @@ void DiathekeMgr::AddGlobalOptions (SWModule * module, ConfigEntMap & section, SWMgr::AddGlobalOptions(module, section, start, end); #ifdef _ICU_ - module->AddOptionFilter(transliterator); + module->addOptionFilter(transliterator); #endif }; diff --git a/utilities/diatheke/diathekemgr.h b/utilities/diatheke/diathekemgr.h index 6225bbf..4ad7367 100644 --- a/utilities/diatheke/diathekemgr.h +++ b/utilities/diatheke/diathekemgr.h @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * diathekemgr.h - DiathekeMgr + * + * $Id: diathekemgr.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/diatheke/gbfcgi.cpp b/utilities/diatheke/gbfcgi.cpp index 5112c46..3c8ef00 100644 --- a/utilities/diatheke/gbfcgi.cpp +++ b/utilities/diatheke/gbfcgi.cpp @@ -1,11 +1,10 @@ /*************************************************************************** - * gbfcgi.cpp - GBF to Diatheke/CGI format - * ------------------- - * begin : 2001-11-12 - * copyright : 2001 by CrossWire Bible Society * + * gbfcgi.cpp - GBF to Diatheke/CGI format * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfcgi.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,10 +22,26 @@ #include #include +#include #include "gbfcgi.h" SWORD_NAMESPACE_START +typedef std::map DualStringMap; + +namespace { + class MyUserData : public BasicFilterUserData { + public: + MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {} + DualStringMap properties; + }; +} + + +BasicFilterUserData *GBFCGI::createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); +} + GBFCGI::GBFCGI() { setTokenStart("<"); setTokenEnd(">"); @@ -64,7 +79,8 @@ GBFCGI::GBFCGI() { } -bool GBFCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData) { +bool GBFCGI::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *baseUserData) { + MyUserData *userData = (MyUserData *) baseUserData; unsigned long i; if (!substituteToken(buf, token)) { if (!strncmp(token, "WG", 2) || !strncmp(token, "WH", 2)) { // strong's numbers @@ -113,12 +129,12 @@ bool GBFCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData) else if (!strncmp(token, "RB", 2)) { buf += ""; - userData["hasFootnotePreTag"] = "true"; + userData->properties["hasFootnotePreTag"] = "true"; } else if (!strncmp(token, "RF", 2)) { - if(userData["hasFootnotePreTag"] == "true") { - userData["hasFootnotePreTag"] = "false"; + if(userData->properties["hasFootnotePreTag"] == "true") { + userData->properties["hasFootnotePreTag"] = "false"; buf += " "; } buf += " ("; diff --git a/utilities/diatheke/gbfcgi.h b/utilities/diatheke/gbfcgi.h index 71ded1a..3f21dd2 100644 --- a/utilities/diatheke/gbfcgi.h +++ b/utilities/diatheke/gbfcgi.h @@ -1,11 +1,10 @@ -/************************************************************************** - * gbfcgi.h - description - * ------------------- - * begin : 2001-11-12 - * copyright : 2001 by CrossWire Bible Society +/*************************************************************************** * + * gbfcgi.h - GBF to Diatheke/CGI format * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: gbfcgi.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,18 +24,16 @@ #define GBFCGI_H #include -#include #include -#include SWORD_NAMESPACE_START -typedef std::map DualStringMap; /** this filter converts GBF text to Diatheke/CGI format */ class GBFCGI : public SWBasicFilter { protected: - virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData); + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key); + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); public: GBFCGI (); }; diff --git a/utilities/diatheke/osiscgi.cpp b/utilities/diatheke/osiscgi.cpp index 86c7ed0..90949dd 100644 --- a/utilities/diatheke/osiscgi.cpp +++ b/utilities/diatheke/osiscgi.cpp @@ -1,11 +1,10 @@ /*************************************************************************** - * osiscgi.cpp - OSIS to Diatheke/CGI format - * ------------------- - * begin : 2003-10-21 - * copyright : 2003 by CrossWire Bible Society * + * osiscgi.cpp - OSISCGI: OSIS to Diatheke/CGI format filter * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osiscgi.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/diatheke/osiscgi.h b/utilities/diatheke/osiscgi.h index d64e805..13925d6 100644 --- a/utilities/diatheke/osiscgi.h +++ b/utilities/diatheke/osiscgi.h @@ -1,11 +1,10 @@ /*************************************************************************** - * osiscgi.h - OSIS to Diatheke/CGI format - * ------------------- - * begin : 2003-10-21 - * copyright : 2003 by CrossWire Bible Society * + * osiscgi.h - OSISCGI: OSIS to Diatheke/CGI format filter * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: osiscgi.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/diatheke/soap/sapouni.cgi b/utilities/diatheke/soap/sapouni.cgi index 5412d23..e44d891 100755 --- a/utilities/diatheke/soap/sapouni.cgi +++ b/utilities/diatheke/soap/sapouni.cgi @@ -1,7 +1,12 @@ #!/usr/bin/perl +# /**************************************************************************** # * -# * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +# * sapouni.cgi - CGI SOAP interface to diatheke +# * +# * $Id: sapouni.cgi 2833 2013-06-29 06:40:28Z chrislit $ +# * +# * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) # * CrossWire Bible Society # * P. O. Box 2528 # * Tempe, AZ 85280-2528 @@ -15,6 +20,7 @@ # * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # * General Public License for more details. # * +# */ #version 1.0 diff --git a/utilities/diatheke/soap/soapatheke.pl b/utilities/diatheke/soap/soapatheke.pl index c45fd98..5031feb 100755 --- a/utilities/diatheke/soap/soapatheke.pl +++ b/utilities/diatheke/soap/soapatheke.pl @@ -1,23 +1,25 @@ #!/usr/bin/perl -# * -# * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) -# * CrossWire Bible Society -# * P. O. Box 2528 -# * Tempe, AZ 85280-2528 -# * -# * This program is free software; you can redistribute it and/or modify it -# * under the terms of the GNU General Public License as published by the -# * Free Software Foundation version 2. -# * -# * This program is distributed in the hope that it will be useful, but -# * WITHOUT ANY WARRANTY; without even the implied warranty of -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# * General Public License for more details. -# * - - -## This is a test app and has no other purpose. +#****************************************************************************** +# +# soapatheke.pl - This is a demo SOAP app and has no other purpose. +# +# $Id: soapatheke.pl 2841 2013-06-29 10:58:08Z chrislit $ +# +# Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) +# CrossWire Bible Society +# P. O. Box 2528 +# Tempe, AZ 85280-2528 +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation version 2. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# use SOAP::Lite; diff --git a/utilities/diatheke/tcl/makebooklist.pl b/utilities/diatheke/tcl/makebooklist.pl old mode 100644 new mode 100755 index 26ef54f..5b24258 --- a/utilities/diatheke/tcl/makebooklist.pl +++ b/utilities/diatheke/tcl/makebooklist.pl @@ -1,109 +1,114 @@ -#!/bin/perl - -# Diatheke/Tcl 5.0 by Chris Little - -# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org) -# CrossWire Bible Society -# P. O. Box 2528 -# Tempe, AZ 85280-2528 -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation version 2. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -@booklist = `diatheke -b system -k modulelist`; - -open TCL, ">:utf8", "biblebot-diatheke-books.tcl"; - -print TCL "# Diatheke/Tcl 5.0 by Chris Little \n\n# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)\n# CrossWire Bible Society\n# P. O. Box 2528\n# Tempe, AZ 85280-2528\n#\n# This program is free software; you can redistribute it and/or modify it\n# under the terms of the GNU General Public License as published by the\n# Free Software Foundation version 2.\n#\n# This program is distributed in the hope that it will be useful, but\n# WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n# GNU General Public License for more details.\n\n"; - -foreach $line (@booklist) { - $line =~ s/[\r\n]+$//; - if ($line =~ /^Biblical Texts:/) { - $mode = "bible"; - } - elsif ($line =~ /^Commentaries:/) { - $mode = "comm"; - } - elsif ($line =~ /^Dictionaries:/) { - $mode = "dict"; - } - elsif ($line =~ /^Generic books:/) { - $mode = "genbook"; - } - elsif ($line =~ /^([^:]+) : (.+)/) { - $bookid = $1; - $bookdesc = $2; - if ($mode eq "bible") { - print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n global botnick chan bibver\n set bibver $bookid\n pub_lookup \$nick \$uhost \$hand \$channel \$arg\n}\n\n"; - print TCL "bind pub - !s$bookid setver_s$bookid\nproc setver_s$bookid {nick uhost hand channel arg} {\n global botnick chan bibver\n set bibver $bookid\n pub_lookups \$nick \$uhost \$hand \$channel \$arg\n}\n\n"; - - if ($count_bible != 0) { - $putservtext_bible .= ", "; - } - if (($count_bible != 0) && ($count_bible % 5 == 0)) { - $putservtext_bible .= "\n"; - } - $count_bible++; - $putservtext_bible .= "$bookdesc (!$bookid)"; - } - elsif ($mode eq "comm") { - print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n global botnick chan bibver\n set bibver $bookid\n pub_lookupc \$nick \$uhost \$hand \$channel \$arg\n}\n\n"; - - if ($count_comm != 0) { - $putservtext_comm .= ", "; - } - if (($count_comm != 0) && ($count_comm % 5 == 0)) { - $putservtext_comm .= "\n"; - } - $count_comm++; - $putservtext_comm .= "$bookdesc (!$bookid)"; - } - elsif ($mode eq "dict") { - print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n global botnick chan bibver\n set bibver $bookid\n pub_lookupd \$nick \$uhost \$hand \$channel \$arg\n}\n\n"; - - if ($count_dict != 0) { - $putservtext_dict .= ", "; - } - if (($count_dict != 0) && ($count_dict % 5 == 0)) { - $putservtext_dict .= "\n"; - } - $count_dict++; - $putservtext_dict .= "$bookdesc (!$bookid)"; - } - elsif ($mode eq "genbook") { - # do nothing until diatheke supports genbooks - } - } -} - -$putservtext_bible = "\n$putservtext_bible"; -$putservtext_bible =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs; -$putservtext_bible =~ s/, \"/,\"/gs; -$putservtext_bible .= "\"\n"; -$putservtext_bible = "\tputserv \"NOTICE \$nick :Bibles ($count_bible):$putservtext_bible"; -$putservtext_bible = "proc printBibles \{nick\} \{\n$putservtext_bible\}\n"; - -$putservtext_comm = "\n$putservtext_comm"; -$putservtext_comm =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs; -$putservtext_comm =~ s/, \"/,\"/gs; -$putservtext_comm .= "\"\n"; -$putservtext_comm = "\tputserv \"NOTICE \$nick :Commentaries ($count_comm):$putservtext_comm"; -$putservtext_comm = "proc printComms \{nick\} \{\n$putservtext_comm\}\n"; - -$putservtext_dict = "\n$putservtext_dict"; -$putservtext_dict =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs; -$putservtext_dict =~ s/, \"/,\"/gs; -$putservtext_dict .= "\"\n"; -$putservtext_dict = "\tputserv \"NOTICE \$nick :Dictionaries, Lexicons, & Daily Devotionals ($count_dict):$putservtext_dict"; -$putservtext_dict = "proc printDicts \{nick\} \{\n$putservtext_dict\}\n"; - -print TCL $putservtext_bible; -print TCL $putservtext_comm; -print TCL $putservtext_dict; - +#!/bin/perl + +#****************************************************************************** +# +# makebooklist.pl - +# +# $Id: makebooklist.pl 2841 2013-06-29 10:58:08Z chrislit $ +# +# Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) +# CrossWire Bible Society +# P. O. Box 2528 +# Tempe, AZ 85280-2528 +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation version 2. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# + +@booklist = `diatheke -b system -k modulelist`; + +open TCL, ">:utf8", "biblebot-diatheke-books.tcl"; + +print TCL "# Diatheke/Tcl 5.0 by Chris Little \n\n# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)\n# CrossWire Bible Society\n# P. O. Box 2528\n# Tempe, AZ 85280-2528\n#\n# This program is free software; you can redistribute it and/or modify it\n# under the terms of the GNU General Public License as published by the\n# Free Software Foundation version 2.\n#\n# This program is distributed in the hope that it will be useful, but\n# WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n# GNU General Public License for more details.\n\n"; + +foreach $line (@booklist) { + $line =~ s/[\r\n]+$//; + if ($line =~ /^Biblical Texts:/) { + $mode = "bible"; + } + elsif ($line =~ /^Commentaries:/) { + $mode = "comm"; + } + elsif ($line =~ /^Dictionaries:/) { + $mode = "dict"; + } + elsif ($line =~ /^Generic books:/) { + $mode = "genbook"; + } + elsif ($line =~ /^([^:]+) : (.+)/) { + $bookid = $1; + $bookdesc = $2; + if ($mode eq "bible") { + print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n global botnick chan bibver\n set bibver $bookid\n pub_lookup \$nick \$uhost \$hand \$channel \$arg\n}\n\n"; + print TCL "bind pub - !s$bookid setver_s$bookid\nproc setver_s$bookid {nick uhost hand channel arg} {\n global botnick chan bibver\n set bibver $bookid\n pub_lookups \$nick \$uhost \$hand \$channel \$arg\n}\n\n"; + + if ($count_bible != 0) { + $putservtext_bible .= ", "; + } + if (($count_bible != 0) && ($count_bible % 5 == 0)) { + $putservtext_bible .= "\n"; + } + $count_bible++; + $putservtext_bible .= "$bookdesc (!$bookid)"; + } + elsif ($mode eq "comm") { + print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n global botnick chan bibver\n set bibver $bookid\n pub_lookupc \$nick \$uhost \$hand \$channel \$arg\n}\n\n"; + + if ($count_comm != 0) { + $putservtext_comm .= ", "; + } + if (($count_comm != 0) && ($count_comm % 5 == 0)) { + $putservtext_comm .= "\n"; + } + $count_comm++; + $putservtext_comm .= "$bookdesc (!$bookid)"; + } + elsif ($mode eq "dict") { + print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n global botnick chan bibver\n set bibver $bookid\n pub_lookupd \$nick \$uhost \$hand \$channel \$arg\n}\n\n"; + + if ($count_dict != 0) { + $putservtext_dict .= ", "; + } + if (($count_dict != 0) && ($count_dict % 5 == 0)) { + $putservtext_dict .= "\n"; + } + $count_dict++; + $putservtext_dict .= "$bookdesc (!$bookid)"; + } + elsif ($mode eq "genbook") { + # do nothing until diatheke supports genbooks + } + } +} + +$putservtext_bible = "\n$putservtext_bible"; +$putservtext_bible =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs; +$putservtext_bible =~ s/, \"/,\"/gs; +$putservtext_bible .= "\"\n"; +$putservtext_bible = "\tputserv \"NOTICE \$nick :Bibles ($count_bible):$putservtext_bible"; +$putservtext_bible = "proc printBibles \{nick\} \{\n$putservtext_bible\}\n"; + +$putservtext_comm = "\n$putservtext_comm"; +$putservtext_comm =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs; +$putservtext_comm =~ s/, \"/,\"/gs; +$putservtext_comm .= "\"\n"; +$putservtext_comm = "\tputserv \"NOTICE \$nick :Commentaries ($count_comm):$putservtext_comm"; +$putservtext_comm = "proc printComms \{nick\} \{\n$putservtext_comm\}\n"; + +$putservtext_dict = "\n$putservtext_dict"; +$putservtext_dict =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs; +$putservtext_dict =~ s/, \"/,\"/gs; +$putservtext_dict .= "\"\n"; +$putservtext_dict = "\tputserv \"NOTICE \$nick :Dictionaries, Lexicons, & Daily Devotionals ($count_dict):$putservtext_dict"; +$putservtext_dict = "proc printDicts \{nick\} \{\n$putservtext_dict\}\n"; + +print TCL $putservtext_bible; +print TCL $putservtext_comm; +print TCL $putservtext_dict; + diff --git a/utilities/diatheke/thmlcgi.cpp b/utilities/diatheke/thmlcgi.cpp index 1bcc5ba..9b85c35 100644 --- a/utilities/diatheke/thmlcgi.cpp +++ b/utilities/diatheke/thmlcgi.cpp @@ -1,11 +1,10 @@ -/*************************************************************************** - * thmlcgi.cpp - ThML to Diatheke/CGI format - * ------------------- - * begin : 2001-11-12 - * copyright : 2001 by CrossWire Bible Society +/****************************************************************************** * + * thmlcgi.cpp - ThMLCGI: ThML to Diatheke/CGI format filter * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlcgi.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -23,11 +22,26 @@ #include #include -#include "thmlcgi.h" +#include #include +#include "thmlcgi.h" SWORD_NAMESPACE_START +typedef std::map DualStringMap; + +namespace { + class MyUserData : public BasicFilterUserData { + public: + MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {} + DualStringMap properties; + }; +} + +BasicFilterUserData *ThMLCGI::createUserData(const SWModule *module, const SWKey *key) { + return new MyUserData(module, key); +} + ThMLCGI::ThMLCGI() { setTokenStart("<"); setTokenEnd(">"); @@ -39,7 +53,8 @@ ThMLCGI::ThMLCGI() { } -bool ThMLCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData) { +bool ThMLCGI::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *baseUserData) { + MyUserData *userData = (MyUserData *) baseUserData; unsigned long i; if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution @@ -109,7 +124,7 @@ bool ThMLCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData } else if (!strncmp(token, "scripRef p", 10) || !strncmp(token, "scripRef v", 10)) { - userData["inscriptRef"] = "true"; + userData->properties["inscriptRef"] = "true"; buf += "John 3:16" else if (!strcmp(token, "scripRef")) { - userData["inscriptRef"] = "false"; + userData->properties["inscriptRef"] = "false"; // let's stop text from going to output - userData["suspendTextPassThru"] = "true"; + userData->properties["suspendTextPassThru"] = "true"; } // we've ended a scripRef else if (!strcmp(token, "/scripRef")) { - if (userData["inscriptRef"] == "true") { // like "John 3:16" - userData["inscriptRef"] = "false"; + if (userData->properties["inscriptRef"] == "true") { // like "John 3:16" + userData->properties["inscriptRef"] = "false"; buf += ""; } else { // like "John 3:16" buf += "properties["lastTextNode"].c_str(); while (*vref) { if (*vref == ' ') buf += '+'; else buf += *vref; vref++; } buf += "\">"; - buf += userData["lastTextNode"].c_str(); + buf += userData->properties["lastTextNode"].c_str(); // let's let text resume to output again - userData["suspendTextPassThru"] = "false"; + userData->properties["suspendTextPassThru"] = "false"; buf += ""; } } else if (!strncmp(token, "div class=\"sechead\"", 19)) { - userData["SecHead"] = "true"; + userData->properties["SecHead"] = "true"; buf += "
"; } else if (!strncmp(token, "div class=\"title\"", 19)) { - userData["SecHead"] = "true"; + userData->properties["SecHead"] = "true"; buf += "
"; } else if (!strncmp(token, "/div", 4)) { - if (userData["SecHead"] == "true") { + if (userData->properties["SecHead"] == "true") { buf += "
"; - userData["SecHead"] = "false"; + userData->properties["SecHead"] = "false"; } } diff --git a/utilities/diatheke/thmlcgi.h b/utilities/diatheke/thmlcgi.h index bfdee35..9380656 100644 --- a/utilities/diatheke/thmlcgi.h +++ b/utilities/diatheke/thmlcgi.h @@ -1,11 +1,10 @@ -/*************************************************************************** - * thmlcgi.h - OSIS to Diatheke/CGI format - * ------------------- - * begin : 2001-11-12 - * copyright : 2001 by CrossWire Bible Society +/****************************************************************************** * + * thmlcgi.h - ThMLCGI: ThML to Diatheke/CGI format filter * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: thmlcgi.h 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -25,18 +24,16 @@ #define THMLCGI_H #include -#include - #include SWORD_NAMESPACE_START -typedef std::map DualStringMap; /** this filter converts ThML text to Diatheke/CGI format */ class ThMLCGI : public SWBasicFilter { protected: - virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData); + virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key); + virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData); public: ThMLCGI(); }; diff --git a/utilities/emptyvss.cpp b/utilities/emptyvss.cpp index 705eb90..e4252f9 100644 --- a/utilities/emptyvss.cpp +++ b/utilities/emptyvss.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * emptyvss.cpp - Utility to list empty verses in a module + * + * $Id: emptyvss.cpp 2931 2013-07-31 13:07:26Z scribe $ + * + * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -62,15 +67,15 @@ int main(int argc, char **argv) { exit(-3); } - vkey->Headings(1); // turn on mod/testmnt/book/chap headings + vkey->setIntros(false); // turn on mod/testmnt/book/chap headings (*mod) = TOP; - while (!mod->Error()) { + while (!mod->popError()) { - if (vkey->Verse()) - if (!strlen ((const char *)(*mod))) - std::cout << *vkey << std::endl; - (*mod)++; + if (vkey->getVerse()) + if (!mod->renderText().length()) + std::cout << *vkey << std::endl; + (*mod)++; } } diff --git a/utilities/gbfidx.cpp b/utilities/gbfidx.cpp index 4dc6e65..8b1d1dd 100644 --- a/utilities/gbfidx.cpp +++ b/utilities/gbfidx.cpp @@ -1,9 +1,11 @@ /***************************************************************************** * - * This code reeks but works (at least for WEB). Good luck! + * gbfidx.cpp - This code reeks but works (at least for WEB). + * Good luck! * + * $Id: gbfidx.cpp 2833 2013-06-29 06:40:28Z chrislit $ * - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -61,9 +63,9 @@ int main(int argc, char **argv) openfiles(argv[1]); - testmnt = key1.Testament(); - num1 = key1.Chapter(); - num2 = key1.Verse(); + testmnt = key1.getTestament(); + num1 = key1.getChapter(); + num2 = key1.getVerse(); pos = 0; write(bfp, &pos, 4); /* Book offset for testament intros */ pos = 4; @@ -83,11 +85,11 @@ int main(int argc, char **argv) startflag = 1; } else { - if (num2 < key2.Verse()) { // new chapter - if (num1 <= key2.Chapter()) { // new book - key2.Verse(1); - key2.Chapter(1); - key2.Book(key2.Book()+1); + if (num2 < key2.getVerse()) { // new chapter + if (num1 <= key2.getChapter()) { // new book + key2.setVerse(1); + key2.setChapter(1); + key2.setBook(key2.getBook()+1); } printf("Found Chapter Break: %d ('%s')\n", num1, (const char *)key2); chapoffset = offset; @@ -95,12 +97,12 @@ int main(int argc, char **argv) // continue; } } - key2.Verse(1); - key2.Chapter(num1); - key2.Verse(num2); + key2.setVerse(1); + key2.setChapter(num1); + key2.setVerse(num2); key3 = key2; -// key3 += (rangemax - key3.Verse()); +// key3 += (rangemax - key3.getVerse()); writeidx(key1, key2, key3, offset, size); } @@ -123,9 +125,9 @@ void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short long pos; short tmp; - for (; ((key1 <= key3) && (key1.Error() != KEYERR_OUTOFBOUNDS) && (key1.Testament() == testmnt)); key1+=1) { - if (key1.Verse() == 1) { // new chapter - if (key1.Chapter() == 1) { // new book + for (; ((key1 <= key3) && (key1.popError() != KEYERR_OUTOFBOUNDS) && (key1.getTestament() == testmnt)); key1+=1) { + if (key1.getVerse() == 1) { // new chapter + if (key1.getChapter() == 1) { // new book pos = lseek(cfp, 0, SEEK_CUR); write(bfp, &pos, 4); pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */ diff --git a/utilities/genarray.c b/utilities/genarray.c new file mode 100644 index 0000000..f6f2097 --- /dev/null +++ b/utilities/genarray.c @@ -0,0 +1,55 @@ +/****************************************************************************** + * + * genarray.c - + * + * $Id: genarray.c 2837 2013-06-29 08:36:36Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include +#include +#include + +main() +{ + int fd, l1, l2, l3; + char *fnames[] = {"ot.bks", "ot.cps", "nt.bks", "nt.cps"}; + long val; + char buf[64]; + +#ifndef O_BINARY // O_BINARY is needed in Borland C++ 4.53 +#define O_BINARY 0 // If it hasn't been defined than we probably +#endif // don't need it. + + + for (l1 = 0; l1 < 2; l1++) { + for (l2 = 0; l2 < 2; l2++) { + l3 = 1; + sprintf(buf, "%s", fnames[(l1*2)+l2]); + printf(" // %s\n", fnames[(l1*2)+l2]); + fd = open(buf, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH); + while (read(fd, &val, 4) == 4) { + l3++; + printf("%ld, ", val/(4 + (l2*2))); + if (!(l3%7)) + printf("\n"); + } + close(fd); + printf("}, \n"); + } + } +} diff --git a/utilities/genbookutil.cpp b/utilities/genbookutil.cpp index 03c19b3..71363e3 100644 --- a/utilities/genbookutil.cpp +++ b/utilities/genbookutil.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * genbookutil.cpp - + * + * $Id: genbookutil.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -82,7 +87,7 @@ void assurePath(TreeKeyIdx *treeKey) { void viewEntryText(RawGenBook *book) { std::cout << "\n"; - std::cout << book->RenderText(); + std::cout << book->renderText(); std::cout << "\n"; } @@ -158,7 +163,7 @@ int main(int argc, char **argv) { TreeKeyIdx *treeKey = new TreeKeyIdx(argv[1]); - if (treeKey->Error()) { + if (treeKey->popError()) { RawGenBook::createModule(argv[1]); } delete treeKey; diff --git a/utilities/imp2gbs.cpp b/utilities/imp2gbs.cpp index b8edbb4..dde871f 100644 --- a/utilities/imp2gbs.cpp +++ b/utilities/imp2gbs.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * imp2gbs.cpp - Utility to import GenBooks in IMP format + * + * $Id: imp2gbs.cpp 2980 2013-09-14 21:51:47Z scribe $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -203,7 +208,7 @@ void writeEntry(SWModule *book, SWBuf keyBuffer, SWBuf entBuffer) { book->setKey(keyBuffer.c_str()); // check to see if we already have an entry - for (int i = 2; book->getKey()->Error() != KEYERR_OUTOFBOUNDS; i++) { + for (int i = 2; book->getKey()->popError() != KEYERR_OUTOFBOUNDS; i++) { SWBuf key; key.setFormatted("%s {%d}", keyBuffer.c_str(), i); std::cout << "dup key, trying: " << key << std::endl; diff --git a/utilities/imp2ld.cpp b/utilities/imp2ld.cpp index ec2fcf6..7d8b604 100644 --- a/utilities/imp2ld.cpp +++ b/utilities/imp2ld.cpp @@ -1,19 +1,24 @@ -/* -* Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) -* CrossWire Bible Society -* P. O. Box 2528 -* Tempe, AZ 85280-2528 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation version 2. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -*/ +/****************************************************************************** + * + * imp2ld.cpp - Utility to import LD modules in IMP format + * + * $Id: imp2ld.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #ifdef _MSC_VER #pragma warning( disable: 4251 ) @@ -27,6 +32,7 @@ #include #include #include +#include #include using std::string; @@ -35,78 +41,141 @@ using std::string; using namespace sword; #endif +void usage(const char *progName, const char *error = 0) { + if (error) fprintf(stderr, "\n%s: %s\n", progName, error); + fprintf(stderr, "\n=== imp2ld (Revision $Rev: 2234 $) SWORD lexicon importer.\n"); + fprintf(stderr, "\nusage: %s [options]\n", progName); + fprintf(stderr, " -a\t\t\t augment module if exists (default is to create new)\n"); + fprintf(stderr, " -z\t\t\t use ZIP compression (default no compression)\n"); + fprintf(stderr, " -Z\t\t\t use LZSS compression (default no compression)\n"); + fprintf(stderr, " -o \t where to write data files.\n"); + fprintf(stderr, " -4\t\t\t use 4 byte size entries (default is 2).\n"); + fprintf(stderr, " -b \t\t compression block size (default 30 entries)\n"); + fprintf(stderr, " -s\t\t\t case sensitive keys (default is not case sensitive)\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "'imp' format is a simple standard for importing data into SWORD modules.\n" + "Required is a plain text file containing $$$key lines followed by content.\n\n" + "$$$Abraham\n" + "Abraham was the father of Isaac...\n" + "He was called by God to leave his country and journey to the land of Canaan...\n" + "$$$Isaac\n" + "Isaac was the son of Abraham and Sarah...\n\n"); + exit(-1); +} int main(int argc, char **argv) { - const char * helptext ="imp2ld 1.0 Lexicon/Dictionary/Daily Devotional/Glossary module creation tool for the SWORD Project\n usage:\n %s [modname] [ 4 (default) | 2 | z - module driver] [entries per compression block]\n"; - + std::vector linkbuffer; signed long i = 0; string keybuffer; string entbuffer; string linebuffer; - char modname[16]; char links = 0; + string modname; + SWBuf outPath = ""; + bool append = false; long blockCount = 30; - std::vector linkbuffer; + bool caseSensitive = false; + SWCompress *compressor = 0; + SWBuf compType = ""; + bool fourByteSize = false; - if (argc > 2) { - strcpy (modname, argv[2]); - } - else if (argc > 1) { - for (i = 0; (i < 16) && (argv[1][i]) && (argv[1][i] != '.'); i++) { - modname[i] = argv[1][i]; - } - modname[i] = 0; - } - else { - fprintf(stderr, helptext, argv[0]); - exit(-1); - } + if (argc < 2) usage(*argv); - std::ifstream infile(argv[1]); + const char *progName = argv[0]; + const char *inFileName = argv[1]; - char mode = 1; - if (argc > 3) { - switch (*argv[3]) { - case 'z': mode = 3; break; - case '2': mode = 2; break; - default: mode = 1; + for (int i = 2; i < argc; i++) { + if (!strcmp(argv[i], "-a")) { + append = true; } + else if (!strcmp(argv[i], "-z")) { + if (compType.size()) usage(*argv, "Cannot specify both -z and -Z"); + if (fourByteSize) usage(*argv, "Cannot specify both -z and -4"); + compType = "ZIP"; + } + else if (!strcmp(argv[i], "-Z")) { + if (compType.size()) usage(*argv, "Cannot specify both -z and -Z"); + if (fourByteSize) usage(*argv, "Cannot specify both -Z and -4"); + compType = "LZSS"; + } + else if (!strcmp(argv[i], "-4")) { + fourByteSize = true; + } + else if (!strcmp(argv[i], "-b")) { + if (i+1 < argc) { + blockCount = atoi(argv[++i]); + if (blockCount > 0) continue; + } + usage(*argv, "-b requires in entry count integer > 0"); + } + else if (!strcmp(argv[i], "-o")) { + if (i+1 < argc) outPath = argv[++i]; + else usage(progName, "-o requires "); + } + else if (!strcmp(argv[i], "-s")) { + caseSensitive = true; + } + else usage(progName, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str()); } - if (argc > 4) { - long bcTemp = atoi(argv[4]); - if (bcTemp > 0) { - blockCount = bcTemp; + + + if (outPath.size() < 1) { + for (i = 0; (i < 16) && (inFileName[i]) && (inFileName[i] != '.'); i++) { + outPath += inFileName[i]; } } + std::ifstream infile(inFileName); + + SWModule *mod = 0; SWKey *key, *linkKey; - switch (mode) { - case 3: + if (compType == "ZIP") { #ifndef EXCLUDEZLIB - zLD::createModule(modname); - mod = new zLD(modname, 0, 0, blockCount, new ZipCompress()); + compressor = new ZipCompress(); #else - fprintf(stderr, "ERROR: %s: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library", *argv); - exit(-2); + usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library"); #endif - break; - case 2: - RawLD::createModule(modname); - mod = new RawLD(modname); - break; - case 1: - RawLD4::createModule(modname); - mod = new RawLD4(modname); - break; } + else if (compType == "LZSS") { + compressor = new LZSSCompress(); + } + + // setup module + if (!append) { + if (compressor) { + if (zLD::createModule(outPath)) { + fprintf(stderr, "ERROR: %s: couldn't create module at path: %s \n", *argv, outPath.c_str()); + exit(-1); + } + } + else { + if (!fourByteSize) + RawLD::createModule(outPath); + else RawLD4::createModule(outPath); + } + } + + if (compressor) { + // Create a compressed text module allowing very large entries + // Taking defaults except for first, fourth, fifth and last argument + mod = new zLD(outPath, 0, 0, blockCount, compressor, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive); + } + else { + mod = (!fourByteSize) + ? (SWModule *)new RawLD (outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive) + : (SWModule *)new RawLD4(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive); + } + + + - key = mod->CreateKey(); - linkKey = mod->CreateKey(); - key->Persist(1); + key = mod->createKey(); + linkKey = mod->createKey(); + key->setPersist(true); mod->setKey(key); while (!infile.eof()) { diff --git a/utilities/imp2vs.cpp b/utilities/imp2vs.cpp index 35c9382..cc26f0b 100644 --- a/utilities/imp2vs.cpp +++ b/utilities/imp2vs.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * imp2vs.cpp - Utility to import IMP formatted VerseKey modules + * + * $Id: imp2vs.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -30,6 +35,7 @@ #include #include #include +#include #ifndef NO_SWORD_NAMESPACE using namespace sword; @@ -52,11 +58,12 @@ void usage(const char *progName, const char *error = 0) { fprintf(stderr, "\t\t\t\t 2 - verse; 3 - chapter; 4 - book\n"); fprintf(stderr, " -v \t\t specify a versification scheme to use (default is KJV)\n"); fprintf(stderr, "\t\t\t\t Note: The following are valid values for v11n:\n"); - VerseMgr *vmgr = VerseMgr::getSystemVerseMgr(); + VersificationMgr *vmgr = VersificationMgr::getSystemVersificationMgr(); StringList av11n = vmgr->getVersificationSystems(); for (StringList::iterator loop = av11n.begin(); loop != av11n.end(); loop++) { fprintf(stderr, "\t\t\t\t\t%s\n", (*loop).c_str()); } + fprintf(stderr, " -l \t\t specify a locale scheme to use (default is en)\n"); fprintf(stderr, "\n"); fprintf(stderr, "'imp' format is a simple standard for importing data into SWORD modules.\n" "Required is a plain text file containing $$$key lines followed by content.\n\n" @@ -84,6 +91,8 @@ int main(int argc, char **argv) { const char *inFileName = argv[1]; SWBuf v11n = "KJV"; SWBuf outPath = "./"; + SWBuf locale = "en"; + bool fourByteSize = false; bool append = false; int iType = 4; @@ -122,10 +131,14 @@ int main(int argc, char **argv) { if (i+1 < argc) v11n = argv[++i]; else usage(progName, "-v requires "); } + else if (!strcmp(argv[i], "-l")) { + if (i+1 < argc) locale = argv[++i]; + else usage(progName, "-l requires "); + } else usage(progName, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str()); } // ----------------------------------------------------- - const VerseMgr::System *v = VerseMgr::getSystemVerseMgr()->getVersificationSystem(v11n); + const VersificationMgr::System *v = VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(v11n); if (!v) std::cout << "Warning: Versification " << v11n << " not found. Using KJV versification...\n"; if (compType == "ZIP") { @@ -178,13 +191,18 @@ int main(int argc, char **argv) { : (SWModule *)new RawText4(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, v11n); } // ----------------------------------------------------- + + // setup locale manager + + LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(locale); // setup module key to allow full range of possible values, and then some - VerseKey *vkey = (VerseKey *)module->CreateKey(); - vkey->Headings(1); - vkey->AutoNormalize(0); - vkey->Persist(1); + + VerseKey *vkey = (VerseKey *)module->createKey(); + vkey->setIntros(true); + vkey->setAutoNormalize(false); + vkey->setPersist(true); module->setKey(*vkey); // ----------------------------------------------------- @@ -228,12 +246,12 @@ void writeEntry(const SWBuf &key, const SWBuf &entry, SWModule *module) if (key.size() && entry.size()) { std::cout << "from file: " << key << std::endl; VerseKey *vkey = (VerseKey *)module->getKey(); - VerseKey *linkMaster = (VerseKey *)module->CreateKey(); + VerseKey *linkMaster = (VerseKey *)module->createKey(); - ListKey listKey = vkey->ParseVerseList(key.c_str(), "Gen1:1", true); + ListKey listKey = vkey->parseVerseList(key.c_str(), "Gen1:1", true); bool first = true; - for (listKey = TOP; !listKey.Error(); listKey++) { + for (listKey = TOP; !listKey.popError(); listKey++) { *vkey = listKey; if (first) { *linkMaster = *vkey; diff --git a/utilities/installmgr.cpp b/utilities/installmgr.cpp index 18a6895..b705c25 100644 --- a/utilities/installmgr.cpp +++ b/utilities/installmgr.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * installmgr.cpp - commandline InstallMgr utility + * + * $Id: installmgr.cpp 2932 2013-07-31 14:07:01Z scribe $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -21,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -81,12 +86,12 @@ virtual bool isUserDisclaimerConfirmed() const { class MyStatusReporter : public StatusReporter { int last; - virtual void statusUpdate(double dltotal, double dlnow) { - int p = 74 * (int)(dlnow / dltotal); + virtual void update(unsigned long totalBytes, unsigned long completedBytes) { + int p = (totalBytes > 0) ? (int)(74.0 * ((double)completedBytes / (double)totalBytes)) : 0; for (;last < p; ++last) { if (!last) { SWBuf output; - output.setFormatted("[ File Bytes: %ld", (long)dltotal); + output.setFormatted("[ File Bytes: %ld", totalBytes); while (output.size() < 75) output += " "; output += "]"; cout << output.c_str() << "\n "; @@ -101,7 +106,7 @@ class MyStatusReporter : public StatusReporter { while (output.size() < 75) output += " "; output += "]"; cout << "\n" << output.c_str() << "\n "; - int p = 74 * (int)((double)completedBytes/totalBytes); + int p = (int)(74.0 * (double)completedBytes/totalBytes); for (int i = 0; i < p; ++i) { cout << "="; } cout << "\n\n" << message << "\n"; last = 0; @@ -203,7 +208,7 @@ void uninstallModule(const char *modName) { finish(-2); } module = it->second; - installMgr->removeModule(mgr, module->Name()); + installMgr->removeModule(mgr, module->getName()); cout << "Removed module: [" << modName << "]\n"; } @@ -248,7 +253,7 @@ void listModules(SWMgr *otherMgr = 0, bool onlyNewAndUpdates = false) { if (it->second & InstallMgr::MODSTAT_UPDATED) status = "+"; if (!onlyNewAndUpdates || status == "*" || status == "+") { - cout << status << "[" << module->Name() << "] \t(" << version << ") \t- " << module->Description() << "\n"; + cout << status << "[" << module->getName() << "] \t(" << version << ") \t- " << module->getDescription() << "\n"; } } } @@ -290,10 +295,10 @@ void remoteInstallModule(const char *sourceName, const char *modName) { } module = it->second; - int error = installMgr->installModule(mgr, 0, module->Name(), is); + int error = installMgr->installModule(mgr, 0, module->getName(), is); if (error) { - cout << "\nError installing module: [" << module->Name() << "] (write permissions?)\n"; - } else cout << "\nInstalled module: [" << module->Name() << "]\n"; + cout << "\nError installing module: [" << module->getName() << "] (write permissions?)\n"; + } else cout << "\nInstalled module: [" << module->getName() << "]\n"; } @@ -307,10 +312,10 @@ void localDirInstallModule(const char *dir, const char *modName) { finish(-4); } module = it->second; - int error = installMgr->installModule(mgr, dir, module->Name()); + int error = installMgr->installModule(mgr, dir, module->getName()); if (error) { - cout << "\nError installing module: [" << module->Name() << "] (write permissions?)\n"; - } else cout << "\nInstalled module: [" << module->Name() << "]\n"; + cout << "\nError installing module: [" << module->getName() << "] (write permissions?)\n"; + } else cout << "\nInstalled module: [" << module->getName() << "]\n"; } @@ -324,16 +329,16 @@ void usage(const char *progName, const char *error) { "\t\t\t\t\t\tWARNING: overwrites existing.\n" "\t-sc\t\t\t\tsync config with known remote repo list\n" "\t\t\t\t\t\tNOTE: also creates if none exists\n" - "\t-d\t\t\t\tturn debug output on\n" - "\t-l\t\t\t\tlist installed modules\n" - "\t-u \t\t\tuninstall module\n" "\t-s\t\t\t\tlist remote sources\n" "\t-r \t\trefresh remote source\n" "\t-rl \t\tlist available modules from remote source\n" "\t-rd \t\tlist new/updated modules from remote source\n" "\t-ri \tinstall module from remote source\n" + "\t-l\t\t\t\tlist installed modules\n" + "\t-u \t\t\tuninstall module\n" "\t-ll \t\t\tlist available modules at local path\n" "\t-li \t\tinstall module from local path\n" + "\t-d\t\t\t\tturn debug output on\n" , (progName ? progName : "installmgr")); finish(-1); } diff --git a/utilities/kylixmake/libsword.bpr b/utilities/kylixmake/libsword.bpr index 363a406..0783813 100644 --- a/utilities/kylixmake/libsword.bpr +++ b/utilities/kylixmake/libsword.bpr @@ -4,7 +4,7 @@ - - diff --git a/utilities/lexdump.c b/utilities/lexdump.c index 72e1658..c55176e 100644 --- a/utilities/lexdump.c +++ b/utilities/lexdump.c @@ -1,9 +1,10 @@ /****************************************************************************** - * This utility outputs a specified ordinal entry from a lex * - * $Id: lexdump.c 2362 2009-04-29 07:21:35Z scribe $ + * lexdump.c - This utility outputs a specified ordinal entry from a lex * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: lexdump.c 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -19,6 +20,10 @@ * */ +#ifdef _MSC_VER + #pragma warning( disable: 4996 ) +#endif + #include #include #include diff --git a/utilities/mkfastmod.cpp b/utilities/mkfastmod.cpp index 3c5ff8a..5c1782b 100644 --- a/utilities/mkfastmod.cpp +++ b/utilities/mkfastmod.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * mkfastmod.cpp - + * + * $Id: mkfastmod.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -67,14 +72,14 @@ int main(int argc, char **argv) if (it == manager.Modules.end()) { fprintf(stderr, "Could not find module [%s]. Available modules:\n", argv[1]); for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { - fprintf(stderr, "[%s]\t - %s\n", (*it).second->Name(), (*it).second->Description()); + fprintf(stderr, "[%s]\t - %s\n", (*it).second->getName(), (*it).second->getDescription()); } exit(-1); } target = it->second; if (!target->hasSearchFramework()) { - fprintf(stderr, "%s: error: %s does not support a search framework.\n", *argv, it->second->Name()); + fprintf(stderr, "%s: error: %s does not support a search framework.\n", *argv, it->second->getName()); exit(-2); } diff --git a/utilities/mod2imp.cpp b/utilities/mod2imp.cpp index 1a12c72..ce382c3 100644 --- a/utilities/mod2imp.cpp +++ b/utilities/mod2imp.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * mod2imp.cpp - Utility to export a module in IMP format + * + * $Id: mod2imp.cpp 2921 2013-07-28 17:21:44Z scribe $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -107,11 +112,11 @@ int main(int argc, char **argv) VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key); if (vkey) - vkey->Headings(1); + vkey->setIntros(true); - for ((*module) = TOP; !module->Error(); (*module)++) { - std::cout << "$$$" << module->KeyText() << std::endl; - std::cout << ((render) ? module->RenderText() : (strip) ? module->StripText() : module->getRawEntry()) << "\n"; + for ((*module) = TOP; !module->popError(); (*module)++) { + std::cout << "$$$" << module->getKeyText() << std::endl; + std::cout << ((render) ? module->renderText().c_str() : (strip) ? module->stripText() : module->getRawEntry()) << "\n"; } cout << endl; diff --git a/utilities/mod2osis.cpp b/utilities/mod2osis.cpp index ef71704..40305c2 100644 --- a/utilities/mod2osis.cpp +++ b/utilities/mod2osis.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * mod2osis.cpp - Exports a module as an OSIS doc + * + * $Id: mod2osis.cpp 2972 2013-08-26 22:17:02Z scribe $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -24,6 +29,7 @@ #include #include +#include #include #include #include @@ -44,7 +50,7 @@ using std::cerr; using std::cout; void errorOutHelp(char *appName) { - cerr << appName << " - a tool to output a Sword module in OSIS format\n"; + cerr << appName << " - a tool to output a SWORD module in OSIS format\n"; cerr << "usage: "<< appName << " \n"; cerr << "\n\n"; exit(-1); @@ -55,6 +61,23 @@ int main(int argc, char **argv) { SWModule *inModule = 0; ThMLOSIS filter; + + cerr << "\n\n*** Don't use this utility *** \n\n"; + cerr << "Its purpose is to prove the engine can do\n"; + cerr << "lossless import / export, but we are not there yet. \n\n"; + cerr << "This utility is done, in fact it is already too complex.\n"; + cerr << "The ENGINE needs more work to assure export as OSIS works\n"; + cerr << "This utility only gives us occasion to improve the engine.\n"; + cerr << "Our goal is not to produce an export tool.\n\n"; + cerr << "In fact, you should never export SWORD modules.\n"; + cerr << "Many CrossWire modules are licensed for use from publishers\n"; + cerr << "and you will need to obtain your own permissions.\n"; + cerr << "We also do not encourage propogating encoding errors\n"; + cerr << "which you will avoid by obtaining text data from the source.\n\n"; + cerr << "Please see the TextSource entry in the module's .conf file\n"; + cerr << "for information where to obtain module data from our source.\n\n"; + cerr << "If you still must export SWORD module data, use mod2imp.\n"; + cerr << "It is more lossless; or less lossful, and easier to read.\n\n"; if ((argc != 2)) { errorOutHelp(argv[0]); @@ -103,7 +126,7 @@ int main(int argc, char **argv) exit(-1); } - vkey->Headings(0); + vkey->setIntros(false); cout << "getConfigEntry("Encoding")) { @@ -121,19 +144,19 @@ int main(int argc, char **argv) cout << " xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespace http://www.bibletechnologies.net/osisCore.2.1.1.xsd\">\n\n"; cout << "Name() << "\""; + cout << inModule->getName() << "\""; cout << " osisRefWork=\"defaultReferenceScheme\""; - if (inModule->Lang()) { - if (strlen(inModule->Lang())) - cout << " xml:lang=\"" << inModule->Lang() << "\""; + if (inModule->getLanguage()) { + if (strlen(inModule->getLanguage())) + cout << " xml:lang=\"" << inModule->getLanguage() << "\""; } cout << ">\n\n"; cout << "\t
\n"; cout << "\t\tName() << "\">\n"; - cout << "\t\t\t" << inModule->Description() << "\n"; - cout << "\t\t\tBible." << inModule->Name() << "\n"; + cout << inModule->getName() << "\">\n"; + cout << "\t\t\t" << inModule->getDescription() << "\n"; + cout << "\t\t\tBible." << inModule->getName() << "\n"; cout << "\t\t\tBible.KJV\n"; cout << "\t\t\n"; cout << "\t\t\n"; @@ -144,7 +167,7 @@ int main(int argc, char **argv) (*inModule) = TOP; - SWKey *p = inModule->CreateKey(); + SWKey *p = inModule->createKey(); VerseKey *tmpKey = SWDYNAMIC_CAST(VerseKey, p); if (!tmpKey) { delete p; @@ -152,18 +175,18 @@ int main(int argc, char **argv) } *tmpKey = inModule->getKeyText(); - tmpKey->Headings(1); - tmpKey->AutoNormalize(0); + tmpKey->setIntros(true); + tmpKey->setAutoNormalize(false); - for ((*inModule) = TOP; !inModule->Error(); (*inModule)++) { + for ((*inModule) = TOP; !inModule->popError(); (*inModule)++) { bool newTest = false; bool newBook = false; - if (!strlen(inModule->RenderText())) { + if (!strlen(inModule->renderText())) { continue; } - if ((vkey->Testament() != lastTest)) { + if ((vkey->getTestament() != lastTest)) { if (openchap) cout << "\t\n"; if (openbook) @@ -174,7 +197,7 @@ int main(int argc, char **argv) opentest = true; newTest = true; } - if ((vkey->Book() != lastBook) || newTest) { + if ((vkey->getBook() != lastBook) || newTest) { if (!newTest) { if (openchap) cout << "\t\n"; @@ -183,22 +206,22 @@ int main(int argc, char **argv) } *buf = 0; *tmpKey = *vkey; - tmpKey->Chapter(0); - tmpKey->Verse(0); + tmpKey->setChapter(0); + tmpKey->setVerse(0); sprintf(buf, "\t
\n", tmpKey->getOSISRef()); // filter.ProcessText(buf, 200 - 3, &lastHeading, inModule); cout << "" << buf << endl; openbook = true; newBook = true; } - if ((vkey->Chapter() != lastChap) || newBook) { + if ((vkey->getChapter() != lastChap) || newBook) { if (!newBook) { if (openchap) cout << "\t\n"; } *buf = 0; *tmpKey = *vkey; - tmpKey->Verse(0); + tmpKey->setVerse(0); sprintf(buf, "\t\n", tmpKey->getOSISRef()); // filter.ProcessText(buf, 200 - 3, &lastHeading, inModule); cout << "" << buf; @@ -207,9 +230,9 @@ int main(int argc, char **argv) SWBuf verseText = inModule->getRawEntry(); sprintf(buf, "\t\t", vkey->getOSISRef()); cout << buf << verseText.c_str() << "\n" << endl; - lastChap = vkey->Chapter(); - lastBook = vkey->Book(); - lastTest = vkey->Testament(); + lastChap = vkey->getChapter(); + lastBook = vkey->getBook(); + lastTest = vkey->getTestament(); } if (openchap) cout << "\t\n"; diff --git a/utilities/mod2vpl.cpp b/utilities/mod2vpl.cpp index ead9e6c..0b5ab1b 100644 --- a/utilities/mod2vpl.cpp +++ b/utilities/mod2vpl.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * mod2vpl.cpp - Utility to export a module in VPL format + * + * $Id: mod2vpl.cpp 2931 2013-07-31 13:07:26Z scribe $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -85,13 +90,13 @@ int main(int argc, char **argv) { exit(-3); } - vkey->Headings(1); // turn on mod/testmnt/book/chap headings + vkey->setIntros(true); // turn on mod/testmnt/book/chap headings (*mod) = TOP; - while (!mod->Error()) { - buffer = new char [ strlen ((const char *)(*mod)) + 1 ]; - strcpy(buffer, (const char *)(*mod)); + while (!mod->popError()) { + buffer = new char [ mod->renderText().length() + 1 ]; + strcpy(buffer, mod->renderText()); cleanbuf(buffer); if (vref) { if ((strlen(buffer) > 0) && (vref)) { diff --git a/utilities/mod2zmod.cpp b/utilities/mod2zmod.cpp index 2ef4963..03fd8c5 100644 --- a/utilities/mod2zmod.cpp +++ b/utilities/mod2zmod.cpp @@ -1,7 +1,10 @@ -// Compression on variable granularity - -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * mod2zmod.cpp - Compression on variable granularity + * + * $Id: mod2zmod.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -32,6 +35,7 @@ #include #endif +#include #include #include #include @@ -109,9 +113,9 @@ int main(int argc, char **argv) #define COM 3 int modType = 0; - if (!strcmp(inModule->Type(), "Biblical Texts")) modType = BIBLE; - if (!strcmp(inModule->Type(), "Lexicons / Dictionaries")) modType = LEX; - if (!strcmp(inModule->Type(), "Commentaries")) modType = COM; + if (!strcmp(inModule->getType(), "Biblical Texts")) modType = BIBLE; + if (!strcmp(inModule->getType(), "Lexicons / Dictionaries")) modType = LEX; + if (!strcmp(inModule->getType(), "Commentaries")) modType = COM; switch (compType) { // these are deleted by zText case 1: compressor = new LZSSCompress(); break; @@ -145,7 +149,7 @@ int main(int argc, char **argv) outModule = new zText(argv[2], 0, 0, iType, compressor, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, vk->getVersificationSystem()); // open our datapath with our RawText driver. - ((VerseKey *)(SWKey *)(*inModule))->Headings(1); + ((VerseKey *)(SWKey *)(*inModule))->setIntros(true); break; } case LEX: @@ -156,24 +160,24 @@ int main(int argc, char **argv) SWFilter *cipherFilter = 0; if (!cipherKey.empty()) { cipherFilter = new CipherFilter(cipherKey.c_str()); - outModule->AddRawFilter(cipherFilter); + outModule->addRawFilter(cipherFilter); } string lastBuffer = "Something that would never be first module entry"; SWKey bufferKey; SWKey lastBufferKey; - SWKey *outModuleKey = outModule->CreateKey(); + SWKey *outModuleKey = outModule->createKey(); VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, outModuleKey); - outModuleKey->Persist(1); + outModuleKey->setPersist(true); if (vkey) { - vkey->Headings(1); - vkey->AutoNormalize(0); + vkey->setIntros(true); + vkey->setAutoNormalize(false); } outModule->setKey(*outModuleKey); inModule->setSkipConsecutiveLinks(false); (*inModule) = TOP; - while (!inModule->Error()) { + while (!inModule->popError()) { bufferKey = *(SWKey *)(*inModule); // pseudo-check for link. Will get most common links. if ((lastBuffer == inModule->getRawEntry()) &&(lastBuffer.length() > 0)) { @@ -183,7 +187,7 @@ int main(int argc, char **argv) } else { lastBuffer = inModule->getRawEntry(); - lastBufferKey = inModule->KeyText(); + lastBufferKey = inModule->getKeyText(); if (lastBuffer.length() > 0) { cout << "Adding [" << bufferKey << "] new text.\n"; *outModuleKey = bufferKey; diff --git a/utilities/modwrite.cpp b/utilities/modwrite.cpp index 87891a1..b55f034 100644 --- a/utilities/modwrite.cpp +++ b/utilities/modwrite.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * modwrite.cpp - + * + * $Id: modwrite.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/no13.c b/utilities/no13.c index f84cfcc..ccbcfeb 100644 --- a/utilities/no13.c +++ b/utilities/no13.c @@ -1,9 +1,10 @@ /****************************************************************************** - * Strips ascii 13 chars out of a file * - * $Id: no13.c 2327 2009-04-22 11:42:33Z scribe $ + * no13.c - Strips ascii 13 chars out of a file * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: no13.c 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/osis2mod.cpp b/utilities/osis2mod.cpp index 7b937fd..eab2ee0 100644 --- a/utilities/osis2mod.cpp +++ b/utilities/osis2mod.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * osis2mod.cpp - Utility to import a module in OSIS format + * + * $Id: osis2mod.cpp 2893 2013-07-16 03:07:02Z scribe $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -96,8 +101,8 @@ static bool inCanonicalOSISBook = true; // osisID is for a book that is not in S static bool normalize = true; // Whether to normalize UTF-8 to NFC bool isOSISAbbrev(const char *buf) { - VerseMgr *vmgr = VerseMgr::getSystemVerseMgr(); - const VerseMgr::System *av11n = vmgr->getVersificationSystem(currentVerse.getVersificationSystem()); + VersificationMgr *vmgr = VersificationMgr::getSystemVersificationMgr(); + const VersificationMgr::System *av11n = vmgr->getVersificationSystem(currentVerse.getVersificationSystem()); return av11n->getBookNumberByOSISName(buf) >= 0; } @@ -352,13 +357,13 @@ bool isValidRef(const char *buf) { // And set it to the reference under question VerseKey before; before.setVersificationSystem(currentVerse.getVersificationSystem()); - before.AutoNormalize(0); - before.Headings(1); + before.setAutoNormalize(false); + before.setIntros(true); before.setText(buf); // If we are a heading we must bail // These will autonormalize to the last verse of the prior chapter - if (!before.Testament() || !before.Book() || !before.Chapter() || !before.Verse()) { + if (!before.getTestament() || !before.getBook() || !before.getChapter() || !before.getVerse()) { return true; } @@ -366,7 +371,7 @@ bool isValidRef(const char *buf) { // And set it to the reference under question VerseKey after; after.setVersificationSystem(currentVerse.getVersificationSystem()); - after.AutoNormalize(1); + after.setAutoNormalize(true); after.setText(buf); if (before == after) @@ -375,8 +380,7 @@ bool isValidRef(const char *buf) { } // If we have gotten here the reference is not in the selected versification. - cout << "INFO(V11N): " << before << " is not in the " << currentVerse.getVersificationSystem() << " versification." << endl; - + // cout << "INFO(V11N): " << before << " is not in the " << currentVerse.getVersificationSystem() << " versification." << endl; if (debug & DEBUG_REV11N) { cout << "DEBUG(V11N): " << before << " normalizes to " << after << endl; } @@ -409,25 +413,28 @@ bool isValidRef(const char *buf) { * param key the key that may need to be adjusted */ void makeValidRef(VerseKey &key) { + VerseKey saveKey; + saveKey.setVersificationSystem(currentVerse.getVersificationSystem()); + saveKey.setAutoNormalize(false); + saveKey.setIntros(true); + saveKey = currentVerse; - int chapterMax = key.getChapterMax(); - int verseMax = key.getVerseMax(); - - if (debug & DEBUG_REV11N) { - cout << "DEBUG(V11N) Chapter max:" << chapterMax << ", Verse Max:" << verseMax << endl; - } - - cout << "INFO(V11N): " << key.getOSISRef() << " is not in the " << key.getVersificationSystem() << " versification."; // Since isValidRef returned false constrain the key to the nearest prior reference. // If we are past the last chapter set the reference to the last chapter - if (key.Chapter() > chapterMax) { - key.Chapter(chapterMax); + int chapterMax = key.getChapterMax(); + if (key.getChapter() > chapterMax) { + key.setChapter(chapterMax); } // Either we set the chapter to the last chapter and now need to set to the last verse in the chapter // Or the verse is beyond the end of the chapter. // In any case we need to constrain the verse to it's chapter. - key.Verse(verseMax); + int verseMax = key.getVerseMax(); + key.setVerse(verseMax); + + if (debug & DEBUG_REV11N) { + cout << "DEBUG(V11N) Chapter max:" << chapterMax << ", Verse Max:" << verseMax << endl; + } // There are three cases we want to handle: // In the examples we are using the KJV versification where the last verse of Matt.7 is Matt.7.29. @@ -446,17 +453,19 @@ void makeValidRef(VerseKey &key) { // In this case we should re-versify Matt.7.30 as Matt.7.29. // However, since this and 2) are ambiguous, we'll re-reversify to the last entry in the module. - while (!key.Error() && !module->hasEntry(&key)) { + while (!key.popError() && !module->hasEntry(&key)) { key.decrement(1); } - cout << " Appending content to " << key.getOSISRef() << endl; + cout << "INFO(V11N): " << saveKey.getOSISRef() + << " is not in the " << key.getVersificationSystem() + << " versification. Appending content to " << key.getOSISRef() << endl; } void writeEntry(SWBuf &text, bool force = false) { char keyOsisID[255]; - static const char* revision = ""; + static const char* revision = ""; static bool firstOT = true; static bool firstNT = true; @@ -473,13 +482,13 @@ void writeEntry(SWBuf &text, bool force = false) { static VerseKey lastKey; lastKey.setVersificationSystem(currentVerse.getVersificationSystem()); - lastKey.AutoNormalize(0); - lastKey.Headings(1); + lastKey.setAutoNormalize(0); + lastKey.setIntros(1); VerseKey saveKey; saveKey.setVersificationSystem(currentVerse.getVersificationSystem()); - saveKey.AutoNormalize(0); - saveKey.Headings(1); + saveKey.setAutoNormalize(0); + saveKey.setIntros(1); saveKey = currentVerse; // If we have seen a verse and the supplied one is different then we output the collected one. @@ -494,16 +503,16 @@ void writeEntry(SWBuf &text, bool force = false) { prepareSWText(activeOsisID, activeVerseText); // Put the revision into the module - int testmt = currentVerse.Testament(); + int testmt = currentVerse.getTestament(); if ((testmt == 1 && firstOT) || (testmt == 2 && firstNT)) { VerseKey t; t.setVersificationSystem(currentVerse.getVersificationSystem()); - t.AutoNormalize(0); - t.Headings(1); + t.setAutoNormalize(0); + t.setIntros(1); t = currentVerse; - currentVerse.Book(0); - currentVerse.Chapter(0); - currentVerse.Verse(0); + currentVerse.setBook(0); + currentVerse.setChapter(0); + currentVerse.setVerse(0); module->setEntry(revision); currentVerse = t; switch (testmt) { @@ -534,14 +543,12 @@ void writeEntry(SWBuf &text, bool force = false) { } // The following is for initial verse content and for appending interverse content. - // Eliminate leading whitespace on the beginning of each verse and - // before we append to current content, since we just added one - text.trimStart(); if (activeVerseText.length()) { - activeVerseText += " "; activeVerseText += text; } else { + // Eliminate leading whitespace on the beginning of each verse + text.trimStart(); activeVerseText = text; } // text has been consumed so clear it out. @@ -561,8 +568,8 @@ void linkToEntry(VerseKey &linkKey, VerseKey &dest) { VerseKey saveKey; saveKey.setVersificationSystem(currentVerse.getVersificationSystem()); - saveKey.AutoNormalize(0); - saveKey.Headings(1); + saveKey.setAutoNormalize(0); + saveKey.setIntros(1); saveKey = currentVerse; currentVerse = linkKey; @@ -590,7 +597,7 @@ bool handleToken(SWBuf &text, XMLTag token) { // Flags indicating whether we are processing the content of to be prepended to a verse static bool inPreVerse = false; -// static int genID = 1; + static int genID = 1; // Flag indicating whether we are in "Words of Christ" static bool inWOC = false; @@ -599,6 +606,7 @@ bool handleToken(SWBuf &text, XMLTag token) { // Flag used to indicate where useful text begins static bool firstDiv = false; + static bool headerEnded = false; // Retain the sID of book, chapter and verse (commentary) divs so that we can find them again. // This relies on transformBSP. @@ -639,9 +647,9 @@ bool handleToken(SWBuf &text, XMLTag token) { } } - // throw away everything up to the first div + // throw away everything up to the first div (that is outside the header) if (!firstDiv) { - if (tokenName == "div") { + if (headerEnded && (tokenName == "div")) { if (debug & DEBUG_OTHER) { cout << "DEBUG(FOUND): Found first div and pitching prior material: " << text << endl; } @@ -670,15 +678,15 @@ bool handleToken(SWBuf &text, XMLTag token) { cout << "\tinBookIntro = " << inBookIntro << endl; } - currentVerse.Testament(0); - currentVerse.Book(0); - currentVerse.Chapter(0); - currentVerse.Verse(0); + currentVerse.setTestament(0); + currentVerse.setBook(0); + currentVerse.setChapter(0); + currentVerse.setVerse(0); writeEntry(text); } currentVerse = token.getAttribute("osisID"); - currentVerse.Chapter(0); - currentVerse.Verse(0); + currentVerse.setChapter(0); + currentVerse.setVerse(0); strcpy(currentOsisID, currentVerse.getOSISRef()); sidBook = token.getAttribute("sID"); @@ -720,7 +728,7 @@ bool handleToken(SWBuf &text, XMLTag token) { } currentVerse = token.getAttribute("osisID"); - currentVerse.Verse(0); + currentVerse.setVerse(0); if (debug & DEBUG_OTHER) { cout << "DEBUG(FOUND): Current chapter is " << currentVerse.getOSISRef() << " (" << token.getAttribute("osisID") << ")" << endl; @@ -769,23 +777,23 @@ bool handleToken(SWBuf &text, XMLTag token) { // Did we have pre-verse material that needs to be marked? if (inPreVerse) { -// char genBuf[200]; -// sprintf(genBuf, "
", genID++); -// text.append(genBuf); + char genBuf[200]; + sprintf(genBuf, "
", genID++); + text.append(genBuf); } // Get osisID for verse or annotateRef for commentary SWBuf keyVal = token.getAttribute(tokenName == "verse" ? "osisID" : "annotateRef"); - // Massage the key into a form that ParseVerseList can accept + // Massage the key into a form that parseVerseList can accept prepareSWVerseKey(keyVal); // The osisID or annotateRef can be more than a single verse // The first or only one is the currentVerse // Use the last verse seen (i.e. the currentVerse) as the basis for recovering from bad parsing. // This should never happen if the references are valid OSIS references - ListKey verseKeys = currentVerse.ParseVerseList(keyVal, currentVerse, true); - int memberKeyCount = verseKeys.Count(); + ListKey verseKeys = currentVerse.parseVerseList(keyVal, currentVerse, true); + int memberKeyCount = verseKeys.getCount(); if (memberKeyCount) { currentVerse = verseKeys.getElement(0); // See if this osisID or annotateRef refers to more than one verse. @@ -795,7 +803,7 @@ bool handleToken(SWBuf &text, XMLTag token) { // if there is only one verse. verseKeys.setPosition(TOP); verseKeys.increment(1); - if (!verseKeys.Error()) { + if (!verseKeys.popError()) { linkedVerses.push_back(verseKeys); } } @@ -916,9 +924,9 @@ bool handleToken(SWBuf &text, XMLTag token) { } if (inPreVerse) { -// char genBuf[200]; -// sprintf(genBuf, "
", genID); -// text.append(genBuf); + char genBuf[200]; + sprintf(genBuf, "
", genID); + text.append(genBuf); } } @@ -958,8 +966,16 @@ bool handleToken(SWBuf &text, XMLTag token) { } } - // We haven't seen the first div so there is nothing to do. + // We haven't seen the first div outside the header so there is little to do. if (!firstDiv) { + if (tokenName == "header") { + headerEnded = true; + + if (debug & DEBUG_OTHER) { + cout << "DEBUG(FOUND): End of header found" << endl; + } + } + // Collect the content so it can be used to suggest the module's conf. return false; } @@ -1237,13 +1253,13 @@ void writeLinks() // Link all the verses VerseKey destKey; destKey.setVersificationSystem(currentVerse.getVersificationSystem()); - destKey.AutoNormalize(0); - destKey.Headings(1); + destKey.setAutoNormalize(0); + destKey.setIntros(1); VerseKey linkKey; linkKey.setVersificationSystem(currentVerse.getVersificationSystem()); - linkKey.AutoNormalize(0); - linkKey.Headings(1); + linkKey.setAutoNormalize(0); + linkKey.setIntros(1); for (unsigned int i = 0; i < linkedVerses.size(); i++) { // The verseKeys is a list of verses // where the first is the real verse @@ -1253,7 +1269,7 @@ void writeLinks() destKey = verseKeys.getElement(); verseKeys.increment(1); - while (!verseKeys.Error()) { + while (!verseKeys.popError()) { linkKey = verseKeys.getElement(); verseKeys.increment(1); linkToEntry(linkKey, destKey); @@ -1287,7 +1303,7 @@ void usage(const char *app, const char *error = 0) { fprintf(stderr, "\t\t\t\t (2 bytes to store size equal 65535 characters)\n"); fprintf(stderr, " -v \t\t specify a versification scheme to use (default is KJV)\n"); fprintf(stderr, "\t\t\t\t Note: The following are valid values for v11n:\n"); - VerseMgr *vmgr = VerseMgr::getSystemVerseMgr(); + VersificationMgr *vmgr = VersificationMgr::getSystemVersificationMgr(); StringList av11n = vmgr->getVersificationSystems(); for (StringList::iterator loop = av11n.begin(); loop != av11n.end(); loop++) { fprintf(stderr, "\t\t\t\t\t%s\n", (*loop).c_str()); @@ -1315,40 +1331,149 @@ void usage(const char *app, const char *error = 0) { } void processOSIS(istream& infile) { + typedef enum { + CS_NOT_IN_COMMENT, // or seen starting "<" + CS_SEEN_STARTING_EXCLAMATION, + CS_SEEN_STARTING_HYPHEN, + CS_IN_COMMENT, + CS_SEEN_ENDING_HYPHEN, + CS_SEEN_SECOND_ENDING_HYPHEN, + CS_SEEN_ENDING_GREATER_THAN + } t_commentstate; + activeOsisID[0] = '\0'; strcpy(currentOsisID,"N/A"); currentVerse.setVersificationSystem(v11n); - currentVerse.AutoNormalize(0); - currentVerse.Headings(1); // turn on mod/testmnt/book/chap headings - currentVerse.Persist(1); + currentVerse.setAutoNormalize(false); + currentVerse.setIntros(true); // turn on mod/testmnt/book/chap headings + currentVerse.setPersist(true); module->setKey(currentVerse); module->setPosition(TOP); SWBuf token; SWBuf text; + bool incomment = false; + t_commentstate commentstate = CS_NOT_IN_COMMENT; bool intoken = false; bool inWhitespace = false; bool seeingSpace = false; unsigned char curChar = '\0'; while (infile.good()) { - - curChar = infile.get(); + + int possibleChar = infile.get(); // skip the character if it is bad. infile.good() will catch the problem - if (curChar == -1) { + if (possibleChar == -1) { continue; } + curChar = (unsigned char) possibleChar; + + // All newlines are simply whitespace + // Does a SWORD module actually require this? + if (curChar == '\n') { + curChar = ' '; + } + if (!intoken && curChar == '<') { intoken = true; token = "<"; continue; } + // Handle XML comments starting with "" + + if (intoken && !incomment) { + switch (commentstate) { + case CS_NOT_IN_COMMENT : + if (curChar == '!') { + commentstate = CS_SEEN_STARTING_EXCLAMATION; + token.append((char) curChar); + continue; + } else { + break; + } + + case CS_SEEN_STARTING_EXCLAMATION : + if (curChar == '-') { + commentstate = CS_SEEN_STARTING_HYPHEN; + token.append((char) curChar); + continue; + } else { + commentstate = CS_NOT_IN_COMMENT; + break; + } + + case CS_SEEN_STARTING_HYPHEN : + if (curChar == '-') { + incomment = true; + commentstate = CS_IN_COMMENT; + token.append((char) curChar); + + if (debug & DEBUG_OTHER) { + cout << "DEBUG(COMMENTS): in comment" << endl; + } + + continue; + } else { + commentstate = CS_NOT_IN_COMMENT; + break; + } + + default: + cout << "FATAL(COMMENTS): unknown commentstate on comment start: " << commentstate << endl; + exit(EXIT_BAD_NESTING); + } + } + + if (incomment) { + switch (commentstate) { + case CS_IN_COMMENT: + if (curChar == '-') { + commentstate = CS_SEEN_ENDING_HYPHEN; + continue; + } else { + // ignore the character + continue; + } + + case CS_SEEN_ENDING_HYPHEN : + if (curChar == '-') { + commentstate = CS_SEEN_SECOND_ENDING_HYPHEN; + continue; + } else { + // ignore character + commentstate = CS_IN_COMMENT; + continue; + } + + case CS_SEEN_SECOND_ENDING_HYPHEN : + if (curChar == '>') { + intoken = false; + incomment = false; + commentstate = CS_NOT_IN_COMMENT; + + if (debug & DEBUG_OTHER) { + cout << "DEBUG(COMMENTS): out of comment" << endl; + } + + continue; + } else { + // ignore character + commentstate = CS_IN_COMMENT; + continue; + } + + default: + cout << "FATAL(COMMENTS): unknown commentstate on comment end: " << commentstate << endl; + exit(EXIT_BAD_NESTING); + } + } + // Outside of tokens merge adjacent whitespace if (!intoken) { seeingSpace = isspace(curChar)!=0; @@ -1367,25 +1492,28 @@ void processOSIS(istream& infile) { inWhitespace = false; token.append('>'); // take this isalpha if out to check for bugs in text - if ((isalpha(token[1])) || (isalpha(token[2]))) { + if (isalpha(token[1]) || + (((token[1] == '/') || (token[1] == '?')) && isalpha(token[2]))) { //cout << "Handle:" << token.c_str() << endl; XMLTag t = transformBSP(token.c_str()); if (!handleToken(text, t)) { text.append(t); } + } else { + cout << "WARNING(PARSE): malformed token: " << token << endl; } continue; } if (intoken) { - token.append(curChar); + token.append((char) curChar); } else { switch (curChar) { case '>' : text.append(">"); break; case '<' : text.append("<"); break; - default : text.append(curChar); break; + default : text.append((char) curChar); break; } } } @@ -1403,7 +1531,7 @@ void processOSIS(istream& infile) { int main(int argc, char **argv) { - fprintf(stderr, "You are running osis2mod: $Rev: 2562 $\n"); + fprintf(stderr, "You are running osis2mod: $Rev: 2893 $\n"); // Let's test our command line arguments if (argc < 3) { @@ -1474,6 +1602,8 @@ int main(int argc, char **argv) { else usage(*argv, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str()); } + if (isCommentary) isCommentary = true; // avoid unused warning for now + if (compType == "ZIP") { #ifndef EXCLUDEZLIB compressor = new ZipCompress(); @@ -1573,7 +1703,7 @@ int main(int argc, char **argv) { if (cipherKey.length()) { fprintf(stderr, "Adding cipher filter with phrase: %s\n", cipherKey.c_str() ); cipherFilter = new CipherFilter(cipherKey.c_str()); - module->AddRawFilter(cipherFilter); + module->addRawFilter(cipherFilter); } if (!module->isWritable()) { @@ -1601,6 +1731,7 @@ int main(int argc, char **argv) { if (cipherFilter) delete cipherFilter; + fprintf(stderr, "SUCCESS: %s: has finished its work and will now rest\n", program); exit(0); // success } diff --git a/utilities/perl/cipherkeygen.pl b/utilities/perl/cipherkeygen.pl index c3de452..84d756c 100755 --- a/utilities/perl/cipherkeygen.pl +++ b/utilities/perl/cipherkeygen.pl @@ -1,15 +1,13 @@ #!/usr/bin/perl + #****************************************************************************** # -# cipherkeygen.pl -# -# generates a cipher key of the format \d{4}[a-zA-Z]{4}\d{4}[a-zA-Z]{4}. -# because I'm lazy and not random enough. -# and because the utilities/perl directory is kinda bare... +# cipherkeygen.pl - generates a cipher key of the format +# \d{4}[a-zA-Z]{4}\d{4}[a-zA-Z]{4} # -# $Id: cipherkeygen.pl 2327 2009-04-22 11:42:33Z scribe $ +# $Id: cipherkeygen.pl 2841 2013-06-29 10:58:08Z chrislit $ # -# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) +# Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society # P. O. Box 2528 # Tempe, AZ 85280-2528 diff --git a/utilities/perl/linkvers.pl b/utilities/perl/linkvers.pl index d1b6157..529c89d 100755 --- a/utilities/perl/linkvers.pl +++ b/utilities/perl/linkvers.pl @@ -1,9 +1,12 @@ #!/usr/bin/perl + #****************************************************************************** # -# $Id: linkvers.pl 2327 2009-04-22 11:42:33Z scribe $ +# linkvers.pl - +# +# $Id: linkvers.pl 2841 2013-06-29 10:58:08Z chrislit $ # -# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) +# Copyright 2001-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society # P. O. Box 2528 # Tempe, AZ 85280-2528 diff --git a/utilities/perl/localecap.pl b/utilities/perl/localecap.pl index d73c539..cf7d250 100755 --- a/utilities/perl/localecap.pl +++ b/utilities/perl/localecap.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl #****************************************************************************** # -# This tool is only for locales in Latin-1, not UTF-8 (should such locales be supported at a later date) +# localecap.pl - This tool is only for locales in Latin-1, not UTF-8 # -# $Id: localecap.pl 2327 2009-04-22 11:42:33Z scribe $ +# $Id: localecap.pl 2841 2013-06-29 10:58:08Z chrislit $ # -# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) +# Copyright 2001-2009 CrossWire Bible Society (http://www.crosswire.org) # CrossWire Bible Society # P. O. Box 2528 # Tempe, AZ 85280-2528 diff --git a/utilities/perl/mkvsmod.pl b/utilities/perl/mkvsmod.pl index bb997b2..fa0fd29 100755 --- a/utilities/perl/mkvsmod.pl +++ b/utilities/perl/mkvsmod.pl @@ -1,23 +1,25 @@ #!/usr/bin/perl + #****************************************************************************** -#* -#* $Id: mkvsmod.pl 2327 2009-04-22 11:42:33Z scribe $ -#* -#* Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) -#* CrossWire Bible Society -#* P. O. Box 2528 -#* Tempe, AZ 85280-2528 -#* -#* This program is free software; you can redistribute it and/or modify it -#* under the terms of the GNU General Public License as published by the -#* Free Software Foundation version 2. -#* -#* This program is distributed in the hope that it will be useful, but -#* WITHOUT ANY WARRANTY; without even the implied warranty of -#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -#* General Public License for more details. -#* -#*/ +# +# mkvsmod.pl - +# +# $Id: mkvsmod.pl 2841 2013-06-29 10:58:08Z chrislit $ +# +# Copyright 2001-2009 CrossWire Bible Society (http://www.crosswire.org) +# CrossWire Bible Society +# P. O. Box 2528 +# Tempe, AZ 85280-2528 +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation version 2. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# open (INF, $ARGV[0]); diff --git a/utilities/step2vpl.cpp b/utilities/step2vpl.cpp index 30ffc7a..a9c4a6d 100644 --- a/utilities/step2vpl.cpp +++ b/utilities/step2vpl.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * step2vpl.cpp - Utility to export a STEP module as VPL + * + * $Id: step2vpl.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/stepdump.cpp b/utilities/stepdump.cpp index 17fe88d..3b9892e 100644 --- a/utilities/stepdump.cpp +++ b/utilities/stepdump.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * stepdump.cpp - Utility to dump a STEP module + * + * $Id: stepdump.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/sub.c b/utilities/sub.c index f6eb6df..76c340f 100644 --- a/utilities/sub.c +++ b/utilities/sub.c @@ -1,11 +1,13 @@ /****************************************************************************** - * This little utility substitutes all occurances of a string with another - * string. Is this useful? Maybe not. But it's been here since r2 so - * it seems a shame to remove it :) Currently not built by build system * - * $Id: sub.c 2327 2009-04-22 11:42:33Z scribe $ + * sub.c - This little utility substitutes all occurances of a string + * with another string. Is this useful? Maybe not. But it's + * been here since r2 so it seems a shame to remove it :) + * Currently not built by build system * - * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org) + * $Id: sub.c 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1997-2009 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/tei2mod.cpp b/utilities/tei2mod.cpp index 531e01b..575d882 100644 --- a/utilities/tei2mod.cpp +++ b/utilities/tei2mod.cpp @@ -1,4 +1,26 @@ -/** +/****************************************************************************** + * + * tei2mod.cpp - Utility to import documents encoded as TEI + * + * $Id: tei2mod.cpp 2978 2013-09-10 14:39:31Z scribe $ + * + * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +/****************************************************************************** * This program handles xml files of the form: * * @@ -26,22 +48,6 @@ * author DM Smith */ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ #ifdef _MSC_VER #pragma warning( disable: 4251 ) @@ -73,7 +79,7 @@ using namespace sword; using namespace std; #ifdef _ICU_ -UTF8NFC normalizer; +UTF8NFC *normalizer = 0; int normalized = 0; Latin1UTF8 converter; @@ -186,7 +192,7 @@ void normalizeInput(SWKey &key, SWBuf &text) { if (utf8State > 0) { SWBuf before = text; - normalizer.processText(text, (SWKey *)2); // note the hack of 2 to mimic a real key. TODO: remove all hacks + normalizer->processText(text, (SWKey *)2); // note the hack of 2 to mimic a real key. TODO: remove all hacks if (before != text) { normalized++; } @@ -352,6 +358,10 @@ void usage(const char *app, const char *error = 0) { } int main(int argc, char **argv) { +#ifdef _ICU_ + UTF8NFC normalizr; + normalizer = &normalizr; +#endif SWBuf program = argv[0]; fprintf(stderr, "You are running %s: $Rev: 2138 $\n", argv[0]); @@ -429,7 +439,7 @@ int main(int argc, char **argv) { usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library"); #endif } - else if (compType = "LZSS") { + else if (compType == "LZSS") { compressor = new LZSSCompress(); } @@ -480,7 +490,7 @@ int main(int argc, char **argv) { if (cipherKey.size()) { fprintf(stderr, "Adding cipher filter with phrase: %s\n", cipherKey.c_str() ); cipherFilter = new CipherFilter(cipherKey.c_str()); - module->AddRawFilter(cipherFilter); + module->addRawFilter(cipherFilter); } if (!module->isWritable()) { @@ -495,8 +505,8 @@ int main(int argc, char **argv) { exit(-2); } - currentKey = module->CreateKey(); - currentKey->Persist(1); + currentKey = module->createKey(); + currentKey->setPersist(true); module->setKey(*currentKey); (*module) = TOP; diff --git a/utilities/treeidxutil.cpp b/utilities/treeidxutil.cpp index 81b3ac2..abb9151 100644 --- a/utilities/treeidxutil.cpp +++ b/utilities/treeidxutil.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * treeidxutil.cpp - + * + * $Id: treeidxutil.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -110,7 +115,7 @@ int main(int argc, char **argv) { TreeKeyIdx *treeKey = new TreeKeyIdx(argv[1]); - if (treeKey->Error()) { + if (treeKey->popError()) { treeKey->create(argv[1]); delete treeKey; treeKey = new TreeKeyIdx(argv[1]); diff --git a/utilities/vcppmake/addgb.vcproj b/utilities/vcppmake/addgb.vcproj deleted file mode 100644 index 9eba2a8..0000000 --- a/utilities/vcppmake/addgb.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/addgb.vcxproj b/utilities/vcppmake/addgb.vcxproj new file mode 100644 index 0000000..6f54f23 --- /dev/null +++ b/utilities/vcppmake/addgb.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {76895767-61D0-41E6-B92D-FD541BB26D32} + addgb + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/addld.vcproj b/utilities/vcppmake/addld.vcproj deleted file mode 100644 index 1d611bb..0000000 --- a/utilities/vcppmake/addld.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/addld.vcxproj b/utilities/vcppmake/addld.vcxproj new file mode 100644 index 0000000..f9e614c --- /dev/null +++ b/utilities/vcppmake/addld.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2} + addld + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/addvs.vcproj b/utilities/vcppmake/addvs.vcproj deleted file mode 100644 index 50a0814..0000000 --- a/utilities/vcppmake/addvs.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/addvs.vcxproj b/utilities/vcppmake/addvs.vcxproj new file mode 100644 index 0000000..bef2d4d --- /dev/null +++ b/utilities/vcppmake/addvs.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {CFF1021E-B878-481A-851B-2B226701D525} + addvs + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/cipherraw.vcproj b/utilities/vcppmake/cipherraw.vcproj deleted file mode 100644 index 900ddd2..0000000 --- a/utilities/vcppmake/cipherraw.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/cipherraw.vcxproj b/utilities/vcppmake/cipherraw.vcxproj new file mode 100644 index 0000000..cc9491c --- /dev/null +++ b/utilities/vcppmake/cipherraw.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A} + cipherraw + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/emptyvss.vcproj b/utilities/vcppmake/emptyvss.vcproj deleted file mode 100644 index 6aa02f3..0000000 --- a/utilities/vcppmake/emptyvss.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/emptyvss.vcxproj b/utilities/vcppmake/emptyvss.vcxproj new file mode 100644 index 0000000..cb4ee1d --- /dev/null +++ b/utilities/vcppmake/emptyvss.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {A55BEE98-25BB-463D-9016-14CA4567DFBF} + emptyvss + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/genbookutil.vcproj b/utilities/vcppmake/genbookutil.vcproj deleted file mode 100644 index 50068e1..0000000 --- a/utilities/vcppmake/genbookutil.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/genbookutil.vcxproj b/utilities/vcppmake/genbookutil.vcxproj new file mode 100644 index 0000000..7dac210 --- /dev/null +++ b/utilities/vcppmake/genbookutil.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA} + genbookutil + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/imp2gbs.vcproj b/utilities/vcppmake/imp2gbs.vcproj deleted file mode 100644 index 43304b6..0000000 --- a/utilities/vcppmake/imp2gbs.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/imp2gbs.vcxproj b/utilities/vcppmake/imp2gbs.vcxproj new file mode 100644 index 0000000..1e81347 --- /dev/null +++ b/utilities/vcppmake/imp2gbs.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {2066EC0D-98CC-43E7-8405-5156AF111B38} + imp2gbs + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/imp2ld.vcproj b/utilities/vcppmake/imp2ld.vcproj deleted file mode 100644 index a6e5b76..0000000 --- a/utilities/vcppmake/imp2ld.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/imp2ld.vcxproj b/utilities/vcppmake/imp2ld.vcxproj new file mode 100644 index 0000000..f186ad6 --- /dev/null +++ b/utilities/vcppmake/imp2ld.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78} + imp2ld + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/imp2vs.vcproj b/utilities/vcppmake/imp2vs.vcproj deleted file mode 100644 index 0129705..0000000 --- a/utilities/vcppmake/imp2vs.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/imp2vs.vcxproj b/utilities/vcppmake/imp2vs.vcxproj new file mode 100644 index 0000000..d6b1860 --- /dev/null +++ b/utilities/vcppmake/imp2vs.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {5637456D-5B83-4C12-A129-708FC8CF0B33} + imp2vs + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/installmgr.vcproj b/utilities/vcppmake/installmgr.vcproj deleted file mode 100644 index 0aac602..0000000 --- a/utilities/vcppmake/installmgr.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/installmgr.vcxproj b/utilities/vcppmake/installmgr.vcxproj new file mode 100644 index 0000000..17d505c --- /dev/null +++ b/utilities/vcppmake/installmgr.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332} + installmgr + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/lexdump.vcxproj b/utilities/vcppmake/lexdump.vcxproj new file mode 100644 index 0000000..f69e383 --- /dev/null +++ b/utilities/vcppmake/lexdump.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D1115CD8-3810-48B0-8A21-F695016C3557} + lexdump + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/mkfastmod.vcproj b/utilities/vcppmake/mkfastmod.vcproj deleted file mode 100644 index 66a42a7..0000000 --- a/utilities/vcppmake/mkfastmod.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/mkfastmod.vcxproj b/utilities/vcppmake/mkfastmod.vcxproj new file mode 100644 index 0000000..4095a29 --- /dev/null +++ b/utilities/vcppmake/mkfastmod.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {DB592F77-25DC-4005-BD49-6D0E50303844} + mkfastmod + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + OnlyExplicitInline + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/mod2imp.vcproj b/utilities/vcppmake/mod2imp.vcproj deleted file mode 100644 index cff33a1..0000000 --- a/utilities/vcppmake/mod2imp.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/mod2imp.vcxproj b/utilities/vcppmake/mod2imp.vcxproj new file mode 100644 index 0000000..3c1be95 --- /dev/null +++ b/utilities/vcppmake/mod2imp.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1} + mod2imp + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/mod2osis.vcproj b/utilities/vcppmake/mod2osis.vcproj deleted file mode 100644 index 54582d9..0000000 --- a/utilities/vcppmake/mod2osis.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/mod2osis.vcxproj b/utilities/vcppmake/mod2osis.vcxproj new file mode 100644 index 0000000..7227c88 --- /dev/null +++ b/utilities/vcppmake/mod2osis.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {B5D19969-5285-4B0E-B798-496A0B8DCA61} + mod2osis + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/mod2vpl.vcproj b/utilities/vcppmake/mod2vpl.vcproj deleted file mode 100644 index 7043386..0000000 --- a/utilities/vcppmake/mod2vpl.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/mod2vpl.vcxproj b/utilities/vcppmake/mod2vpl.vcxproj new file mode 100644 index 0000000..8c952a4 --- /dev/null +++ b/utilities/vcppmake/mod2vpl.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {0C43604F-08D6-490C-BDFD-1B6CACB59740} + mod2vpl + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/mod2zmod.vcproj b/utilities/vcppmake/mod2zmod.vcproj deleted file mode 100644 index c12ecd2..0000000 --- a/utilities/vcppmake/mod2zmod.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/mod2zmod.vcxproj b/utilities/vcppmake/mod2zmod.vcxproj new file mode 100644 index 0000000..33c6161 --- /dev/null +++ b/utilities/vcppmake/mod2zmod.vcxproj @@ -0,0 +1,116 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31} + mod2zmod + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/modwrite.vcproj b/utilities/vcppmake/modwrite.vcproj deleted file mode 100644 index f1cbc74..0000000 --- a/utilities/vcppmake/modwrite.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/modwrite.vcxproj b/utilities/vcppmake/modwrite.vcxproj new file mode 100644 index 0000000..8f36476 --- /dev/null +++ b/utilities/vcppmake/modwrite.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0} + modwrite + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/osis2mod.vcproj b/utilities/vcppmake/osis2mod.vcproj deleted file mode 100644 index 1b23c6f..0000000 --- a/utilities/vcppmake/osis2mod.vcproj +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/osis2mod.vcxproj b/utilities/vcppmake/osis2mod.vcxproj new file mode 100644 index 0000000..28a1178 --- /dev/null +++ b/utilities/vcppmake/osis2mod.vcxproj @@ -0,0 +1,123 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75} + osis2mod + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + AnySuitable + true + Speed + + + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + false + Level3 + ProgramDatabase + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + + + + + + + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/step2vpl.vcproj b/utilities/vcppmake/step2vpl.vcproj deleted file mode 100644 index f0b722b..0000000 --- a/utilities/vcppmake/step2vpl.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/step2vpl.vcxproj b/utilities/vcppmake/step2vpl.vcxproj new file mode 100644 index 0000000..44321ba --- /dev/null +++ b/utilities/vcppmake/step2vpl.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {43B53430-3C91-4A11-8A1F-5873AEEE0926} + step2vpl + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/stepdump.vcproj b/utilities/vcppmake/stepdump.vcproj deleted file mode 100644 index 605746d..0000000 --- a/utilities/vcppmake/stepdump.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/stepdump.vcxproj b/utilities/vcppmake/stepdump.vcxproj new file mode 100644 index 0000000..88b05e2 --- /dev/null +++ b/utilities/vcppmake/stepdump.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9} + stepdump + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/tei2mod.vcproj b/utilities/vcppmake/tei2mod.vcproj deleted file mode 100644 index 89a6c59..0000000 --- a/utilities/vcppmake/tei2mod.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/tei2mod.vcxproj b/utilities/vcppmake/tei2mod.vcxproj new file mode 100644 index 0000000..b6784cb --- /dev/null +++ b/utilities/vcppmake/tei2mod.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9} + tei2mod + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Size + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/treeidxutil.vcproj b/utilities/vcppmake/treeidxutil.vcproj deleted file mode 100644 index a93fbc6..0000000 --- a/utilities/vcppmake/treeidxutil.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/treeidxutil.vcxproj b/utilities/vcppmake/treeidxutil.vcxproj new file mode 100644 index 0000000..2e1026c --- /dev/null +++ b/utilities/vcppmake/treeidxutil.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B} + treeidxutil + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Size + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/utilities.sln b/utilities/vcppmake/utilities.sln index 20d97b2..a79f0ae 100644 --- a/utilities/vcppmake/utilities.sln +++ b/utilities/vcppmake/utilities.sln @@ -1,349 +1,259 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\lib\vcppmake\vc8\libsword.vcproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\lib\vcppmake\libsword.vcxproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osis2mod", "osis2mod.vcproj", "{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osis2mod", "osis2mod.vcxproj", "{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0} = {45C674C0-193D-47AF-B9E0-61A4DE57D3E0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addgb", "addgb.vcproj", "{76895767-61D0-41E6-B92D-FD541BB26D32}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addgb", "addgb.vcxproj", "{76895767-61D0-41E6-B92D-FD541BB26D32}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addld", "addld.vcxproj", "{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {76895767-61D0-41E6-B92D-FD541BB26D32} = {76895767-61D0-41E6-B92D-FD541BB26D32} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addld", "addld.vcproj", "{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addvs", "addvs.vcxproj", "{CFF1021E-B878-481A-851B-2B226701D525}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2} = {BBB6D2DE-D890-4758-85CF-8057B93CF6C2} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addvs", "addvs.vcproj", "{CFF1021E-B878-481A-851B-2B226701D525}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cipherraw", "cipherraw.vcxproj", "{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {CFF1021E-B878-481A-851B-2B226701D525} = {CFF1021E-B878-481A-851B-2B226701D525} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cipherraw", "cipherraw.vcproj", "{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emptyvss", "emptyvss.vcxproj", "{A55BEE98-25BB-463D-9016-14CA4567DFBF}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {891A765C-5503-4FED-B427-7AE1413DB264} = {891A765C-5503-4FED-B427-7AE1413DB264} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emptyvss", "emptyvss.vcproj", "{A55BEE98-25BB-463D-9016-14CA4567DFBF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2gbs", "imp2gbs.vcxproj", "{2066EC0D-98CC-43E7-8405-5156AF111B38}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA} = {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2gbs", "imp2gbs.vcproj", "{2066EC0D-98CC-43E7-8405-5156AF111B38}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2ld", "imp2ld.vcxproj", "{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {2066EC0D-98CC-43E7-8405-5156AF111B38} = {2066EC0D-98CC-43E7-8405-5156AF111B38} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2ld", "imp2ld.vcproj", "{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2vs", "imp2vs.vcxproj", "{5637456D-5B83-4C12-A129-708FC8CF0B33}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78} = {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2vs", "imp2vs.vcproj", "{5637456D-5B83-4C12-A129-708FC8CF0B33}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installmgr", "installmgr.vcxproj", "{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {5637456D-5B83-4C12-A129-708FC8CF0B33} = {5637456D-5B83-4C12-A129-708FC8CF0B33} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installmgr", "installmgr.vcproj", "{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mkfastmod", "mkfastmod.vcxproj", "{DB592F77-25DC-4005-BD49-6D0E50303844}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {D1115CD8-3810-48B0-8A21-F695016C3557} = {D1115CD8-3810-48B0-8A21-F695016C3557} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mkfastmod", "mkfastmod.vcproj", "{DB592F77-25DC-4005-BD49-6D0E50303844}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2imp", "mod2imp.vcxproj", "{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {DB592F77-25DC-4005-BD49-6D0E50303844} = {DB592F77-25DC-4005-BD49-6D0E50303844} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2imp", "mod2imp.vcproj", "{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2osis", "mod2osis.vcxproj", "{B5D19969-5285-4B0E-B798-496A0B8DCA61}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1} = {95B74350-2DAB-4CA9-BAFB-A5EB264765A1} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2osis", "mod2osis.vcproj", "{B5D19969-5285-4B0E-B798-496A0B8DCA61}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2vpl", "mod2vpl.vcxproj", "{0C43604F-08D6-490C-BDFD-1B6CACB59740}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {B5D19969-5285-4B0E-B798-496A0B8DCA61} = {B5D19969-5285-4B0E-B798-496A0B8DCA61} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2vpl", "mod2vpl.vcproj", "{0C43604F-08D6-490C-BDFD-1B6CACB59740}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2zmod", "mod2zmod.vcxproj", "{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {0C43604F-08D6-490C-BDFD-1B6CACB59740} = {0C43604F-08D6-490C-BDFD-1B6CACB59740} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2zmod", "mod2zmod.vcproj", "{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "step2vpl", "step2vpl.vcxproj", "{43B53430-3C91-4A11-8A1F-5873AEEE0926}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75} = {3D885A23-DA8F-43C1-B241-7F44CA7AAF75} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "step2vpl", "step2vpl.vcproj", "{43B53430-3C91-4A11-8A1F-5873AEEE0926}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stepdump", "stepdump.vcxproj", "{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {43B53430-3C91-4A11-8A1F-5873AEEE0926} = {43B53430-3C91-4A11-8A1F-5873AEEE0926} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stepdump", "stepdump.vcproj", "{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tei2mod", "tei2mod.vcxproj", "{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9} = {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tei2mod", "tei2mod.vcproj", "{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "treeidxutil", "treeidxutil.vcxproj", "{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9} = {86D28D9A-2D6A-49A3-A790-275C0CAE14C9} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "treeidxutil", "treeidxutil.vcproj", "{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisref", "vs2osisref.vcxproj", "{DFDB8804-5D6C-448F-A935-DD85629E0554}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {7192CF83-B08C-4387-A869-FD1970167115} = {7192CF83-B08C-4387-A869-FD1970167115} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisref", "vs2osisref.vcproj", "{DFDB8804-5D6C-448F-A935-DD85629E0554}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisreftxt", "vs2osisreftxt.vcxproj", "{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {DFDB8804-5D6C-448F-A935-DD85629E0554} = {DFDB8804-5D6C-448F-A935-DD85629E0554} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisreftxt", "vs2osisreftxt.vcproj", "{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2gbs", "xml2gbs.vcxproj", "{87116D0C-E498-4193-9F2D-301A8771B77D}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0} = {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2gbs", "xml2gbs.vcproj", "{87116D0C-E498-4193-9F2D-301A8771B77D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genbookutil", "genbookutil.vcxproj", "{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {891A765C-5503-4FED-B427-7AE1413DB264} = {891A765C-5503-4FED-B427-7AE1413DB264} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genbookutil", "genbookutil.vcproj", "{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modwrite", "modwrite.vcxproj", "{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31} = {4E58EE7D-2B4B-42F0-8578-A23883CA6C31} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modwrite", "modwrite.vcproj", "{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpl2mod", "vpl2mod.vcxproj", "{7192CF83-B08C-4387-A869-FD1970167115}" ProjectSection(ProjectDependencies) = postProject - {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B} = {5638CD25-87F7-4A22-AF6D-EBECCD26B35B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lexdump", "lexdump.vcxproj", "{D1115CD8-3810-48B0-8A21-F695016C3557}" + ProjectSection(ProjectDependencies) = postProject + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332} = {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpl2mod", "vpl2mod.vcproj", "{7192CF83-B08C-4387-A869-FD1970167115}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diatheke", "..\diatheke\diatheke.vcxproj", "{891A765C-5503-4FED-B427-7AE1413DB264}" ProjectSection(ProjectDependencies) = postProject + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A} = {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A} {97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4} EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug with ICU|Win32 = Debug with ICU|Win32 Debug|Win32 = Debug|Win32 - Release with ICU|Win32 = Release with ICU|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.Build.0 = Release with ICU|Win32 {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.ActiveCfg = Debug|Win32 {97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.Build.0 = Debug|Win32 - {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32 {97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release|Win32.Build.0 = Release with ICU|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {76895767-61D0-41E6-B92D-FD541BB26D32}.Release|Win32.Build.0 = Release with ICU|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release|Win32.Build.0 = Release with ICU|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {CFF1021E-B878-481A-851B-2B226701D525}.Release|Win32.Build.0 = Release with ICU|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release|Win32.Build.0 = Release with ICU|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release|Win32.Build.0 = Release with ICU|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {2066EC0D-98CC-43E7-8405-5156AF111B38}.Release|Win32.Build.0 = Release with ICU|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release|Win32.Build.0 = Release with ICU|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {5637456D-5B83-4C12-A129-708FC8CF0B33}.Release|Win32.Build.0 = Release with ICU|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release|Win32.Build.0 = Release with ICU|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {DB592F77-25DC-4005-BD49-6D0E50303844}.Release|Win32.Build.0 = Release with ICU|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release|Win32.Build.0 = Release with ICU|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release|Win32.Build.0 = Release with ICU|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release|Win32.Build.0 = Release with ICU|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release|Win32.Build.0 = Release with ICU|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release|Win32.Build.0 = Release with ICU|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release|Win32.Build.0 = Release with ICU|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release|Win32.Build.0 = Release with ICU|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release|Win32.Build.0 = Release with ICU|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {DFDB8804-5D6C-448F-A935-DD85629E0554}.Release|Win32.Build.0 = Release with ICU|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release|Win32.Build.0 = Release with ICU|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.Build.0 = Release with ICU|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.Build.0 = Release with ICU|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.Build.0 = Release with ICU|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.ActiveCfg = Debug with ICU|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.Build.0 = Debug with ICU|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Release with ICU|Win32.Build.0 = Release with ICU|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.ActiveCfg = Release with ICU|Win32 - {7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.Build.0 = Release with ICU|Win32 + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug|Win32.ActiveCfg = Debug|Win32 + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug|Win32.Build.0 = Debug|Win32 + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release|Win32.ActiveCfg = Release|Win32 + {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release|Win32.Build.0 = Release|Win32 + {76895767-61D0-41E6-B92D-FD541BB26D32}.Debug|Win32.ActiveCfg = Debug|Win32 + {76895767-61D0-41E6-B92D-FD541BB26D32}.Debug|Win32.Build.0 = Debug|Win32 + {76895767-61D0-41E6-B92D-FD541BB26D32}.Release|Win32.ActiveCfg = Release|Win32 + {76895767-61D0-41E6-B92D-FD541BB26D32}.Release|Win32.Build.0 = Release|Win32 + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug|Win32.Build.0 = Debug|Win32 + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release|Win32.ActiveCfg = Release|Win32 + {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release|Win32.Build.0 = Release|Win32 + {CFF1021E-B878-481A-851B-2B226701D525}.Debug|Win32.ActiveCfg = Debug|Win32 + {CFF1021E-B878-481A-851B-2B226701D525}.Debug|Win32.Build.0 = Debug|Win32 + {CFF1021E-B878-481A-851B-2B226701D525}.Release|Win32.ActiveCfg = Release|Win32 + {CFF1021E-B878-481A-851B-2B226701D525}.Release|Win32.Build.0 = Release|Win32 + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug|Win32.Build.0 = Debug|Win32 + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release|Win32.ActiveCfg = Release|Win32 + {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release|Win32.Build.0 = Release|Win32 + {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug|Win32.ActiveCfg = Debug|Win32 + {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug|Win32.Build.0 = Debug|Win32 + {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release|Win32.ActiveCfg = Release|Win32 + {A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release|Win32.Build.0 = Release|Win32 + {2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug|Win32.ActiveCfg = Debug|Win32 + {2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug|Win32.Build.0 = Debug|Win32 + {2066EC0D-98CC-43E7-8405-5156AF111B38}.Release|Win32.ActiveCfg = Release|Win32 + {2066EC0D-98CC-43E7-8405-5156AF111B38}.Release|Win32.Build.0 = Release|Win32 + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug|Win32.ActiveCfg = Debug|Win32 + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug|Win32.Build.0 = Debug|Win32 + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release|Win32.ActiveCfg = Release|Win32 + {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release|Win32.Build.0 = Release|Win32 + {5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug|Win32.ActiveCfg = Debug|Win32 + {5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug|Win32.Build.0 = Debug|Win32 + {5637456D-5B83-4C12-A129-708FC8CF0B33}.Release|Win32.ActiveCfg = Release|Win32 + {5637456D-5B83-4C12-A129-708FC8CF0B33}.Release|Win32.Build.0 = Release|Win32 + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug|Win32.ActiveCfg = Debug|Win32 + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug|Win32.Build.0 = Debug|Win32 + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release|Win32.ActiveCfg = Release|Win32 + {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release|Win32.Build.0 = Release|Win32 + {DB592F77-25DC-4005-BD49-6D0E50303844}.Debug|Win32.ActiveCfg = Debug|Win32 + {DB592F77-25DC-4005-BD49-6D0E50303844}.Debug|Win32.Build.0 = Debug|Win32 + {DB592F77-25DC-4005-BD49-6D0E50303844}.Release|Win32.ActiveCfg = Release|Win32 + {DB592F77-25DC-4005-BD49-6D0E50303844}.Release|Win32.Build.0 = Release|Win32 + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug|Win32.Build.0 = Debug|Win32 + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release|Win32.ActiveCfg = Release|Win32 + {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release|Win32.Build.0 = Release|Win32 + {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug|Win32.ActiveCfg = Debug|Win32 + {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug|Win32.Build.0 = Debug|Win32 + {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release|Win32.ActiveCfg = Release|Win32 + {B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release|Win32.Build.0 = Release|Win32 + {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug|Win32.ActiveCfg = Debug|Win32 + {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug|Win32.Build.0 = Debug|Win32 + {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release|Win32.ActiveCfg = Release|Win32 + {0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release|Win32.Build.0 = Release|Win32 + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug|Win32.ActiveCfg = Debug|Win32 + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug|Win32.Build.0 = Debug|Win32 + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release|Win32.ActiveCfg = Release|Win32 + {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release|Win32.Build.0 = Release|Win32 + {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug|Win32.ActiveCfg = Debug|Win32 + {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug|Win32.Build.0 = Debug|Win32 + {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release|Win32.ActiveCfg = Release|Win32 + {43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release|Win32.Build.0 = Release|Win32 + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug|Win32.ActiveCfg = Debug|Win32 + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug|Win32.Build.0 = Debug|Win32 + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release|Win32.ActiveCfg = Release|Win32 + {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release|Win32.Build.0 = Release|Win32 + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug|Win32.Build.0 = Debug|Win32 + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release|Win32.ActiveCfg = Release|Win32 + {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release|Win32.Build.0 = Release|Win32 + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug|Win32.ActiveCfg = Debug|Win32 + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug|Win32.Build.0 = Debug|Win32 + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release|Win32.ActiveCfg = Release|Win32 + {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release|Win32.Build.0 = Release|Win32 + {DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug|Win32.ActiveCfg = Debug|Win32 + {DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug|Win32.Build.0 = Debug|Win32 + {DFDB8804-5D6C-448F-A935-DD85629E0554}.Release|Win32.ActiveCfg = Release|Win32 + {DFDB8804-5D6C-448F-A935-DD85629E0554}.Release|Win32.Build.0 = Release|Win32 + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug|Win32.Build.0 = Debug|Win32 + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release|Win32.ActiveCfg = Release|Win32 + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release|Win32.Build.0 = Release|Win32 + {87116D0C-E498-4193-9F2D-301A8771B77D}.Debug|Win32.ActiveCfg = Debug|Win32 + {87116D0C-E498-4193-9F2D-301A8771B77D}.Debug|Win32.Build.0 = Debug|Win32 + {87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.ActiveCfg = Release|Win32 + {87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.Build.0 = Release|Win32 + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.Build.0 = Debug|Win32 + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.ActiveCfg = Release|Win32 + {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.Build.0 = Release|Win32 + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.ActiveCfg = Debug|Win32 + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.Build.0 = Debug|Win32 + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.ActiveCfg = Release|Win32 + {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.Build.0 = Release|Win32 + {7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.ActiveCfg = Debug|Win32 + {7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.Build.0 = Debug|Win32 + {7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.ActiveCfg = Release|Win32 + {7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.Build.0 = Release|Win32 + {D1115CD8-3810-48B0-8A21-F695016C3557}.Debug|Win32.ActiveCfg = Debug|Win32 + {D1115CD8-3810-48B0-8A21-F695016C3557}.Debug|Win32.Build.0 = Debug|Win32 + {D1115CD8-3810-48B0-8A21-F695016C3557}.Release|Win32.ActiveCfg = Release|Win32 + {D1115CD8-3810-48B0-8A21-F695016C3557}.Release|Win32.Build.0 = Release|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.ActiveCfg = Debug|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.Build.0 = Debug|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.ActiveCfg = Release|Win32 + {891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/utilities/vcppmake/vpl2mod.vcproj b/utilities/vcppmake/vpl2mod.vcproj deleted file mode 100644 index 6caea18..0000000 --- a/utilities/vcppmake/vpl2mod.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/vpl2mod.vcxproj b/utilities/vcppmake/vpl2mod.vcxproj new file mode 100644 index 0000000..cd59a72 --- /dev/null +++ b/utilities/vcppmake/vpl2mod.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {7192CF83-B08C-4387-A869-FD1970167115} + vpl2mod + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/vs2osisref.vcproj b/utilities/vcppmake/vs2osisref.vcproj deleted file mode 100644 index cccaca2..0000000 --- a/utilities/vcppmake/vs2osisref.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/vs2osisref.vcxproj b/utilities/vcppmake/vs2osisref.vcxproj new file mode 100644 index 0000000..837e68b --- /dev/null +++ b/utilities/vcppmake/vs2osisref.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {DFDB8804-5D6C-448F-A935-DD85629E0554} + vs2osisref + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/vs2osisreftxt.vcproj b/utilities/vcppmake/vs2osisreftxt.vcproj deleted file mode 100644 index d030ea9..0000000 --- a/utilities/vcppmake/vs2osisreftxt.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/vs2osisreftxt.vcxproj b/utilities/vcppmake/vs2osisreftxt.vcxproj new file mode 100644 index 0000000..d5d1a18 --- /dev/null +++ b/utilities/vcppmake/vs2osisreftxt.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0} + vs2osisreftxt + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Size + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vcppmake/xml2gbs.vcproj b/utilities/vcppmake/xml2gbs.vcproj deleted file mode 100644 index f67d837..0000000 --- a/utilities/vcppmake/xml2gbs.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/vcppmake/xml2gbs.vcxproj b/utilities/vcppmake/xml2gbs.vcxproj new file mode 100644 index 0000000..c53459a --- /dev/null +++ b/utilities/vcppmake/xml2gbs.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {87116D0C-E498-4193-9F2D-301A8771B77D} + xml2gbs + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)Debug\ + Debug\ + $(SolutionDir)Release\ + Release\ + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + true + + + + Disabled + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + EditAndContinue + true + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Debug\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories) + true + MachineX86 + + + + + + + Full + true + ../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + ProgramDatabase + true + AnySuitable + Speed + + + libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies) + Release\$(ProjectName).exe + ../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories) + true + true + true + MachineX86 + + + + + + + + {97449e5e-f880-4d22-933a-0d2fc32034d4} + false + + + + + + \ No newline at end of file diff --git a/utilities/vpl2mod.cpp b/utilities/vpl2mod.cpp index e2fca09..c696541 100644 --- a/utilities/vpl2mod.cpp +++ b/utilities/vpl2mod.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * vpl2mod.cpp - Utility to import VPL formatted modules + * + * $Id: vpl2mod.cpp 2921 2013-07-28 17:21:44Z scribe $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -36,8 +41,7 @@ #include #include #include -#include -#include +#include #include #ifndef NO_SWORD_NAMESPACE @@ -45,10 +49,10 @@ using sword::FileMgr; using sword::SWMgr; using sword::RawText; using sword::VerseKey; +using sword::SWBuf; using sword::SW_POSITION; #endif -using std::string; char readline(int fd, char **buf) { char ch; @@ -130,14 +134,14 @@ char *parseVReg(char *buf) { bool isKJVRef(const char *buf) { VerseKey vk, test; - vk.AutoNormalize(0); - vk.Headings(1); // turn on mod/testmnt/book/chap headings - vk.Persist(1); + vk.setAutoNormalize(false); + vk.setIntros(true); // turn on mod/testmnt/book/chap headings + vk.setPersist(true); // lets do some tests on the verse -------------- vk = buf; test = buf; - if (vk.Testament() && vk.Book() && vk.Chapter() && vk.Verse()) { // if we're not a heading + if (vk.getTestament() && vk.getBook() && vk.getChapter() && vk.getVerse()) { // if we're not a heading // std::cerr << (const char*)vk << " == " << (const char*)test << std::endl; return (vk == test); } @@ -213,9 +217,9 @@ int main(int argc, char **argv) { char *buffer = 0; RawText mod(argv[2]); // open our datapath with our RawText driver. VerseKey vk; - vk.AutoNormalize(0); - vk.Headings(1); // turn on mod/testmnt/book/chap headings - vk.Persist(1); + vk.setAutoNormalize(false); + vk.setIntros(true); // turn on mod/testmnt/book/chap headings + vk.setPersist(true); mod.setKey(vk); @@ -225,7 +229,7 @@ int main(int argc, char **argv) { if (ntonly) vk = "Matthew 1:1"; int successive = 0; //part of hack below - while ((!mod.Error()) && (!readline(fd, &buffer))) { + while ((!mod.popError()) && (!readline(fd, &buffer))) { if (*buffer == '|') // comments, ignore line continue; if (vref) { @@ -236,11 +240,11 @@ int main(int argc, char **argv) { } vk = buffer; - if (vk.Error()) { + if (vk.popError()) { std::cerr << "Error parsing key: " << buffer << "\n"; exit(-5); } - string orig = mod.getRawEntry(); + SWBuf orig = mod.getRawEntry(); if (!isKJVRef(buffer)) { VerseKey origVK = vk; @@ -248,7 +252,7 @@ int main(int argc, char **argv) { do { vk--; } - while (!vk.Error() && !isKJVRef(vk)); */ + while (!vk.popError() && !isKJVRef(vk)); */ //hack to replace above: successive++; vk -= successive; @@ -261,7 +265,7 @@ int main(int argc, char **argv) { orig += ") "; orig += verseText; orig += " ] "; - verseText = orig.c_str(); + verseText = orig; } else { successive = 0; diff --git a/utilities/vs2osisref.cpp b/utilities/vs2osisref.cpp index 275d724..d283944 100644 --- a/utilities/vs2osisref.cpp +++ b/utilities/vs2osisref.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * vs2osisref.cpp - Utility to translate a verse reference to an osisRef + * + * $Id: vs2osisref.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 diff --git a/utilities/vs2osisreftxt.cpp b/utilities/vs2osisreftxt.cpp index bf99b88..cd52789 100644 --- a/utilities/vs2osisreftxt.cpp +++ b/utilities/vs2osisreftxt.cpp @@ -1,5 +1,11 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * vs2osisreftext.cpp - Utility to translate a verse reference to an + * osisRef + * + * $Id: vs2osisreftxt.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -42,13 +48,13 @@ int main(int argc, char **argv) { DefaultVSKey = "jas3:1"; - ListKey verses = DefaultVSKey.ParseVerseList(argv[1], DefaultVSKey, true); + ListKey verses = DefaultVSKey.parseVerseList(argv[1], DefaultVSKey, true); std::cout << verses.getOSISRefRangeText() << "\n"; if (argc > 3) { verses.setText(argv[3]); - std::cout << "Verse is" << ((verses.Error()) ? " NOT" : "") << " in set.\n\n"; + std::cout << "Verse is" << ((verses.popError()) ? " NOT" : "") << " in set.\n\n"; } return 0; diff --git a/utilities/xml2gbs.cpp b/utilities/xml2gbs.cpp index 72f9b41..d49b536 100644 --- a/utilities/xml2gbs.cpp +++ b/utilities/xml2gbs.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * xml2gbs.cpp - Importer for GenBooks formatted as OSIS, ThML, or TEI + * + * $Id: xml2gbs.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2012 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -42,9 +47,9 @@ using sword::SWKey; //#define DEBUG -enum XML_FORMATS { F_AUTODETECT, F_OSIS, F_THML }; +enum XML_FORMATS { F_AUTODETECT, F_OSIS, F_THML, F_TEI }; -#define HELPTEXT "xml2gbs 1.0 OSIS/ThML General Book module creation tool for the SWORD Project\n usage:\n xml2gbs [-l] [-i] [-fT|-fO] [modname]\n -l uses long div names in ThML files\n -i exports to IMP format instead of creating a module\n -fO and -fT will set the importer to expect OSIS or ThML format respectively\n (otherwise it attempts to autodetect)\n" +#define HELPTEXT "xml2gbs 1.0 OSIS/ThML/TEI General Book module creation tool for the SWORD Project\n usage:\n xml2gbs [-l] [-i] [-fT|-fO|-fE] [modname]\n -l uses long div names in ThML files\n -i exports to IMP format instead of creating a module\n -fO, -fT, and -fE will set the importer to expect OSIS, ThML, or TEI format respectively\n (otherwise it attempts to autodetect)\n" unsigned char detectFormat(char* filename) { @@ -65,6 +70,9 @@ unsigned char detectFormat(char* filename) { else if (strstr(entbuffer.c_str(), "