Merge lp:~fluidity-core/fluidity/update-spatialindex into lp:fluidity
- update-spatialindex
- Merge into dev-trunk
Proposed by
Tim Greaves
Status: | Merged |
---|---|
Merged at revision: | 4145 |
Proposed branch: | lp:~fluidity-core/fluidity/update-spatialindex |
Merge into: | lp:fluidity |
Diff against target: |
165331 lines (+81855/-81631) 344 files modified
Makefile.in (+1/-1) configure (+4/-3) configure.in (+3/-3) spatialindex-1.5/AUTHORS (+0/-5) spatialindex-1.5/COPYING (+0/-504) spatialindex-1.5/ChangeLog (+0/-1086) spatialindex-1.5/HOWTORELEASE.txt (+0/-82) spatialindex-1.5/INSTALL (+0/-231) spatialindex-1.5/INSTALL.WIN (+0/-28) spatialindex-1.5/Makefile.am (+0/-23) spatialindex-1.5/Makefile.in (+0/-816) spatialindex-1.5/README (+0/-389) spatialindex-1.5/aclocal.m4 (+0/-8916) spatialindex-1.5/autogen.sh (+0/-42) spatialindex-1.5/config.guess (+0/-1561) spatialindex-1.5/config.sub (+0/-1686) spatialindex-1.5/configure (+0/-16886) spatialindex-1.5/configure.ac (+0/-71) spatialindex-1.5/depcomp (+0/-522) spatialindex-1.5/include/LineSegment.h (+0/-83) spatialindex-1.5/include/MVRTree.h (+0/-83) spatialindex-1.5/include/Makefile.am (+0/-16) spatialindex-1.5/include/Makefile.in (+0/-617) spatialindex-1.5/include/MovingPoint.h (+0/-79) spatialindex-1.5/include/MovingRegion.h (+0/-155) spatialindex-1.5/include/Point.h (+0/-77) spatialindex-1.5/include/RTree.h (+0/-102) spatialindex-1.5/include/Region.h (+0/-97) spatialindex-1.5/include/SpatialIndex.h (+0/-250) spatialindex-1.5/include/TPRTree.h (+0/-78) spatialindex-1.5/include/TimePoint.h (+0/-89) spatialindex-1.5/include/TimeRegion.h (+0/-102) spatialindex-1.5/include/Version.h (+0/-42) spatialindex-1.5/include/capi/BoundsQuery.h (+0/-45) spatialindex-1.5/include/capi/CountVisitor.h (+0/-45) spatialindex-1.5/include/capi/DataStream.h (+0/-53) spatialindex-1.5/include/capi/Error.h (+0/-51) spatialindex-1.5/include/capi/IdVisitor.h (+0/-47) spatialindex-1.5/include/capi/Index.h (+0/-66) spatialindex-1.5/include/capi/LeafQuery.h (+0/-70) spatialindex-1.5/include/capi/Makefile.am (+0/-16) spatialindex-1.5/include/capi/Makefile.in (+0/-464) spatialindex-1.5/include/capi/ObjVisitor.h (+0/-48) spatialindex-1.5/include/capi/Utility.h (+0/-30) spatialindex-1.5/include/capi/sidx_api.h (+0/-203) spatialindex-1.5/include/capi/sidx_config.h (+0/-120) spatialindex-1.5/include/capi/sidx_impl.h (+0/-45) spatialindex-1.5/include/tools/Makefile.am (+0/-7) spatialindex-1.5/include/tools/Makefile.in (+0/-456) spatialindex-1.5/include/tools/PointerPool.h (+0/-114) spatialindex-1.5/include/tools/PoolPointer.h (+0/-96) spatialindex-1.5/include/tools/SmartPointer.h (+0/-78) spatialindex-1.5/include/tools/Tools.h (+0/-512) spatialindex-1.5/include/tools/rand48.h (+0/-11) spatialindex-1.5/install-sh (+0/-322) spatialindex-1.5/ltmain.sh (+0/-8413) spatialindex-1.5/makefile.vc (+0/-216) spatialindex-1.5/missing (+0/-353) spatialindex-1.5/mkinstalldirs (+0/-150) spatialindex-1.5/regressiontest/Makefile.am (+0/-2) spatialindex-1.5/regressiontest/Makefile.in (+0/-554) spatialindex-1.5/regressiontest/mvrtree/Exhaustive.cc (+0/-225) spatialindex-1.5/regressiontest/mvrtree/Generator.cc (+0/-175) spatialindex-1.5/regressiontest/mvrtree/MVRTreeLoad.cc (+0/-209) spatialindex-1.5/regressiontest/mvrtree/MVRTreeQuery.cc (+0/-268) spatialindex-1.5/regressiontest/mvrtree/Makefile.am (+0/-12) spatialindex-1.5/regressiontest/mvrtree/Makefile.in (+0/-503) spatialindex-1.5/regressiontest/mvrtree/test1/run (+0/-29) spatialindex-1.5/regressiontest/mvrtree/test2/run (+0/-22) spatialindex-1.5/regressiontest/rtree/Exhaustive.cc (+0/-216) spatialindex-1.5/regressiontest/rtree/Generator.cc (+0/-128) spatialindex-1.5/regressiontest/rtree/Makefile.am (+0/-13) spatialindex-1.5/regressiontest/rtree/Makefile.in (+0/-514) spatialindex-1.5/regressiontest/rtree/RTreeBulkLoad.cc (+0/-162) spatialindex-1.5/regressiontest/rtree/RTreeBulkLoad.vcproj (+0/-360) spatialindex-1.5/regressiontest/rtree/RTreeExhaustive.vcproj (+0/-360) spatialindex-1.5/regressiontest/rtree/RTreeGenerator.vcproj (+0/-364) spatialindex-1.5/regressiontest/rtree/RTreeLoad.cc (+0/-202) spatialindex-1.5/regressiontest/rtree/RTreeLoad.vcproj (+0/-360) spatialindex-1.5/regressiontest/rtree/RTreeQuery.cc (+0/-272) spatialindex-1.5/regressiontest/rtree/RTreeQuery.vcproj (+0/-360) spatialindex-1.5/regressiontest/rtree/test1/run (+0/-29) spatialindex-1.5/regressiontest/rtree/test2/run (+0/-23) spatialindex-1.5/regressiontest/rtree/test3/run (+0/-30) spatialindex-1.5/regressiontest/rtree/test4/run (+0/-29) spatialindex-1.5/regressiontest/tprtree/Exhaustive.cc (+0/-272) spatialindex-1.5/regressiontest/tprtree/Generator.cc (+0/-98) spatialindex-1.5/regressiontest/tprtree/Makefile.am (+0/-11) spatialindex-1.5/regressiontest/tprtree/Makefile.in (+0/-513) spatialindex-1.5/regressiontest/tprtree/RandomGenerator.cc (+0/-176) spatialindex-1.5/regressiontest/tprtree/RandomGenerator.h (+0/-138) spatialindex-1.5/regressiontest/tprtree/TPRTreeLoad.cc (+0/-197) spatialindex-1.5/regressiontest/tprtree/TPRTreeQuery.cc (+0/-298) spatialindex-1.5/regressiontest/tprtree/test1/run (+0/-29) spatialindex-1.5/regressiontest/tprtree/test2/run (+0/-23) spatialindex-1.5/spatialindex-vc/spatialindex.vcproj (+0/-960) spatialindex-1.5/spatialindex.sln (+0/-91) spatialindex-1.5/src/Makefile.am (+0/-2) spatialindex-1.5/src/Makefile.in (+0/-554) spatialindex-1.5/src/capi/BoundsQuery.cc (+0/-45) spatialindex-1.5/src/capi/CountVisitor.cc (+0/-52) spatialindex-1.5/src/capi/DataStream.cc (+0/-107) spatialindex-1.5/src/capi/Error.cc (+0/-54) spatialindex-1.5/src/capi/IdVisitor.cc (+0/-53) spatialindex-1.5/src/capi/Index.cc (+0/-362) spatialindex-1.5/src/capi/LeafQuery.cc (+0/-126) spatialindex-1.5/src/capi/Makefile.am (+0/-13) spatialindex-1.5/src/capi/Makefile.in (+0/-492) spatialindex-1.5/src/capi/ObjVisitor.cc (+0/-60) spatialindex-1.5/src/capi/Utility.cc (+0/-140) spatialindex-1.5/src/capi/sidx_api.cc (+0/-2354) spatialindex-1.5/src/mvrtree/Index.cc (+0/-429) spatialindex-1.5/src/mvrtree/Index.h (+0/-75) spatialindex-1.5/src/mvrtree/Leaf.cc (+0/-103) spatialindex-1.5/src/mvrtree/Leaf.h (+0/-48) spatialindex-1.5/src/mvrtree/MVRTree.cc (+0/-1423) spatialindex-1.5/src/mvrtree/MVRTree.h (+0/-222) spatialindex-1.5/src/mvrtree/Makefile.am (+0/-4) spatialindex-1.5/src/mvrtree/Makefile.in (+0/-485) spatialindex-1.5/src/mvrtree/Node.cc (+0/-1512) spatialindex-1.5/src/mvrtree/Node.h (+0/-184) spatialindex-1.5/src/mvrtree/PointerPoolNode.h (+0/-130) spatialindex-1.5/src/mvrtree/Statistics.cc (+0/-191) spatialindex-1.5/src/mvrtree/Statistics.h (+0/-99) spatialindex-1.5/src/rtree/BulkLoader.cc (+0/-450) spatialindex-1.5/src/rtree/BulkLoader.h (+0/-131) spatialindex-1.5/src/rtree/Index.cc (+0/-372) spatialindex-1.5/src/rtree/Index.h (+0/-73) spatialindex-1.5/src/rtree/Leaf.cc (+0/-138) spatialindex-1.5/src/rtree/Leaf.h (+0/-47) spatialindex-1.5/src/rtree/Makefile.am (+0/-4) spatialindex-1.5/src/rtree/Makefile.in (+0/-486) spatialindex-1.5/src/rtree/Node.cc (+0/-1074) spatialindex-1.5/src/rtree/Node.h (+0/-188) spatialindex-1.5/src/rtree/PointerPoolNode.h (+0/-135) spatialindex-1.5/src/rtree/RTree.cc (+0/-1551) spatialindex-1.5/src/rtree/RTree.h (+0/-201) spatialindex-1.5/src/rtree/Statistics.cc (+0/-172) spatialindex-1.5/src/rtree/Statistics.h (+0/-93) spatialindex-1.5/src/spatialindex/LineSegment.cc (+0/-388) spatialindex-1.5/src/spatialindex/Makefile.am (+0/-4) spatialindex-1.5/src/spatialindex/Makefile.in (+0/-489) spatialindex-1.5/src/spatialindex/MovingPoint.cc (+0/-299) spatialindex-1.5/src/spatialindex/MovingRegion.cc (+0/-1231) spatialindex-1.5/src/spatialindex/Point.cc (+0/-262) spatialindex-1.5/src/spatialindex/Region.cc (+0/-578) spatialindex-1.5/src/spatialindex/SpatialIndexImpl.cc (+0/-93) spatialindex-1.5/src/spatialindex/SpatialIndexImpl.h (+0/-32) spatialindex-1.5/src/spatialindex/TimePoint.cc (+0/-297) spatialindex-1.5/src/spatialindex/TimeRegion.cc (+0/-419) spatialindex-1.5/src/storagemanager/Buffer.cc (+0/-142) spatialindex-1.5/src/storagemanager/Buffer.h (+0/-78) spatialindex-1.5/src/storagemanager/DiskStorageManager.cc (+0/-501) spatialindex-1.5/src/storagemanager/DiskStorageManager.h (+0/-58) spatialindex-1.5/src/storagemanager/Makefile.am (+0/-4) spatialindex-1.5/src/storagemanager/Makefile.in (+0/-484) spatialindex-1.5/src/storagemanager/MemoryStorageManager.cc (+0/-126) spatialindex-1.5/src/storagemanager/MemoryStorageManager.h (+0/-61) spatialindex-1.5/src/storagemanager/RandomEvictionsBuffer.cc (+0/-94) spatialindex-1.5/src/storagemanager/RandomEvictionsBuffer.h (+0/-42) spatialindex-1.5/src/tools/Makefile.am (+0/-4) spatialindex-1.5/src/tools/Makefile.in (+0/-472) spatialindex-1.5/src/tools/Tools.cc (+0/-1370) spatialindex-1.5/src/tools/rand48.cc (+0/-145) spatialindex-1.5/src/tprtree/Index.cc (+0/-400) spatialindex-1.5/src/tprtree/Index.h (+0/-73) spatialindex-1.5/src/tprtree/Leaf.cc (+0/-135) spatialindex-1.5/src/tprtree/Leaf.h (+0/-47) spatialindex-1.5/src/tprtree/Makefile.am (+0/-4) spatialindex-1.5/src/tprtree/Makefile.in (+0/-485) spatialindex-1.5/src/tprtree/Node.cc (+0/-1253) spatialindex-1.5/src/tprtree/Node.h (+0/-200) spatialindex-1.5/src/tprtree/PointerPoolNode.h (+0/-129) spatialindex-1.5/src/tprtree/Statistics.cc (+0/-171) spatialindex-1.5/src/tprtree/Statistics.h (+0/-93) spatialindex-1.5/src/tprtree/TPRTree.cc (+0/-1352) spatialindex-1.5/src/tprtree/TPRTree.h (+0/-199) spatialindex-1.8.0/AUTHORS (+11/-0) spatialindex-1.8.0/CMakeLists.txt (+247/-0) spatialindex-1.8.0/COPYING (+48/-0) spatialindex-1.8.0/ChangeLog (+483/-0) spatialindex-1.8.0/INSTALL (+231/-0) spatialindex-1.8.0/INSTALL.WIN (+28/-0) spatialindex-1.8.0/Makefile.am (+36/-0) spatialindex-1.8.0/Makefile.in (+883/-0) spatialindex-1.8.0/README (+10/-0) spatialindex-1.8.0/aclocal.m4 (+9531/-0) spatialindex-1.8.0/config.guess (+1534/-0) spatialindex-1.8.0/config.sub (+1782/-0) spatialindex-1.8.0/configure (+17817/-0) spatialindex-1.8.0/configure.ac (+81/-0) spatialindex-1.8.0/depcomp (+522/-0) spatialindex-1.8.0/include/Makefile.am (+32/-0) spatialindex-1.8.0/include/Makefile.in (+534/-0) spatialindex-1.8.0/include/spatialindex/LineSegment.h (+89/-0) spatialindex-1.8.0/include/spatialindex/MVRTree.h (+89/-0) spatialindex-1.8.0/include/spatialindex/MovingPoint.h (+85/-0) spatialindex-1.8.0/include/spatialindex/MovingRegion.h (+170/-0) spatialindex-1.8.0/include/spatialindex/Point.h (+87/-0) spatialindex-1.8.0/include/spatialindex/RTree.h (+108/-0) spatialindex-1.8.0/include/spatialindex/Region.h (+104/-0) spatialindex-1.8.0/include/spatialindex/SpatialIndex.h (+259/-0) spatialindex-1.8.0/include/spatialindex/TPRTree.h (+85/-0) spatialindex-1.8.0/include/spatialindex/TimePoint.h (+95/-0) spatialindex-1.8.0/include/spatialindex/TimeRegion.h (+109/-0) spatialindex-1.8.0/include/spatialindex/Version.h (+42/-0) spatialindex-1.8.0/include/spatialindex/capi/BoundsQuery.h (+46/-0) spatialindex-1.8.0/include/spatialindex/capi/CountVisitor.h (+46/-0) spatialindex-1.8.0/include/spatialindex/capi/CustomStorage.h (+82/-0) spatialindex-1.8.0/include/spatialindex/capi/DataStream.h (+54/-0) spatialindex-1.8.0/include/spatialindex/capi/Error.h (+52/-0) spatialindex-1.8.0/include/spatialindex/capi/IdVisitor.h (+48/-0) spatialindex-1.8.0/include/spatialindex/capi/Index.h (+69/-0) spatialindex-1.8.0/include/spatialindex/capi/LeafQuery.h (+71/-0) spatialindex-1.8.0/include/spatialindex/capi/ObjVisitor.h (+49/-0) spatialindex-1.8.0/include/spatialindex/capi/Utility.h (+32/-0) spatialindex-1.8.0/include/spatialindex/capi/sidx_api.h (+213/-0) spatialindex-1.8.0/include/spatialindex/capi/sidx_config.h (+126/-0) spatialindex-1.8.0/include/spatialindex/capi/sidx_impl.h (+46/-0) spatialindex-1.8.0/include/spatialindex/tools/PointerPool.h (+123/-0) spatialindex-1.8.0/include/spatialindex/tools/PoolPointer.h (+102/-0) spatialindex-1.8.0/include/spatialindex/tools/SmartPointer.h (+84/-0) spatialindex-1.8.0/include/spatialindex/tools/Tools.h (+506/-0) spatialindex-1.8.0/include/spatialindex/tools/rand48.h (+85/-0) spatialindex-1.8.0/install-sh (+322/-0) spatialindex-1.8.0/ltmain.sh (+9655/-0) spatialindex-1.8.0/missing (+353/-0) spatialindex-1.8.0/mkinstalldirs (+150/-0) spatialindex-1.8.0/spatialindex-vc/spatialindex.vcproj (+960/-0) spatialindex-1.8.0/spatialindex.sln (+91/-0) spatialindex-1.8.0/src/CMakeLists.txt (+237/-0) spatialindex-1.8.0/src/Makefile.am (+5/-0) spatialindex-1.8.0/src/Makefile.in (+631/-0) spatialindex-1.8.0/src/capi/BoundsQuery.cc (+46/-0) spatialindex-1.8.0/src/capi/CountVisitor.cc (+52/-0) spatialindex-1.8.0/src/capi/CustomStorage.cc (+117/-0) spatialindex-1.8.0/src/capi/DataStream.cc (+113/-0) spatialindex-1.8.0/src/capi/Error.cc (+55/-0) spatialindex-1.8.0/src/capi/IdVisitor.cc (+54/-0) spatialindex-1.8.0/src/capi/Index.cc (+382/-0) spatialindex-1.8.0/src/capi/LeafQuery.cc (+127/-0) spatialindex-1.8.0/src/capi/Makefile.am (+14/-0) spatialindex-1.8.0/src/capi/Makefile.in (+540/-0) spatialindex-1.8.0/src/capi/ObjVisitor.cc (+61/-0) spatialindex-1.8.0/src/capi/Utility.cc (+151/-0) spatialindex-1.8.0/src/capi/sidx_api.cc (+2519/-0) spatialindex-1.8.0/src/libspatialindex.pc.in (+12/-0) spatialindex-1.8.0/src/mvrtree/Index.cc (+437/-0) spatialindex-1.8.0/src/mvrtree/Index.h (+75/-0) spatialindex-1.8.0/src/mvrtree/Leaf.cc (+110/-0) spatialindex-1.8.0/src/mvrtree/Leaf.h (+54/-0) spatialindex-1.8.0/src/mvrtree/MVRTree.cc (+1360/-0) spatialindex-1.8.0/src/mvrtree/MVRTree.h (+226/-0) spatialindex-1.8.0/src/mvrtree/Makefile.am (+4/-0) spatialindex-1.8.0/src/mvrtree/Makefile.in (+531/-0) spatialindex-1.8.0/src/mvrtree/Node.cc (+1520/-0) spatialindex-1.8.0/src/mvrtree/Node.h (+190/-0) spatialindex-1.8.0/src/mvrtree/PointerPoolNode.h (+139/-0) spatialindex-1.8.0/src/mvrtree/Statistics.cc (+198/-0) spatialindex-1.8.0/src/mvrtree/Statistics.h (+105/-0) spatialindex-1.8.0/src/rtree/BulkLoader.cc (+466/-0) spatialindex-1.8.0/src/rtree/BulkLoader.h (+137/-0) spatialindex-1.8.0/src/rtree/Index.cc (+379/-0) spatialindex-1.8.0/src/rtree/Index.h (+79/-0) spatialindex-1.8.0/src/rtree/Leaf.cc (+146/-0) spatialindex-1.8.0/src/rtree/Leaf.h (+53/-0) spatialindex-1.8.0/src/rtree/Makefile.am (+4/-0) spatialindex-1.8.0/src/rtree/Makefile.in (+532/-0) spatialindex-1.8.0/src/rtree/Node.cc (+1082/-0) spatialindex-1.8.0/src/rtree/Node.h (+194/-0) spatialindex-1.8.0/src/rtree/PointerPoolNode.h (+145/-0) spatialindex-1.8.0/src/rtree/RTree.cc (+1538/-0) spatialindex-1.8.0/src/rtree/RTree.h (+203/-0) spatialindex-1.8.0/src/rtree/Statistics.cc (+178/-0) spatialindex-1.8.0/src/rtree/Statistics.h (+99/-0) spatialindex-1.8.0/src/spatialindex/LineSegment.cc (+394/-0) spatialindex-1.8.0/src/spatialindex/Makefile.am (+4/-0) spatialindex-1.8.0/src/spatialindex/Makefile.in (+526/-0) spatialindex-1.8.0/src/spatialindex/MovingPoint.cc (+329/-0) spatialindex-1.8.0/src/spatialindex/MovingRegion.cc (+1237/-0) spatialindex-1.8.0/src/spatialindex/Point.cc (+268/-0) spatialindex-1.8.0/src/spatialindex/Region.cc (+560/-0) spatialindex-1.8.0/src/spatialindex/SpatialIndexImpl.cc (+98/-0) spatialindex-1.8.0/src/spatialindex/TimePoint.cc (+303/-0) spatialindex-1.8.0/src/spatialindex/TimeRegion.cc (+425/-0) spatialindex-1.8.0/src/storagemanager/Buffer.cc (+154/-0) spatialindex-1.8.0/src/storagemanager/Buffer.h (+85/-0) spatialindex-1.8.0/src/storagemanager/DiskStorageManager.cc (+501/-0) spatialindex-1.8.0/src/storagemanager/DiskStorageManager.h (+63/-0) spatialindex-1.8.0/src/storagemanager/Makefile.am (+4/-0) spatialindex-1.8.0/src/storagemanager/Makefile.in (+530/-0) spatialindex-1.8.0/src/storagemanager/MemoryStorageManager.cc (+136/-0) spatialindex-1.8.0/src/storagemanager/MemoryStorageManager.h (+68/-0) spatialindex-1.8.0/src/storagemanager/RandomEvictionsBuffer.cc (+102/-0) spatialindex-1.8.0/src/storagemanager/RandomEvictionsBuffer.h (+48/-0) spatialindex-1.8.0/src/tools/Makefile.am (+8/-0) spatialindex-1.8.0/src/tools/Makefile.in (+521/-0) spatialindex-1.8.0/src/tools/Tools.cc (+1295/-0) spatialindex-1.8.0/src/tools/rand48.cc (+150/-0) spatialindex-1.8.0/src/tprtree/Index.cc (+408/-0) spatialindex-1.8.0/src/tprtree/Index.h (+79/-0) spatialindex-1.8.0/src/tprtree/Leaf.cc (+143/-0) spatialindex-1.8.0/src/tprtree/Leaf.h (+53/-0) spatialindex-1.8.0/src/tprtree/Makefile.am (+4/-0) spatialindex-1.8.0/src/tprtree/Makefile.in (+531/-0) spatialindex-1.8.0/src/tprtree/Node.cc (+1255/-0) spatialindex-1.8.0/src/tprtree/Node.h (+206/-0) spatialindex-1.8.0/src/tprtree/PointerPoolNode.h (+140/-0) spatialindex-1.8.0/src/tprtree/Statistics.cc (+178/-0) spatialindex-1.8.0/src/tprtree/Statistics.h (+99/-0) spatialindex-1.8.0/src/tprtree/TPRTree.cc (+1288/-0) spatialindex-1.8.0/src/tprtree/TPRTree.h (+203/-0) spatialindex-1.8.0/test/CMakeLists.txt (+43/-0) spatialindex-1.8.0/test/Makefile.am (+2/-0) spatialindex-1.8.0/test/Makefile.in (+572/-0) spatialindex-1.8.0/test/mvrtree/Exhaustive.cc (+233/-0) spatialindex-1.8.0/test/mvrtree/Generator.cc (+181/-0) spatialindex-1.8.0/test/mvrtree/MVRTreeLoad.cc (+215/-0) spatialindex-1.8.0/test/mvrtree/MVRTreeQuery.cc (+274/-0) spatialindex-1.8.0/test/mvrtree/Makefile.am (+12/-0) spatialindex-1.8.0/test/mvrtree/Makefile.in (+546/-0) spatialindex-1.8.0/test/mvrtree/test1/run (+29/-0) spatialindex-1.8.0/test/mvrtree/test2/run (+22/-0) spatialindex-1.8.0/test/rtree/Exhaustive.cc (+220/-0) spatialindex-1.8.0/test/rtree/Generator.cc (+135/-0) spatialindex-1.8.0/test/rtree/Makefile.am (+13/-0) spatialindex-1.8.0/test/rtree/Makefile.in (+557/-0) spatialindex-1.8.0/test/rtree/RTreeBulkLoad.cc (+168/-0) spatialindex-1.8.0/test/rtree/RTreeLoad.cc (+215/-0) spatialindex-1.8.0/test/rtree/RTreeQuery.cc (+278/-0) spatialindex-1.8.0/test/rtree/test1/run (+29/-0) spatialindex-1.8.0/test/rtree/test2/run (+23/-0) spatialindex-1.8.0/test/rtree/test3/run (+30/-0) spatialindex-1.8.0/test/rtree/test4/run (+29/-0) spatialindex-1.8.0/test/tprtree/Exhaustive.cc (+281/-0) spatialindex-1.8.0/test/tprtree/Generator.cc (+105/-0) spatialindex-1.8.0/test/tprtree/Makefile.am (+11/-0) spatialindex-1.8.0/test/tprtree/Makefile.in (+556/-0) spatialindex-1.8.0/test/tprtree/RandomGenerator.cc (+176/-0) spatialindex-1.8.0/test/tprtree/RandomGenerator.h (+139/-0) spatialindex-1.8.0/test/tprtree/TPRTreeLoad.cc (+204/-0) spatialindex-1.8.0/test/tprtree/TPRTreeQuery.cc (+304/-0) spatialindex-1.8.0/test/tprtree/test1/run (+29/-0) spatialindex-1.8.0/test/tprtree/test2/run (+23/-0) |
To merge this branch: | bzr merge lp:~fluidity-core/fluidity/update-spatialindex |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gerard | Approve | ||
Review via email: mp+140880@code.launchpad.net |
Commit message
Description of the change
Updating Fluidity's version of SpatialIndex to the latest release version (1.8.0).
To post a comment you must log in.
Revision history for this message
Tim Greaves (tim-greaves) wrote : | # |
Revision history for this message
Tim Greaves (tim-greaves) wrote : | # |
Buildbot is green.
Revision history for this message
Gerard (g-gorman) wrote : | # |
Looks good. Passes tests. Ship it.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile.in' |
2 | --- Makefile.in 2012-11-08 17:26:18 +0000 |
3 | +++ Makefile.in 2012-12-20 11:50:40 +0000 |
4 | @@ -471,7 +471,7 @@ |
5 | |
6 | distclean: clean |
7 | @echo " DISTCLEAN" |
8 | - @cd spatialindex-1.5 ; make distclean > /dev/null ; rm -rf \ |
9 | + @cd @SPATIALINDEXDIR@ ; make distclean > /dev/null ; rm -rf \ |
10 | make.log regressiontest/mvrtree/.deps \ |
11 | regressiontest/rtree/.deps regressiontest/tprtree/.deps > \ |
12 | /dev/null |
13 | |
14 | === modified file 'configure' |
15 | --- configure 2012-11-21 12:16:05 +0000 |
16 | +++ configure 2012-12-20 11:50:40 +0000 |
17 | @@ -1425,7 +1425,8 @@ |
18 | --enable-dp=flag compile with 64 bit floating point numbers (default) |
19 | --enable-profiling enable gprof profiling |
20 | --enable-spatialindex-version |
21 | - Select required version of spatialindex library: 1.5 |
22 | + Select required version of spatialindex library: |
23 | + 1.8.0 |
24 | --enable-vtk Only use to disable vtk |
25 | --enable-2d-adaptivity Link against 2D adaptivity library (GPL license) |
26 | --enable-mba3d Enabled libmba3d 3D adaptivity library |
27 | @@ -13875,8 +13876,8 @@ |
28 | then |
29 | SPATIALINDEXDIR="spatialindex-$enable_spatialindex_version" |
30 | else |
31 | - enable_spatialindex_version="1.5" |
32 | - SPATIALINDEXDIR="spatialindex-1.5" |
33 | + enable_spatialindex_version="1.8.0" |
34 | + SPATIALINDEXDIR="spatialindex-1.8.0" |
35 | fi |
36 | |
37 | |
38 | |
39 | === modified file 'configure.in' |
40 | --- configure.in 2012-11-21 12:16:05 +0000 |
41 | +++ configure.in 2012-12-20 11:50:40 +0000 |
42 | @@ -1286,14 +1286,14 @@ |
43 | #*************SpatialIndex****** |
44 | AC_ARG_ENABLE(spatialindex-version, |
45 | [AC_HELP_STRING([--enable-spatialindex-version], |
46 | -[Select required version of spatialindex library: 1.5])]) |
47 | +[Select required version of spatialindex library: 1.8.0])]) |
48 | |
49 | if test "x$enable_spatialindex_version" != "x" |
50 | then |
51 | SPATIALINDEXDIR="spatialindex-$enable_spatialindex_version" |
52 | else |
53 | - enable_spatialindex_version="1.5" |
54 | - SPATIALINDEXDIR="spatialindex-1.5" |
55 | + enable_spatialindex_version="1.8.0" |
56 | + SPATIALINDEXDIR="spatialindex-1.8.0" |
57 | fi |
58 | AC_SUBST(SPATIALINDEXDIR) |
59 | |
60 | |
61 | === removed directory 'spatialindex-1.5' |
62 | === removed file 'spatialindex-1.5/AUTHORS' |
63 | --- spatialindex-1.5/AUTHORS 2010-03-17 17:45:31 +0000 |
64 | +++ spatialindex-1.5/AUTHORS 1970-01-01 00:00:00 +0000 |
65 | @@ -1,5 +0,0 @@ |
66 | -Marios Hadjieleftheriou -- Main author |
67 | -mhadji@gmail.com |
68 | - |
69 | -Howard Butler -- minor packaging, Trac/SVN stuff, and some Windows work |
70 | -hobu.inc@gmail.com |
71 | \ No newline at end of file |
72 | |
73 | === removed file 'spatialindex-1.5/COPYING' |
74 | --- spatialindex-1.5/COPYING 2010-03-17 17:45:31 +0000 |
75 | +++ spatialindex-1.5/COPYING 1970-01-01 00:00:00 +0000 |
76 | @@ -1,504 +0,0 @@ |
77 | - GNU LESSER GENERAL PUBLIC LICENSE |
78 | - Version 2.1, February 1999 |
79 | - |
80 | - Copyright (C) 1991, 1999 Free Software Foundation, Inc. |
81 | - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
82 | - Everyone is permitted to copy and distribute verbatim copies |
83 | - of this license document, but changing it is not allowed. |
84 | - |
85 | -[This is the first released version of the Lesser GPL. It also counts |
86 | - as the successor of the GNU Library Public License, version 2, hence |
87 | - the version number 2.1.] |
88 | - |
89 | - Preamble |
90 | - |
91 | - The licenses for most software are designed to take away your |
92 | -freedom to share and change it. By contrast, the GNU General Public |
93 | -Licenses are intended to guarantee your freedom to share and change |
94 | -free software--to make sure the software is free for all its users. |
95 | - |
96 | - This license, the Lesser General Public License, applies to some |
97 | -specially designated software packages--typically libraries--of the |
98 | -Free Software Foundation and other authors who decide to use it. You |
99 | -can use it too, but we suggest you first think carefully about whether |
100 | -this license or the ordinary General Public License is the better |
101 | -strategy to use in any particular case, based on the explanations below. |
102 | - |
103 | - When we speak of free software, we are referring to freedom of use, |
104 | -not price. Our General Public Licenses are designed to make sure that |
105 | -you have the freedom to distribute copies of free software (and charge |
106 | -for this service if you wish); that you receive source code or can get |
107 | -it if you want it; that you can change the software and use pieces of |
108 | -it in new free programs; and that you are informed that you can do |
109 | -these things. |
110 | - |
111 | - To protect your rights, we need to make restrictions that forbid |
112 | -distributors to deny you these rights or to ask you to surrender these |
113 | -rights. These restrictions translate to certain responsibilities for |
114 | -you if you distribute copies of the library or if you modify it. |
115 | - |
116 | - For example, if you distribute copies of the library, whether gratis |
117 | -or for a fee, you must give the recipients all the rights that we gave |
118 | -you. You must make sure that they, too, receive or can get the source |
119 | -code. If you link other code with the library, you must provide |
120 | -complete object files to the recipients, so that they can relink them |
121 | -with the library after making changes to the library and recompiling |
122 | -it. And you must show them these terms so they know their rights. |
123 | - |
124 | - We protect your rights with a two-step method: (1) we copyright the |
125 | -library, and (2) we offer you this license, which gives you legal |
126 | -permission to copy, distribute and/or modify the library. |
127 | - |
128 | - To protect each distributor, we want to make it very clear that |
129 | -there is no warranty for the free library. Also, if the library is |
130 | -modified by someone else and passed on, the recipients should know |
131 | -that what they have is not the original version, so that the original |
132 | -author's reputation will not be affected by problems that might be |
133 | -introduced by others. |
134 | - |
135 | |
136 | - Finally, software patents pose a constant threat to the existence of |
137 | -any free program. We wish to make sure that a company cannot |
138 | -effectively restrict the users of a free program by obtaining a |
139 | -restrictive license from a patent holder. Therefore, we insist that |
140 | -any patent license obtained for a version of the library must be |
141 | -consistent with the full freedom of use specified in this license. |
142 | - |
143 | - Most GNU software, including some libraries, is covered by the |
144 | -ordinary GNU General Public License. This license, the GNU Lesser |
145 | -General Public License, applies to certain designated libraries, and |
146 | -is quite different from the ordinary General Public License. We use |
147 | -this license for certain libraries in order to permit linking those |
148 | -libraries into non-free programs. |
149 | - |
150 | - When a program is linked with a library, whether statically or using |
151 | -a shared library, the combination of the two is legally speaking a |
152 | -combined work, a derivative of the original library. The ordinary |
153 | -General Public License therefore permits such linking only if the |
154 | -entire combination fits its criteria of freedom. The Lesser General |
155 | -Public License permits more lax criteria for linking other code with |
156 | -the library. |
157 | - |
158 | - We call this license the "Lesser" General Public License because it |
159 | -does Less to protect the user's freedom than the ordinary General |
160 | -Public License. It also provides other free software developers Less |
161 | -of an advantage over competing non-free programs. These disadvantages |
162 | -are the reason we use the ordinary General Public License for many |
163 | -libraries. However, the Lesser license provides advantages in certain |
164 | -special circumstances. |
165 | - |
166 | - For example, on rare occasions, there may be a special need to |
167 | -encourage the widest possible use of a certain library, so that it becomes |
168 | -a de-facto standard. To achieve this, non-free programs must be |
169 | -allowed to use the library. A more frequent case is that a free |
170 | -library does the same job as widely used non-free libraries. In this |
171 | -case, there is little to gain by limiting the free library to free |
172 | -software only, so we use the Lesser General Public License. |
173 | - |
174 | - In other cases, permission to use a particular library in non-free |
175 | -programs enables a greater number of people to use a large body of |
176 | -free software. For example, permission to use the GNU C Library in |
177 | -non-free programs enables many more people to use the whole GNU |
178 | -operating system, as well as its variant, the GNU/Linux operating |
179 | -system. |
180 | - |
181 | - Although the Lesser General Public License is Less protective of the |
182 | -users' freedom, it does ensure that the user of a program that is |
183 | -linked with the Library has the freedom and the wherewithal to run |
184 | -that program using a modified version of the Library. |
185 | - |
186 | - The precise terms and conditions for copying, distribution and |
187 | -modification follow. Pay close attention to the difference between a |
188 | -"work based on the library" and a "work that uses the library". The |
189 | -former contains code derived from the library, whereas the latter must |
190 | -be combined with the library in order to run. |
191 | - |
192 | |
193 | - GNU LESSER GENERAL PUBLIC LICENSE |
194 | - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |
195 | - |
196 | - 0. This License Agreement applies to any software library or other |
197 | -program which contains a notice placed by the copyright holder or |
198 | -other authorized party saying it may be distributed under the terms of |
199 | -this Lesser General Public License (also called "this License"). |
200 | -Each licensee is addressed as "you". |
201 | - |
202 | - A "library" means a collection of software functions and/or data |
203 | -prepared so as to be conveniently linked with application programs |
204 | -(which use some of those functions and data) to form executables. |
205 | - |
206 | - The "Library", below, refers to any such software library or work |
207 | -which has been distributed under these terms. A "work based on the |
208 | -Library" means either the Library or any derivative work under |
209 | -copyright law: that is to say, a work containing the Library or a |
210 | -portion of it, either verbatim or with modifications and/or translated |
211 | -straightforwardly into another language. (Hereinafter, translation is |
212 | -included without limitation in the term "modification".) |
213 | - |
214 | - "Source code" for a work means the preferred form of the work for |
215 | -making modifications to it. For a library, complete source code means |
216 | -all the source code for all modules it contains, plus any associated |
217 | -interface definition files, plus the scripts used to control compilation |
218 | -and installation of the library. |
219 | - |
220 | - Activities other than copying, distribution and modification are not |
221 | -covered by this License; they are outside its scope. The act of |
222 | -running a program using the Library is not restricted, and output from |
223 | -such a program is covered only if its contents constitute a work based |
224 | -on the Library (independent of the use of the Library in a tool for |
225 | -writing it). Whether that is true depends on what the Library does |
226 | -and what the program that uses the Library does. |
227 | - |
228 | - 1. You may copy and distribute verbatim copies of the Library's |
229 | -complete source code as you receive it, in any medium, provided that |
230 | -you conspicuously and appropriately publish on each copy an |
231 | -appropriate copyright notice and disclaimer of warranty; keep intact |
232 | -all the notices that refer to this License and to the absence of any |
233 | -warranty; and distribute a copy of this License along with the |
234 | -Library. |
235 | - |
236 | - You may charge a fee for the physical act of transferring a copy, |
237 | -and you may at your option offer warranty protection in exchange for a |
238 | -fee. |
239 | - |
240 | |
241 | - 2. You may modify your copy or copies of the Library or any portion |
242 | -of it, thus forming a work based on the Library, and copy and |
243 | -distribute such modifications or work under the terms of Section 1 |
244 | -above, provided that you also meet all of these conditions: |
245 | - |
246 | - a) The modified work must itself be a software library. |
247 | - |
248 | - b) You must cause the files modified to carry prominent notices |
249 | - stating that you changed the files and the date of any change. |
250 | - |
251 | - c) You must cause the whole of the work to be licensed at no |
252 | - charge to all third parties under the terms of this License. |
253 | - |
254 | - d) If a facility in the modified Library refers to a function or a |
255 | - table of data to be supplied by an application program that uses |
256 | - the facility, other than as an argument passed when the facility |
257 | - is invoked, then you must make a good faith effort to ensure that, |
258 | - in the event an application does not supply such function or |
259 | - table, the facility still operates, and performs whatever part of |
260 | - its purpose remains meaningful. |
261 | - |
262 | - (For example, a function in a library to compute square roots has |
263 | - a purpose that is entirely well-defined independent of the |
264 | - application. Therefore, Subsection 2d requires that any |
265 | - application-supplied function or table used by this function must |
266 | - be optional: if the application does not supply it, the square |
267 | - root function must still compute square roots.) |
268 | - |
269 | -These requirements apply to the modified work as a whole. If |
270 | -identifiable sections of that work are not derived from the Library, |
271 | -and can be reasonably considered independent and separate works in |
272 | -themselves, then this License, and its terms, do not apply to those |
273 | -sections when you distribute them as separate works. But when you |
274 | -distribute the same sections as part of a whole which is a work based |
275 | -on the Library, the distribution of the whole must be on the terms of |
276 | -this License, whose permissions for other licensees extend to the |
277 | -entire whole, and thus to each and every part regardless of who wrote |
278 | -it. |
279 | - |
280 | -Thus, it is not the intent of this section to claim rights or contest |
281 | -your rights to work written entirely by you; rather, the intent is to |
282 | -exercise the right to control the distribution of derivative or |
283 | -collective works based on the Library. |
284 | - |
285 | -In addition, mere aggregation of another work not based on the Library |
286 | -with the Library (or with a work based on the Library) on a volume of |
287 | -a storage or distribution medium does not bring the other work under |
288 | -the scope of this License. |
289 | - |
290 | - 3. You may opt to apply the terms of the ordinary GNU General Public |
291 | -License instead of this License to a given copy of the Library. To do |
292 | -this, you must alter all the notices that refer to this License, so |
293 | -that they refer to the ordinary GNU General Public License, version 2, |
294 | -instead of to this License. (If a newer version than version 2 of the |
295 | -ordinary GNU General Public License has appeared, then you can specify |
296 | -that version instead if you wish.) Do not make any other change in |
297 | -these notices. |
298 | - |
299 | |
300 | - Once this change is made in a given copy, it is irreversible for |
301 | -that copy, so the ordinary GNU General Public License applies to all |
302 | -subsequent copies and derivative works made from that copy. |
303 | - |
304 | - This option is useful when you wish to copy part of the code of |
305 | -the Library into a program that is not a library. |
306 | - |
307 | - 4. You may copy and distribute the Library (or a portion or |
308 | -derivative of it, under Section 2) in object code or executable form |
309 | -under the terms of Sections 1 and 2 above provided that you accompany |
310 | -it with the complete corresponding machine-readable source code, which |
311 | -must be distributed under the terms of Sections 1 and 2 above on a |
312 | -medium customarily used for software interchange. |
313 | - |
314 | - If distribution of object code is made by offering access to copy |
315 | -from a designated place, then offering equivalent access to copy the |
316 | -source code from the same place satisfies the requirement to |
317 | -distribute the source code, even though third parties are not |
318 | -compelled to copy the source along with the object code. |
319 | - |
320 | - 5. A program that contains no derivative of any portion of the |
321 | -Library, but is designed to work with the Library by being compiled or |
322 | -linked with it, is called a "work that uses the Library". Such a |
323 | -work, in isolation, is not a derivative work of the Library, and |
324 | -therefore falls outside the scope of this License. |
325 | - |
326 | - However, linking a "work that uses the Library" with the Library |
327 | -creates an executable that is a derivative of the Library (because it |
328 | -contains portions of the Library), rather than a "work that uses the |
329 | -library". The executable is therefore covered by this License. |
330 | -Section 6 states terms for distribution of such executables. |
331 | - |
332 | - When a "work that uses the Library" uses material from a header file |
333 | -that is part of the Library, the object code for the work may be a |
334 | -derivative work of the Library even though the source code is not. |
335 | -Whether this is true is especially significant if the work can be |
336 | -linked without the Library, or if the work is itself a library. The |
337 | -threshold for this to be true is not precisely defined by law. |
338 | - |
339 | - If such an object file uses only numerical parameters, data |
340 | -structure layouts and accessors, and small macros and small inline |
341 | -functions (ten lines or less in length), then the use of the object |
342 | -file is unrestricted, regardless of whether it is legally a derivative |
343 | -work. (Executables containing this object code plus portions of the |
344 | -Library will still fall under Section 6.) |
345 | - |
346 | - Otherwise, if the work is a derivative of the Library, you may |
347 | -distribute the object code for the work under the terms of Section 6. |
348 | -Any executables containing that work also fall under Section 6, |
349 | -whether or not they are linked directly with the Library itself. |
350 | - |
351 | |
352 | - 6. As an exception to the Sections above, you may also combine or |
353 | -link a "work that uses the Library" with the Library to produce a |
354 | -work containing portions of the Library, and distribute that work |
355 | -under terms of your choice, provided that the terms permit |
356 | -modification of the work for the customer's own use and reverse |
357 | -engineering for debugging such modifications. |
358 | - |
359 | - You must give prominent notice with each copy of the work that the |
360 | -Library is used in it and that the Library and its use are covered by |
361 | -this License. You must supply a copy of this License. If the work |
362 | -during execution displays copyright notices, you must include the |
363 | -copyright notice for the Library among them, as well as a reference |
364 | -directing the user to the copy of this License. Also, you must do one |
365 | -of these things: |
366 | - |
367 | - a) Accompany the work with the complete corresponding |
368 | - machine-readable source code for the Library including whatever |
369 | - changes were used in the work (which must be distributed under |
370 | - Sections 1 and 2 above); and, if the work is an executable linked |
371 | - with the Library, with the complete machine-readable "work that |
372 | - uses the Library", as object code and/or source code, so that the |
373 | - user can modify the Library and then relink to produce a modified |
374 | - executable containing the modified Library. (It is understood |
375 | - that the user who changes the contents of definitions files in the |
376 | - Library will not necessarily be able to recompile the application |
377 | - to use the modified definitions.) |
378 | - |
379 | - b) Use a suitable shared library mechanism for linking with the |
380 | - Library. A suitable mechanism is one that (1) uses at run time a |
381 | - copy of the library already present on the user's computer system, |
382 | - rather than copying library functions into the executable, and (2) |
383 | - will operate properly with a modified version of the library, if |
384 | - the user installs one, as long as the modified version is |
385 | - interface-compatible with the version that the work was made with. |
386 | - |
387 | - c) Accompany the work with a written offer, valid for at |
388 | - least three years, to give the same user the materials |
389 | - specified in Subsection 6a, above, for a charge no more |
390 | - than the cost of performing this distribution. |
391 | - |
392 | - d) If distribution of the work is made by offering access to copy |
393 | - from a designated place, offer equivalent access to copy the above |
394 | - specified materials from the same place. |
395 | - |
396 | - e) Verify that the user has already received a copy of these |
397 | - materials or that you have already sent this user a copy. |
398 | - |
399 | - For an executable, the required form of the "work that uses the |
400 | -Library" must include any data and utility programs needed for |
401 | -reproducing the executable from it. However, as a special exception, |
402 | -the materials to be distributed need not include anything that is |
403 | -normally distributed (in either source or binary form) with the major |
404 | -components (compiler, kernel, and so on) of the operating system on |
405 | -which the executable runs, unless that component itself accompanies |
406 | -the executable. |
407 | - |
408 | - It may happen that this requirement contradicts the license |
409 | -restrictions of other proprietary libraries that do not normally |
410 | -accompany the operating system. Such a contradiction means you cannot |
411 | -use both them and the Library together in an executable that you |
412 | -distribute. |
413 | - |
414 | |
415 | - 7. You may place library facilities that are a work based on the |
416 | -Library side-by-side in a single library together with other library |
417 | -facilities not covered by this License, and distribute such a combined |
418 | -library, provided that the separate distribution of the work based on |
419 | -the Library and of the other library facilities is otherwise |
420 | -permitted, and provided that you do these two things: |
421 | - |
422 | - a) Accompany the combined library with a copy of the same work |
423 | - based on the Library, uncombined with any other library |
424 | - facilities. This must be distributed under the terms of the |
425 | - Sections above. |
426 | - |
427 | - b) Give prominent notice with the combined library of the fact |
428 | - that part of it is a work based on the Library, and explaining |
429 | - where to find the accompanying uncombined form of the same work. |
430 | - |
431 | - 8. You may not copy, modify, sublicense, link with, or distribute |
432 | -the Library except as expressly provided under this License. Any |
433 | -attempt otherwise to copy, modify, sublicense, link with, or |
434 | -distribute the Library is void, and will automatically terminate your |
435 | -rights under this License. However, parties who have received copies, |
436 | -or rights, from you under this License will not have their licenses |
437 | -terminated so long as such parties remain in full compliance. |
438 | - |
439 | - 9. You are not required to accept this License, since you have not |
440 | -signed it. However, nothing else grants you permission to modify or |
441 | -distribute the Library or its derivative works. These actions are |
442 | -prohibited by law if you do not accept this License. Therefore, by |
443 | -modifying or distributing the Library (or any work based on the |
444 | -Library), you indicate your acceptance of this License to do so, and |
445 | -all its terms and conditions for copying, distributing or modifying |
446 | -the Library or works based on it. |
447 | - |
448 | - 10. Each time you redistribute the Library (or any work based on the |
449 | -Library), the recipient automatically receives a license from the |
450 | -original licensor to copy, distribute, link with or modify the Library |
451 | -subject to these terms and conditions. You may not impose any further |
452 | -restrictions on the recipients' exercise of the rights granted herein. |
453 | -You are not responsible for enforcing compliance by third parties with |
454 | -this License. |
455 | - |
456 | |
457 | - 11. If, as a consequence of a court judgment or allegation of patent |
458 | -infringement or for any other reason (not limited to patent issues), |
459 | -conditions are imposed on you (whether by court order, agreement or |
460 | -otherwise) that contradict the conditions of this License, they do not |
461 | -excuse you from the conditions of this License. If you cannot |
462 | -distribute so as to satisfy simultaneously your obligations under this |
463 | -License and any other pertinent obligations, then as a consequence you |
464 | -may not distribute the Library at all. For example, if a patent |
465 | -license would not permit royalty-free redistribution of the Library by |
466 | -all those who receive copies directly or indirectly through you, then |
467 | -the only way you could satisfy both it and this License would be to |
468 | -refrain entirely from distribution of the Library. |
469 | - |
470 | -If any portion of this section is held invalid or unenforceable under any |
471 | -particular circumstance, the balance of the section is intended to apply, |
472 | -and the section as a whole is intended to apply in other circumstances. |
473 | - |
474 | -It is not the purpose of this section to induce you to infringe any |
475 | -patents or other property right claims or to contest validity of any |
476 | -such claims; this section has the sole purpose of protecting the |
477 | -integrity of the free software distribution system which is |
478 | -implemented by public license practices. Many people have made |
479 | -generous contributions to the wide range of software distributed |
480 | -through that system in reliance on consistent application of that |
481 | -system; it is up to the author/donor to decide if he or she is willing |
482 | -to distribute software through any other system and a licensee cannot |
483 | -impose that choice. |
484 | - |
485 | -This section is intended to make thoroughly clear what is believed to |
486 | -be a consequence of the rest of this License. |
487 | - |
488 | - 12. If the distribution and/or use of the Library is restricted in |
489 | -certain countries either by patents or by copyrighted interfaces, the |
490 | -original copyright holder who places the Library under this License may add |
491 | -an explicit geographical distribution limitation excluding those countries, |
492 | -so that distribution is permitted only in or among countries not thus |
493 | -excluded. In such case, this License incorporates the limitation as if |
494 | -written in the body of this License. |
495 | - |
496 | - 13. The Free Software Foundation may publish revised and/or new |
497 | -versions of the Lesser General Public License from time to time. |
498 | -Such new versions will be similar in spirit to the present version, |
499 | -but may differ in detail to address new problems or concerns. |
500 | - |
501 | -Each version is given a distinguishing version number. If the Library |
502 | -specifies a version number of this License which applies to it and |
503 | -"any later version", you have the option of following the terms and |
504 | -conditions either of that version or of any later version published by |
505 | -the Free Software Foundation. If the Library does not specify a |
506 | -license version number, you may choose any version ever published by |
507 | -the Free Software Foundation. |
508 | - |
509 | |
510 | - 14. If you wish to incorporate parts of the Library into other free |
511 | -programs whose distribution conditions are incompatible with these, |
512 | -write to the author to ask for permission. For software which is |
513 | -copyrighted by the Free Software Foundation, write to the Free |
514 | -Software Foundation; we sometimes make exceptions for this. Our |
515 | -decision will be guided by the two goals of preserving the free status |
516 | -of all derivatives of our free software and of promoting the sharing |
517 | -and reuse of software generally. |
518 | - |
519 | - NO WARRANTY |
520 | - |
521 | - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO |
522 | -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. |
523 | -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR |
524 | -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY |
525 | -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE |
526 | -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
527 | -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE |
528 | -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME |
529 | -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. |
530 | - |
531 | - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN |
532 | -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY |
533 | -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU |
534 | -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR |
535 | -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE |
536 | -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING |
537 | -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A |
538 | -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF |
539 | -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH |
540 | -DAMAGES. |
541 | - |
542 | - END OF TERMS AND CONDITIONS |
543 | - |
544 | |
545 | - How to Apply These Terms to Your New Libraries |
546 | - |
547 | - If you develop a new library, and you want it to be of the greatest |
548 | -possible use to the public, we recommend making it free software that |
549 | -everyone can redistribute and change. You can do so by permitting |
550 | -redistribution under these terms (or, alternatively, under the terms of the |
551 | -ordinary General Public License). |
552 | - |
553 | - To apply these terms, attach the following notices to the library. It is |
554 | -safest to attach them to the start of each source file to most effectively |
555 | -convey the exclusion of warranty; and each file should have at least the |
556 | -"copyright" line and a pointer to where the full notice is found. |
557 | - |
558 | - <one line to give the library's name and a brief idea of what it does.> |
559 | - Copyright (C) <year> <name of author> |
560 | - |
561 | - This library is free software; you can redistribute it and/or |
562 | - modify it under the terms of the GNU Lesser General Public |
563 | - License as published by the Free Software Foundation; either |
564 | - version 2.1 of the License, or (at your option) any later version. |
565 | - |
566 | - This library is distributed in the hope that it will be useful, |
567 | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
568 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
569 | - Lesser General Public License for more details. |
570 | - |
571 | - You should have received a copy of the GNU Lesser General Public |
572 | - License along with this library; if not, write to the Free Software |
573 | - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
574 | - |
575 | -Also add information on how to contact you by electronic and paper mail. |
576 | - |
577 | -You should also get your employer (if you work as a programmer) or your |
578 | -school, if any, to sign a "copyright disclaimer" for the library, if |
579 | -necessary. Here is a sample; alter the names: |
580 | - |
581 | - Yoyodyne, Inc., hereby disclaims all copyright interest in the |
582 | - library `Frob' (a library for tweaking knobs) written by James Random Hacker. |
583 | - |
584 | - <signature of Ty Coon>, 1 April 1990 |
585 | - Ty Coon, President of Vice |
586 | - |
587 | -That's all there is to it! |
588 | - |
589 | - |
590 | |
591 | === removed file 'spatialindex-1.5/ChangeLog' |
592 | --- spatialindex-1.5/ChangeLog 2010-03-17 17:45:31 +0000 |
593 | +++ spatialindex-1.5/ChangeLog 1970-01-01 00:00:00 +0000 |
594 | @@ -1,1086 +0,0 @@ |
595 | -2010-03-03 21:55 hobu |
596 | - |
597 | - * include/capi/IdVisitor.h, include/capi/ObjVisitor.h, |
598 | - include/capi/sidx_api.h, regressiontest/rtree/test3/run, |
599 | - src/capi/LeafQuery.cc, src/capi/sidx_api.cc: use uint64_t for |
600 | - result counts instead of uint32_t in C API |
601 | - |
602 | -2009-12-29 02:35 hobu |
603 | - |
604 | - * regressiontest/mvrtree/Exhaustive.cc, |
605 | - regressiontest/rtree/Exhaustive.cc, |
606 | - regressiontest/tprtree/Exhaustive.cc: fix up for gcc 4.4 |
607 | - |
608 | -2009-12-04 21:57 mhadji |
609 | - |
610 | - * spatialindex.suo, src/spatialindex/Region.cc: |
611 | - |
612 | -2009-12-04 18:46 mhadji |
613 | - |
614 | - * src/spatialindex/Region.cc: Fixed Region::touchesRegion member |
615 | - function bug. |
616 | - |
617 | -2009-11-05 16:26 hobu |
618 | - |
619 | - * src/spatialindex/Region.cc: don't thrown an error when -DDEBUG is |
620 | - on and we initialize an infinite Region |
621 | - |
622 | -2009-11-03 03:10 hobu |
623 | - |
624 | - * src/capi/sidx_api.cc: pass in a reference for the query bounds |
625 | - |
626 | -2009-11-03 03:04 hobu |
627 | - |
628 | - * src/capi/sidx_api.cc: try to do no harm when calling Index_Free |
629 | - on something that's null |
630 | - |
631 | -2009-11-03 03:00 hobu |
632 | - |
633 | - * src/capi/sidx_api.cc: pass in a reference for the query bounds |
634 | - |
635 | -2009-11-03 02:15 hobu |
636 | - |
637 | - * src/capi/sidx_api.cc: copy the array using memcpy because we |
638 | - can't free() something created with new |
639 | - |
640 | -2009-11-03 01:48 hobu |
641 | - |
642 | - * src/capi/sidx_api.cc: put the data in a newly malloc'd array to |
643 | - match our std::free call of Index_Delete |
644 | - |
645 | -2009-11-02 21:32 hobu |
646 | - |
647 | - * src/capi/LeafQuery.cc: make sure to delete our shape when we're |
648 | - done |
649 | - |
650 | -2009-11-02 21:32 hobu |
651 | - |
652 | - * src/capi/sidx_api.cc: get dimension from the Region, no need to |
653 | - fetch from index properties |
654 | - |
655 | -2009-11-02 20:53 hobu |
656 | - |
657 | - * src/capi/sidx_api.cc: make sure we clean up the bounds and region |
658 | - |
659 | -2009-11-02 20:08 hobu |
660 | - |
661 | - * regressiontest/mvrtree/Generator.cc, |
662 | - regressiontest/rtree/Generator.cc, |
663 | - regressiontest/tprtree/Generator.cc, |
664 | - regressiontest/tprtree/TPRTreeLoad.cc, |
665 | - regressiontest/tprtree/TPRTreeQuery.cc, src/capi/sidx_api.cc, |
666 | - src/mvrtree/Index.cc, src/mvrtree/MVRTree.cc, |
667 | - src/mvrtree/Node.cc, src/rtree/Index.cc, src/rtree/Node.cc, |
668 | - src/rtree/RTree.cc, src/spatialindex/LineSegment.cc, |
669 | - src/spatialindex/MovingPoint.cc, |
670 | - src/spatialindex/MovingRegion.cc, src/spatialindex/Point.cc, |
671 | - src/spatialindex/Region.cc, src/spatialindex/TimePoint.cc, |
672 | - src/spatialindex/TimeRegion.cc, src/tools/Tools.cc, |
673 | - src/tprtree/Index.cc, src/tprtree/Node.cc, |
674 | - src/tprtree/TPRTree.cc: only #include <limits> where needed, and |
675 | - not in the global Tools.h file |
676 | - |
677 | -2009-10-30 17:09 hobu |
678 | - |
679 | - * include/tools/Tools.h, regressiontest/mvrtree/Exhaustive.cc, |
680 | - regressiontest/mvrtree/Generator.cc, |
681 | - regressiontest/rtree/Exhaustive.cc, |
682 | - regressiontest/rtree/Generator.cc, |
683 | - regressiontest/tprtree/Generator.cc, src/mvrtree/Node.cc, |
684 | - src/rtree/BulkLoader.cc, src/rtree/Node.cc, src/rtree/RTree.cc, |
685 | - src/spatialindex/LineSegment.cc, src/spatialindex/MovingPoint.cc, |
686 | - src/spatialindex/MovingRegion.cc, src/spatialindex/Point.cc, |
687 | - src/spatialindex/Region.cc, |
688 | - src/storagemanager/RandomEvictionsBuffer.cc, src/tprtree/Node.cc: |
689 | - remove <cmath> <limits> and <climits> from Tools.h and include |
690 | - them seperately in each file that needs them |
691 | - |
692 | -2009-10-30 16:37 hobu |
693 | - |
694 | - * include/capi/sidx_api.h: define to denote we're C API |
695 | - |
696 | -2009-10-30 15:03 hobu |
697 | - |
698 | - * include/capi/sidx_config.h: add a newline |
699 | - |
700 | -2009-10-22 02:42 hobu |
701 | - |
702 | - * src/capi/sidx_api.cc: make sure we use new/delete instead of |
703 | - new/free |
704 | - |
705 | -2009-10-21 17:35 hobu |
706 | - |
707 | - * ., include/LineSegment.h, include/Point.h, include/Region.h, |
708 | - include/SpatialIndex.h, include/capi, src/capi, |
709 | - src/spatialindex/LineSegment.cc, src/spatialindex/Point.cc, |
710 | - src/spatialindex/Region.cc: remove namespace pollution of Tools:: |
711 | - into the globally include'd header SpatialIndex.h |
712 | - |
713 | -2009-10-20 15:24 hobu |
714 | - |
715 | - * configure.ac, makefile.vc: bump versions in preparation for |
716 | - release |
717 | - |
718 | -2009-10-19 20:31 hobu |
719 | - |
720 | - * include/capi/sidx_api.h: add SIDX_Version prototype |
721 | - |
722 | -2009-10-19 20:23 hobu |
723 | - |
724 | - * ltmain.sh: ltmain.sh doesn't belong in svn |
725 | - |
726 | -2009-10-19 20:23 hobu |
727 | - |
728 | - * include/capi/Makefile.in, src/capi/Makefile.in: Makefile.in's |
729 | - don't belong in svn |
730 | - |
731 | -2009-10-19 18:50 hobu |
732 | - |
733 | - * makefile.vc: C API compilation fix |
734 | - |
735 | -2009-10-19 18:50 hobu |
736 | - |
737 | - * src/tools/Tools.cc: tmpname fixes so we compile on msvc2003 |
738 | - |
739 | -2009-10-19 18:29 hobu |
740 | - |
741 | - * makefile.vc: don't define a variable to "" or cl will complain |
742 | - |
743 | -2009-10-08 19:32 hobu |
744 | - |
745 | - * src/rtree/BulkLoader.cc: bleaf and bindex switched around in |
746 | - createLevel call |
747 | - |
748 | -2009-09-17 20:40 hobu |
749 | - |
750 | - * include/capi/LeafQuery.h, include/capi/sidx_api.h, |
751 | - src/capi/LeafQuery.cc, src/capi/sidx_api.cc: more leaf querying |
752 | - code |
753 | - |
754 | -2009-09-16 18:45 hobu |
755 | - |
756 | - * include/capi/LeafQuery.h, include/capi/Makefile.am, |
757 | - include/capi/Makefile.in, include/capi/sidx_impl.h, |
758 | - src/capi/LeafQuery.cc, src/capi/Makefile.am, |
759 | - src/capi/Makefile.in, src/capi/sidx_api.cc: add beginnings of |
760 | - leaf querying to C API |
761 | - |
762 | -2009-09-16 03:34 hobu |
763 | - |
764 | - * include/capi/Item.h, include/capi/ObjVisitor.h, |
765 | - include/capi/sidx_config.h, include/capi/sidx_impl.h, |
766 | - src/capi/Item.cc, src/capi/Makefile.am, src/capi/Makefile.in, |
767 | - src/capi/ObjVisitor.cc, src/capi/sidx_api.cc: remove the |
768 | - duplicate and unnecessary Item construct that was masking the |
769 | - already existing IData interface |
770 | - |
771 | -2009-08-31 15:32 hobu |
772 | - |
773 | - * makefile.vc: support building the c api |
774 | - |
775 | -2009-08-24 13:25 hobu |
776 | - |
777 | - * regressiontest/mvrtree/Exhaustive.cc, |
778 | - regressiontest/rtree/Exhaustive.cc, |
779 | - regressiontest/tprtree/Exhaustive.cc: fix issue with uint32_t by |
780 | - copying macros from Tools.h |
781 | - |
782 | -2009-08-19 20:47 hobu |
783 | - |
784 | - * Makefile.am: try to ensure -lstdc++ is linked |
785 | - |
786 | -2009-08-19 19:56 hobu |
787 | - |
788 | - * include/capi, src/capi: ignores |
789 | - |
790 | -2009-08-19 16:37 hobu |
791 | - |
792 | - * Makefile.am, configure.ac, include/Makefile.am, include/capi, |
793 | - include/capi/BoundsQuery.h, include/capi/DataStream.h, |
794 | - include/capi/Error.h, include/capi/IdVisitor.h, |
795 | - include/capi/Index.h, include/capi/Item.h, |
796 | - include/capi/Makefile.am, include/capi/Makefile.in, |
797 | - include/capi/ObjVisitor.h, include/capi/Utility.h, |
798 | - include/capi/sidx_api.h, include/capi/sidx_config.h, |
799 | - include/capi/sidx_impl.h, include/tools/Makefile.am, |
800 | - src/Makefile.am, src/capi, src/capi/BoundsQuery.cc, |
801 | - src/capi/DataStream.cc, src/capi/Error.cc, src/capi/IdVisitor.cc, |
802 | - src/capi/Index.cc, src/capi/Item.cc, src/capi/Makefile.am, |
803 | - src/capi/Makefile.in, src/capi/ObjVisitor.cc, |
804 | - src/capi/Utility.cc, src/capi/sidx_api.cc: add C API (not |
805 | - currently built on windows) |
806 | - |
807 | -2009-08-19 15:25 hobu |
808 | - |
809 | - * .: ignore propset |
810 | - |
811 | -2009-08-19 15:24 hobu |
812 | - |
813 | - * regressiontest/mvrtree/test1, regressiontest/mvrtree/test2, |
814 | - regressiontest/rtree, regressiontest/rtree/test1, |
815 | - regressiontest/rtree/test2, regressiontest/rtree/test3, |
816 | - regressiontest/rtree/test4, regressiontest/tprtree/test1, |
817 | - regressiontest/tprtree/test2: propsets to ignore test results |
818 | - |
819 | -2009-08-18 18:07 hobu |
820 | - |
821 | - * include/tools/Tools.h, src/tools/Tools.cc: locking for |
822 | - Tools::PropertySet (commented out though because it doesn't work |
823 | - |
824 | -2009-08-14 17:41 hobu |
825 | - |
826 | - * src/tools/Tools.cc: comment out PropertySet locking for now |
827 | - |
828 | -2009-08-14 15:19 hobu |
829 | - |
830 | - * include/tools/Tools.h, src/mvrtree/MVRTree.cc, |
831 | - src/mvrtree/MVRTree.h, src/rtree/RTree.cc, src/rtree/RTree.h, |
832 | - src/tools/Tools.cc, src/tprtree/TPRTree.cc, |
833 | - src/tprtree/TPRTree.h: use HAVE_PTHREAD_H for #ifdef, make |
834 | - Tools::PropertySet threadsafe for read/write |
835 | - |
836 | -2009-08-13 19:10 mhadji |
837 | - |
838 | - * spatialindex.suo, src/rtree/BulkLoader.cc, |
839 | - src/rtree/BulkLoader.h, src/rtree/RTree.cc: |
840 | - |
841 | -2009-08-13 15:42 mhadji |
842 | - |
843 | - * spatialindex-vc/spatialindex.vcproj, spatialindex.suo: |
844 | - |
845 | -2009-08-13 15:24 mhadji |
846 | - |
847 | - * include/LineSegment.h, include/MVRTree.h, include/MovingPoint.h, |
848 | - include/MovingRegion.h, include/Point.h, include/RTree.h, |
849 | - include/Region.h, include/SpatialIndex.h, include/TPRTree.h, |
850 | - include/TimePoint.h, include/TimeRegion.h, |
851 | - include/tools/PointerPool.h, include/tools/Tools.h, |
852 | - regressiontest/rtree/RTreeBulkLoad.cc, |
853 | - regressiontest/rtree/RTreeQuery.cc, |
854 | - regressiontest/rtree/test1/run, regressiontest/rtree/test2/run, |
855 | - spatialindex.suo, src/mvrtree/Index.cc, src/mvrtree/Index.h, |
856 | - src/mvrtree/Leaf.cc, src/mvrtree/Leaf.h, src/mvrtree/MVRTree.cc, |
857 | - src/mvrtree/MVRTree.h, src/mvrtree/Node.cc, src/mvrtree/Node.h, |
858 | - src/mvrtree/PointerPoolNode.h, src/mvrtree/Statistics.cc, |
859 | - src/mvrtree/Statistics.h, src/rtree/BulkLoader.cc, |
860 | - src/rtree/BulkLoader.h, src/rtree/Index.cc, src/rtree/Index.h, |
861 | - src/rtree/Leaf.cc, src/rtree/Leaf.h, src/rtree/Node.cc, |
862 | - src/rtree/Node.h, src/rtree/PointerPoolNode.h, |
863 | - src/rtree/RTree.cc, src/rtree/RTree.h, src/rtree/Statistics.cc, |
864 | - src/rtree/Statistics.h, src/spatialindex/LineSegment.cc, |
865 | - src/spatialindex/MovingPoint.cc, |
866 | - src/spatialindex/MovingRegion.cc, src/spatialindex/Point.cc, |
867 | - src/spatialindex/Region.cc, src/spatialindex/TimePoint.cc, |
868 | - src/spatialindex/TimeRegion.cc, src/storagemanager/Buffer.cc, |
869 | - src/storagemanager/Buffer.h, |
870 | - src/storagemanager/DiskStorageManager.cc, |
871 | - src/storagemanager/DiskStorageManager.h, |
872 | - src/storagemanager/MemoryStorageManager.cc, |
873 | - src/storagemanager/MemoryStorageManager.h, |
874 | - src/storagemanager/RandomEvictionsBuffer.cc, src/tools/Tools.cc, |
875 | - src/tprtree/Index.cc, src/tprtree/Index.h, src/tprtree/Leaf.cc, |
876 | - src/tprtree/Leaf.h, src/tprtree/Node.cc, src/tprtree/Node.h, |
877 | - src/tprtree/PointerPoolNode.h, src/tprtree/Statistics.cc, |
878 | - src/tprtree/Statistics.h, src/tprtree/TPRTree.cc, |
879 | - src/tprtree/TPRTree.h: 1. Replace size_t with uint32_t to fix |
880 | - 64/32 bit compatibility issues |
881 | - 2. Fixed memory bug related to data array and bulk loading for |
882 | - RTree. |
883 | - |
884 | -2009-08-10 13:35 hobu |
885 | - |
886 | - * include/SpatialIndex.h, include/tools/Tools.h: remove #define |
887 | - interface, use class |
888 | - |
889 | -2009-08-06 01:11 hobu |
890 | - |
891 | - * makefile.vc: osgeo4w packaging |
892 | - |
893 | -2009-08-05 20:21 hobu |
894 | - |
895 | - * include/tools/Tools.h: don't redefine interface if it is already |
896 | - defined (/me scowls at windows |
897 | - |
898 | -2009-08-05 19:27 hobu |
899 | - |
900 | - * src/rtree/BulkLoader.cc: comment out record deletion entirely |
901 | - |
902 | -2009-08-05 17:58 hobu |
903 | - |
904 | - * src/rtree/BulkLoader.cc: guard against invalid delete |
905 | - |
906 | -2009-07-30 18:48 hobu |
907 | - |
908 | - * Makefile.am, configure.ac: bump version to 1.4.0 in prep for |
909 | - release, add a windows docs to the dist |
910 | - |
911 | -2009-07-30 16:57 hobu |
912 | - |
913 | - * src/storagemanager/DiskStorageManager.cc: Add a |
914 | - CheckFilesExists(Tools::PropertySet&) method instead of the cheap |
915 | - way we were checking for existence before. This takes into |
916 | - account the file extensions and only returns true if both files |
917 | - exist |
918 | - |
919 | -2009-07-30 16:56 hobu |
920 | - |
921 | - * include/tools/Tools.h: move the warning about 4251 down into |
922 | - _MSC_VER |
923 | - |
924 | -2009-07-30 03:10 hobu |
925 | - |
926 | - * ChangeLog, configure.ac: new changelog |
927 | - |
928 | -2009-07-30 02:32 hobu |
929 | - |
930 | - * makefile.vc: update for new layout. make sure to build dll |
931 | - appropriately |
932 | - |
933 | -2009-07-29 21:24 hobu |
934 | - |
935 | - * include/tools/Tools.h: turn off warning 4251 |
936 | - |
937 | -2009-07-29 20:57 hobu |
938 | - |
939 | - * include/Makefile.am, include/SpatialIndex.h, include/Version.h: |
940 | - fix #15 and provide a way to determine the library version at |
941 | - compile time |
942 | - |
943 | -2009-07-29 20:50 hobu |
944 | - |
945 | - * makefile.vc: add back makefile.vc |
946 | - |
947 | -2009-07-22 19:29 hobu |
948 | - |
949 | - * src/spatialindex/Region.cc: a note about the debugging lint that |
950 | - is incorrect when the bounds are infinity |
951 | - |
952 | -2009-07-22 19:24 hobu |
953 | - |
954 | - * regressiontest/rtree/Exhaustive.cc: make sure to #include |
955 | - <cstring> to satisfy gcc 4.3+ |
956 | - |
957 | -2009-07-22 15:23 mhadji |
958 | - |
959 | - * regressiontest/rtree/RTreeBulkLoad.vcproj, |
960 | - regressiontest/rtree/RTreeExhaustive.vcproj, |
961 | - regressiontest/rtree/RTreeGenerator.vcproj, |
962 | - regressiontest/rtree/RTreeLoad.vcproj, |
963 | - regressiontest/rtree/RTreeQuery.vcproj, |
964 | - spatialindex-vc/spatialindex.vcproj, spatialindex.suo: |
965 | - |
966 | -2009-07-22 15:18 mhadji |
967 | - |
968 | - * spatialindex.sln, spatialindex.suo: |
969 | - |
970 | -2009-07-21 13:11 mhadji |
971 | - |
972 | - * src/tools/Tools.cc: |
973 | - |
974 | -2009-07-20 20:32 hobu |
975 | - |
976 | - * src/storagemanager/DiskStorageManager.cc: attempt to fix #8 and |
977 | - allow users to specify extensions for the dat and idx files of |
978 | - the diskstorage manager |
979 | - |
980 | -2009-07-20 17:35 hobu |
981 | - |
982 | - * src/tools/Tools.cc: make sure to update existing values in |
983 | - setProperties instead of assuming it doesn't exist in the map |
984 | - |
985 | -2009-07-20 15:01 mhadji |
986 | - |
987 | - * spatialindex.suo, src/mvrtree/MVRTree.cc, src/rtree/RTree.cc, |
988 | - src/tprtree/TPRTree.cc: |
989 | - |
990 | -2009-07-19 14:51 mhadji |
991 | - |
992 | - * include/LineSegment.h, include/MVRTree.h, include/MovingPoint.h, |
993 | - include/MovingRegion.h, include/Point.h, include/RTree.h, |
994 | - include/Region.h, include/SpatialIndex.h, include/TPRTree.h, |
995 | - include/TimePoint.h, include/TimeRegion.h, include/tools/Tools.h, |
996 | - spatialindex.suo: |
997 | - |
998 | -2009-07-19 01:26 mhadji |
999 | - |
1000 | - * INSTALL.WIN: |
1001 | - |
1002 | -2009-07-19 01:15 mhadji |
1003 | - |
1004 | - * spatialindex-vc/spatialindex.vcproj, spatialindex.suo: |
1005 | - |
1006 | -2009-07-19 01:13 mhadji |
1007 | - |
1008 | - * spatialindex.suo: |
1009 | - |
1010 | -2009-07-19 01:09 mhadji |
1011 | - |
1012 | - * makefile.vc, regressiontest/rtree/RTreeBulkLoad.vcproj, |
1013 | - spatialindex.suo: |
1014 | - |
1015 | -2009-07-19 01:02 mhadji |
1016 | - |
1017 | - * INSTALL.WIN, regressiontest/rtree/RTreeBulkLoad.vcproj, |
1018 | - regressiontest/rtree/RTreeExhaustive.vcproj, |
1019 | - regressiontest/rtree/RTreeGenerator.vcproj, |
1020 | - regressiontest/rtree/RTreeLoad.vcproj, |
1021 | - regressiontest/rtree/RTreeQuery.vcproj, |
1022 | - regressiontest/rtree/test3/run, |
1023 | - spatialindex-vc/spatialindex.vcproj, spatialindex.sln, |
1024 | - spatialindex.suo: |
1025 | - |
1026 | -2009-07-18 22:52 mhadji |
1027 | - |
1028 | - * include/SpatialIndex.h, include/tools/Tools.h: |
1029 | - |
1030 | -2009-07-18 22:19 mhadji |
1031 | - |
1032 | - * spatialindex-vc/spatialindex.vcproj.RESEARCH.marioh.user: |
1033 | - |
1034 | -2009-07-18 22:19 mhadji |
1035 | - |
1036 | - * include/LineSegment.h, include/MVRTree.h, include/MovingPoint.h, |
1037 | - include/MovingRegion.h, include/Point.h, include/RTree.h, |
1038 | - include/Region.h, include/SpatialIndex.h, include/TPRTree.h, |
1039 | - include/TimePoint.h, include/TimeRegion.h, |
1040 | - include/tools/Makefile.am, include/tools/PointerPool.h, |
1041 | - include/tools/PoolPointer.h, include/tools/SmartPointer.h, |
1042 | - include/tools/TemporaryFile.h, include/tools/Tools.h, |
1043 | - include/tools/rand48.h, makefile.vc, |
1044 | - regressiontest/rtree/Exhaustive.cc, |
1045 | - regressiontest/rtree/Generator.cc, |
1046 | - regressiontest/rtree/RTreeBulkLoad.cc, |
1047 | - regressiontest/rtree/RTreeBulkLoad.vcproj, |
1048 | - regressiontest/rtree/RTreeExhaustive.vcproj, |
1049 | - regressiontest/rtree/RTreeGenerator.vcproj, |
1050 | - regressiontest/rtree/RTreeLoad.cc, |
1051 | - regressiontest/rtree/RTreeLoad.vcproj, |
1052 | - regressiontest/rtree/RTreeQuery.vcproj, |
1053 | - regressiontest/rtree/test3/run, spatialindex-vc, |
1054 | - spatialindex-vc/spatialindex.vcproj, |
1055 | - spatialindex-vc/spatialindex.vcproj.RESEARCH.marioh.user, |
1056 | - src/mvrtree/Index.cc, src/mvrtree/Index.h, src/mvrtree/Leaf.cc, |
1057 | - src/mvrtree/Leaf.h, src/mvrtree/MVRTree.cc, |
1058 | - src/mvrtree/MVRTree.h, src/mvrtree/Node.cc, src/mvrtree/Node.h, |
1059 | - src/mvrtree/PointerPoolNode.h, src/mvrtree/Statistics.h, |
1060 | - src/rtree/BulkLoader.cc, src/rtree/BulkLoader.h, |
1061 | - src/rtree/Index.h, src/rtree/Leaf.h, src/rtree/Node.h, |
1062 | - src/rtree/PointerPoolNode.h, src/rtree/RTree.cc, |
1063 | - src/rtree/RTree.h, src/rtree/Statistics.h, |
1064 | - src/spatialindex/MovingRegion.cc, |
1065 | - src/spatialindex/SpatialIndexImpl.cc, |
1066 | - src/spatialindex/SpatialIndexImpl.h, |
1067 | - src/storagemanager/Buffer.cc, src/storagemanager/Buffer.h, |
1068 | - src/storagemanager/DiskStorageManager.cc, |
1069 | - src/storagemanager/DiskStorageManager.h, |
1070 | - src/storagemanager/MemoryStorageManager.cc, |
1071 | - src/storagemanager/MemoryStorageManager.h, |
1072 | - src/storagemanager/RandomEvictionsBuffer.cc, |
1073 | - src/storagemanager/RandomEvictionsBuffer.h, |
1074 | - src/tools/ExternalSort.cc, src/tools/ExternalSort.h, |
1075 | - src/tools/Makefile.am, src/tools/TemporaryFile.cc, |
1076 | - src/tools/Tools.cc, src/tprtree/Index.h, src/tprtree/Leaf.h, |
1077 | - src/tprtree/Node.h, src/tprtree/PointerPoolNode.h, |
1078 | - src/tprtree/Statistics.h, src/tprtree/TPRTree.cc, |
1079 | - src/tprtree/TPRTree.h: |
1080 | - |
1081 | -2009-07-15 14:39 hobu |
1082 | - |
1083 | - * include/SpatialIndex.h, src/mvrtree/Node.cc, src/mvrtree/Node.h, |
1084 | - src/rtree/Node.cc, src/rtree/Node.h, src/rtree/RTree.cc, |
1085 | - src/rtree/RTree.h, src/tprtree/Node.cc, src/tprtree/Node.h: apply |
1086 | - Willem's patch for #14 |
1087 | - |
1088 | -2009-07-06 22:23 hobu |
1089 | - |
1090 | - * src/rtree/RTree.cc: more descriptive and separate exception |
1091 | - descriptions for FillFactor inconsistencies |
1092 | - |
1093 | -2009-07-06 14:38 hobu |
1094 | - |
1095 | - * include/SpatialIndex.h, ltmain.sh: silence warnings about windows |
1096 | - compiler complaints on non-windows systems |
1097 | - |
1098 | -2009-05-28 17:52 hobu |
1099 | - |
1100 | - * makefile.vc: rename dlls to not have lib* in front of them |
1101 | - |
1102 | -2009-05-28 16:31 hobu |
1103 | - |
1104 | - * makefile.vc: A much improved windows makefile based in libLAS' |
1105 | - |
1106 | -2009-05-28 16:31 hobu |
1107 | - |
1108 | - * include/SpatialIndex.h: On MSVC, just about every class complains |
1109 | - about 4250, inheritance by dominance. We'll just shut that up for |
1110 | - now. |
1111 | - |
1112 | -2009-05-14 18:26 hobu |
1113 | - |
1114 | - * src/tools/TemporaryFile.cc: apply Patrick Mézard's patch for the |
1115 | - inverted use of mktemp on windows #13 |
1116 | - |
1117 | -2009-05-14 18:21 hobu |
1118 | - |
1119 | - * src/tools/Tools.cc: Fix #12, add time.h so msvc9 works |
1120 | - |
1121 | -2009-05-04 17:10 hobu |
1122 | - |
1123 | - * regressiontest/mvrtree/Exhaustive.cc, |
1124 | - regressiontest/mvrtree/MVRTreeLoad.cc, |
1125 | - regressiontest/mvrtree/MVRTreeQuery.cc, |
1126 | - regressiontest/rtree/Exhaustive.cc, |
1127 | - regressiontest/rtree/RTreeLoad.cc, |
1128 | - regressiontest/rtree/RTreeQuery.cc, |
1129 | - regressiontest/tprtree/Generator.cc, src/mvrtree/MVRTree.cc, |
1130 | - src/mvrtree/Node.cc, src/rtree/BulkLoader.cc, src/rtree/Leaf.cc, |
1131 | - src/rtree/Node.cc, src/rtree/RTree.cc, |
1132 | - src/spatialindex/LineSegment.cc, src/spatialindex/MovingPoint.cc, |
1133 | - src/spatialindex/MovingRegion.cc, src/spatialindex/Point.cc, |
1134 | - src/spatialindex/Region.cc, src/spatialindex/TimePoint.cc, |
1135 | - src/spatialindex/TimeRegion.cc, src/storagemanager/Buffer.cc, |
1136 | - src/storagemanager/Buffer.h, |
1137 | - src/storagemanager/DiskStorageManager.cc, |
1138 | - src/storagemanager/MemoryStorageManager.cc, |
1139 | - src/storagemanager/MemoryStorageManager.h, src/tools/Tools.cc, |
1140 | - src/tprtree/Leaf.cc, src/tprtree/Node.cc, src/tprtree/TPRTree.cc: |
1141 | - apply the patch for #11 - cstring and limits includes so gcc 4.3+ |
1142 | - works |
1143 | - |
1144 | -2008-05-30 19:42 mhadji |
1145 | - |
1146 | - * src/tools/Makefile.am, src/tools/Tools.cc: |
1147 | - |
1148 | -2008-05-23 18:27 mhadji |
1149 | - |
1150 | - * makefile.vc: |
1151 | - |
1152 | -2008-05-23 17:55 mhadji |
1153 | - |
1154 | - * configure.ac: |
1155 | - |
1156 | -2008-05-23 17:28 mhadji |
1157 | - |
1158 | - * regressiontest/rtree/RTreeLoad.cc, |
1159 | - src/storagemanager/DiskStorageManager.cc, |
1160 | - src/storagemanager/DiskStorageManager.h: |
1161 | - |
1162 | -2008-05-18 12:35 mhadji |
1163 | - |
1164 | - * ltmain.sh: |
1165 | - |
1166 | -2008-04-30 05:39 hobu |
1167 | - |
1168 | - * .: propset to ignore aclocal.m4 |
1169 | - |
1170 | -2008-04-30 05:39 hobu |
1171 | - |
1172 | - * aclocal.m4: aclocal.m4 is autogenerated. removing |
1173 | - |
1174 | -2008-04-30 05:35 hobu |
1175 | - |
1176 | - * ., include, include/tools, regressiontest, |
1177 | - regressiontest/mvrtree, regressiontest/rtree, |
1178 | - regressiontest/tprtree, src, src/mvrtree, src/rtree, |
1179 | - src/spatialindex, src/storagemanager, src/tools, src/tprtree: set |
1180 | - svn:ignore properties for autogenerated files and automake cruft |
1181 | - |
1182 | -2008-04-30 05:27 hobu |
1183 | - |
1184 | - * Makefile.in, include/Makefile.in, include/tools/Makefile.in, |
1185 | - regressiontest/Makefile.in, regressiontest/mvrtree/Makefile.in, |
1186 | - regressiontest/rtree/Makefile.in, |
1187 | - regressiontest/tprtree/Makefile.in, src/Makefile.in, |
1188 | - src/mvrtree/Makefile.in, src/rtree/Makefile.in, |
1189 | - src/spatialindex/Makefile.in, src/storagemanager/Makefile.in, |
1190 | - src/tools/Makefile.in, src/tprtree/Makefile.in: delete |
1191 | - Makefile.in's from source tree. Use autogen.sh to remake them if |
1192 | - building from svn source yourself |
1193 | - |
1194 | -2008-04-30 05:26 hobu |
1195 | - |
1196 | - * include/tools/Makefile.am: add rand48.h to dist target |
1197 | - |
1198 | -2008-04-29 19:47 mhadji |
1199 | - |
1200 | - * regressiontest/rtree/test1/data, |
1201 | - regressiontest/rtree/test1/queries: |
1202 | - |
1203 | -2008-04-29 18:17 mhadji |
1204 | - |
1205 | - * include/tools/rand48.hpp: |
1206 | - |
1207 | -2008-04-29 18:06 mhadji |
1208 | - |
1209 | - * include/tools/rand48.h: |
1210 | - |
1211 | -2008-04-29 18:03 mhadji |
1212 | - |
1213 | - * INSTALL, Makefile.in, aclocal.m4, configure.ac, mkinstalldirs, |
1214 | - regressiontest/Makefile.in, regressiontest/mvrtree/Makefile.in, |
1215 | - regressiontest/rtree/Makefile.in, |
1216 | - regressiontest/tprtree/Makefile.in, |
1217 | - src/storagemanager/RandomEvictionsBuffer.cc, |
1218 | - src/tools/ExternalSort.cc, src/tools/ExternalSort.h, |
1219 | - src/tools/TemporaryFile.cc, src/tools/Tools.cc: |
1220 | - |
1221 | -2008-04-29 16:36 mhadji |
1222 | - |
1223 | - * makefile.vc: |
1224 | - |
1225 | -2008-04-29 16:36 mhadji |
1226 | - |
1227 | - * include/Makefile.in, include/SpatialIndex.h, |
1228 | - include/tools/Makefile.in, include/tools/Tools.h: |
1229 | - |
1230 | -2008-04-29 16:36 mhadji |
1231 | - |
1232 | - * src/Makefile.in, src/mvrtree/Makefile.in, src/mvrtree/Node.cc, |
1233 | - src/rtree/Makefile.in, src/spatialindex/LineSegment.cc, |
1234 | - src/spatialindex/Makefile.in, src/spatialindex/MovingRegion.cc, |
1235 | - src/storagemanager/Makefile.in, |
1236 | - src/storagemanager/RandomEvictionsBuffer.cc, |
1237 | - src/tools/Makefile.in, src/tprtree/Makefile.in: |
1238 | - |
1239 | -2008-04-29 15:40 mhadji |
1240 | - |
1241 | - * src/spatialindex/MovingRegion.cc: Fixex malloc memory leak. |
1242 | - |
1243 | -2008-04-29 15:40 mhadji |
1244 | - |
1245 | - * src/spatialindex/LineSegment.cc: Fixed malloc memory leak |
1246 | - |
1247 | -2008-02-26 16:15 hobu |
1248 | - |
1249 | - * src/tools/rand48.cc: oops. Add missing file |
1250 | - |
1251 | -2008-02-26 16:14 hobu |
1252 | - |
1253 | - * include/tools/rand48.hpp: oops. Add missing file |
1254 | - |
1255 | -2008-01-25 19:43 hobu |
1256 | - |
1257 | - * include/MVRTree.h, include/RTree.h, include/SpatialIndex.h, |
1258 | - include/TPRTree.h, include/tools/Tools.h, makefile.vc, |
1259 | - src/mvrtree/Index.cc, src/mvrtree/Leaf.cc, src/mvrtree/Node.cc, |
1260 | - src/rtree/BulkLoader.cc, src/rtree/Index.cc, src/rtree/Leaf.cc, |
1261 | - src/rtree/Node.cc, src/spatialindex/LineSegment.cc, |
1262 | - src/spatialindex/MovingRegion.cc, src/storagemanager/Buffer.cc, |
1263 | - src/storagemanager/DiskStorageManager.cc, |
1264 | - src/storagemanager/RandomEvictionsBuffer.cc, |
1265 | - src/tools/ExternalSort.cc, src/tools/ExternalSort.h, |
1266 | - src/tools/TemporaryFile.cc, src/tools/Tools.cc, |
1267 | - src/tprtree/Index.cc, src/tprtree/Leaf.cc, src/tprtree/Node.cc: |
1268 | - Initial push of windows patches |
1269 | - |
1270 | -2008-01-23 16:25 mhadji |
1271 | - |
1272 | - * INSTALL: |
1273 | - |
1274 | -2008-01-21 14:19 mhadji |
1275 | - |
1276 | - * README, regressiontest/rtree/test3/run: |
1277 | - |
1278 | -2008-01-19 20:51 hobu |
1279 | - |
1280 | - * configure.ac, makefile.vc: bump version to 1.3 |
1281 | - |
1282 | -2008-01-19 18:42 hobu |
1283 | - |
1284 | - * ChangeLog: Add an auto-generated ChangeLog |
1285 | - |
1286 | -2008-01-19 18:37 hobu |
1287 | - |
1288 | - * AUTHORS: add myself and some notes |
1289 | - |
1290 | -2008-01-19 18:36 hobu |
1291 | - |
1292 | - * INSTALL: update to ReST |
1293 | - |
1294 | -2008-01-19 18:09 hobu |
1295 | - |
1296 | - * README: update ReST |
1297 | - |
1298 | -2008-01-19 18:09 hobu |
1299 | - |
1300 | - * README: update ReST |
1301 | - |
1302 | -2008-01-19 18:03 hobu |
1303 | - |
1304 | - * README: update ReST |
1305 | - |
1306 | -2008-01-19 18:02 hobu |
1307 | - |
1308 | - * README: update ReST |
1309 | - |
1310 | -2008-01-19 18:02 hobu |
1311 | - |
1312 | - * README: update ReST |
1313 | - |
1314 | -2008-01-19 18:01 hobu |
1315 | - |
1316 | - * README: update ReST |
1317 | - |
1318 | -2008-01-19 17:59 hobu |
1319 | - |
1320 | - * README: update ReST |
1321 | - |
1322 | -2008-01-19 17:59 hobu |
1323 | - |
1324 | - * README: update ReST |
1325 | - |
1326 | -2008-01-19 17:58 hobu |
1327 | - |
1328 | - * README: update ReST |
1329 | - |
1330 | -2008-01-19 17:58 hobu |
1331 | - |
1332 | - * README: update ReST |
1333 | - |
1334 | -2008-01-19 17:56 hobu |
1335 | - |
1336 | - * README: update ReST |
1337 | - |
1338 | -2008-01-19 17:55 hobu |
1339 | - |
1340 | - * README: update ReST |
1341 | - |
1342 | -2008-01-19 17:29 hobu |
1343 | - |
1344 | - * README: update ReST |
1345 | - |
1346 | -2008-01-19 17:26 hobu |
1347 | - |
1348 | - * README: update to ReST |
1349 | - |
1350 | -2008-01-19 17:02 hobu |
1351 | - |
1352 | - * README: set mimetype to reStructured text so Trac will render it |
1353 | - for us in the browser |
1354 | - |
1355 | -2008-01-17 23:34 hobu |
1356 | - |
1357 | - * regressiontest/tprtree/Makefile.am, |
1358 | - regressiontest/tprtree/Makefile.in, src/mvrtree/Makefile.am, |
1359 | - src/mvrtree/Makefile.in, src/rtree/Makefile.am, |
1360 | - src/rtree/Makefile.in, src/spatialindex/Makefile.am, |
1361 | - src/spatialindex/Makefile.in, src/storagemanager/Makefile.am, |
1362 | - src/storagemanager/Makefile.in, src/tprtree/Makefile.am, |
1363 | - src/tprtree/Makefile.in: add internal headers to the _SOURCES |
1364 | - targets so they get included in make dist |
1365 | - |
1366 | -2008-01-17 17:06 hobu |
1367 | - |
1368 | - * Makefile.in, aclocal.m4, autogen.sh, include/Makefile.in, |
1369 | - include/tools/Makefile.in, ltmain.sh, regressiontest/Makefile.in, |
1370 | - regressiontest/mvrtree/Makefile.in, |
1371 | - regressiontest/rtree/Makefile.in, |
1372 | - regressiontest/tprtree/Makefile.in, src/Makefile.in, |
1373 | - src/mvrtree/Makefile.in, src/rtree/Makefile.in, |
1374 | - src/spatialindex/Makefile.in, src/storagemanager/Makefile.in, |
1375 | - src/tools/Makefile.in, src/tprtree/Makefile.in: add autogen.sh to |
1376 | - simplify auto stuff |
1377 | - |
1378 | -2008-01-17 17:04 hobu |
1379 | - |
1380 | - * debian: move debian packaging stuff out of trunk |
1381 | - |
1382 | -2008-01-15 19:33 hobu |
1383 | - |
1384 | - * makefile.vc: add nmake makefile |
1385 | - |
1386 | -2007-12-07 20:44 kenneth |
1387 | - |
1388 | - * debian/libspatialindex1.dirs, debian/libspatialindex1.install, |
1389 | - debian/libspatialindex11.dirs, debian/libspatialindex11.install: |
1390 | - Wrong names |
1391 | - |
1392 | -2007-12-07 19:58 kenneth |
1393 | - |
1394 | - * configure, debian/rules: Fixed rules file |
1395 | - |
1396 | -2007-12-07 18:10 kenneth |
1397 | - |
1398 | - * config.guess, config.sub, debian/control: Updates to the control |
1399 | - file (packaging) |
1400 | - Removal of files that shouldn't be in SVN |
1401 | - |
1402 | -2007-11-30 18:04 mhadji |
1403 | - |
1404 | - * Makefile.in, configure, configure.ac: |
1405 | - |
1406 | -2007-11-30 16:50 seang |
1407 | - |
1408 | - * Makefile.am: Version info to 1:0:0 |
1409 | - |
1410 | -2007-11-29 22:26 mhadji |
1411 | - |
1412 | - * INSTALL, configure, configure.ac: |
1413 | - |
1414 | -2007-11-29 21:54 mhadji |
1415 | - |
1416 | - * include/LineSegment.h, include/Point.h, include/Region.h, |
1417 | - include/tools/LineSegment.h, include/tools/Point.h, |
1418 | - include/tools/Region.h, src/spatialindex/LineSegment.cc, |
1419 | - src/spatialindex/Point.cc, src/spatialindex/Region.cc, |
1420 | - src/tools/ExternalSort.cc, src/tools/ExternalSort.h, |
1421 | - src/tools/TemporaryFile.cc, src/tools/Tools.cc: |
1422 | - |
1423 | -2007-11-29 21:48 mhadji |
1424 | - |
1425 | - * Makefile.am, Makefile.in, aclocal.m4, configure, configure.ac, |
1426 | - include/Makefile.am, include/Makefile.in, include/MovingPoint.h, |
1427 | - include/MovingRegion.h, include/SpatialIndex.h, |
1428 | - include/TimePoint.h, include/TimeRegion.h, |
1429 | - include/tools/Makefile.am, include/tools/Makefile.in, |
1430 | - include/tools/PointerPool.h, include/tools/PoolPointer.h, |
1431 | - include/tools/SmartPointer.h, include/tools/TemporaryFile.h, |
1432 | - include/tools/Tools.h, regressiontest/Makefile.in, |
1433 | - regressiontest/mvrtree/Makefile.in, |
1434 | - regressiontest/rtree/Makefile.in, |
1435 | - regressiontest/tprtree/Generator.cc, |
1436 | - regressiontest/tprtree/Makefile.in, |
1437 | - regressiontest/tprtree/RandomGenerator.cc, |
1438 | - regressiontest/tprtree/RandomGenerator.h, src/Makefile.in, |
1439 | - src/mvrtree/Index.cc, src/mvrtree/Leaf.cc, |
1440 | - src/mvrtree/MVRTree.cc, src/mvrtree/Makefile.in, |
1441 | - src/mvrtree/Node.cc, src/mvrtree/Statistics.cc, |
1442 | - src/rtree/BulkLoader.cc, src/rtree/Index.cc, src/rtree/Leaf.cc, |
1443 | - src/rtree/Makefile.in, src/rtree/Node.cc, src/rtree/RTree.cc, |
1444 | - src/rtree/Statistics.cc, src/spatialindex/Makefile.am, |
1445 | - src/spatialindex/Makefile.in, src/spatialindex/MovingPoint.cc, |
1446 | - src/spatialindex/MovingRegion.cc, |
1447 | - src/spatialindex/SpatialIndexImpl.h, |
1448 | - src/spatialindex/TimePoint.cc, src/spatialindex/TimeRegion.cc, |
1449 | - src/storagemanager/Buffer.cc, |
1450 | - src/storagemanager/DiskStorageManager.cc, |
1451 | - src/storagemanager/Makefile.in, |
1452 | - src/storagemanager/MemoryStorageManager.cc, |
1453 | - src/storagemanager/RandomEvictionsBuffer.cc, |
1454 | - src/tools/Makefile.am, src/tools/Makefile.in, src/tools/geometry, |
1455 | - src/tools/tools, src/tprtree/Index.cc, src/tprtree/Leaf.cc, |
1456 | - src/tprtree/Makefile.in, src/tprtree/Node.cc, |
1457 | - src/tprtree/Statistics.cc, src/tprtree/TPRTree.cc: |
1458 | - |
1459 | -2007-11-29 18:00 seang |
1460 | - |
1461 | - * debian, debian/README, debian/README.Debian, debian/changelog, |
1462 | - debian/compat, debian/control, debian/copyright, debian/dirs, |
1463 | - debian/docs, debian/libspatialindex1-dev.dirs, |
1464 | - debian/libspatialindex1-dev.install, |
1465 | - debian/libspatialindex1.doc-base.EX, |
1466 | - debian/libspatialindex11.dirs, debian/libspatialindex11.install, |
1467 | - debian/rules: Add debian directory created by dh_make |
1468 | - |
1469 | -2007-11-29 04:05 hobu |
1470 | - |
1471 | - * Makefile.am, Makefile.in: use -version-info instead of -release |
1472 | - |
1473 | -2007-11-29 00:59 hobu |
1474 | - |
1475 | - * include/Makefile.in, include/tools/Makefile.in: include |
1476 | - Makefile.in's |
1477 | - |
1478 | -2007-11-29 00:55 hobu |
1479 | - |
1480 | - * Makefile.am, Makefile.in: use .'s to separate version info and |
1481 | - don't do -no-undefined |
1482 | - |
1483 | -2007-11-29 00:19 hobu |
1484 | - |
1485 | - * Makefile.am: tweak formatting |
1486 | - |
1487 | -2007-11-29 00:11 seang |
1488 | - |
1489 | - * Makefile.am: Add version-info to Makefile.am |
1490 | - |
1491 | -2007-11-28 23:54 hobu |
1492 | - |
1493 | - * Makefile.am, Makefile.in, include/Makefile.am, |
1494 | - include/tools/Makefile.am: finish incorporating -ltools |
1495 | - |
1496 | -2007-11-28 22:48 hobu |
1497 | - |
1498 | - * Makefile.am, Makefile.in, configure, configure.ac, |
1499 | - include/Makefile.am, include/tools/Makefile.am: more progress on |
1500 | - automake for includes directories... close, but not quite |
1501 | - |
1502 | -2007-11-28 22:38 hobu |
1503 | - |
1504 | - * include/Makefile.am, include/tools/Makefile.am: Add automake |
1505 | - files for includes |
1506 | - |
1507 | -2007-11-28 21:03 hobu |
1508 | - |
1509 | - * Makefile.am, Makefile.in, aclocal.m4, configure, configure.ac, |
1510 | - include/tools, regressiontest/Makefile.in, |
1511 | - regressiontest/mvrtree/Makefile.in, |
1512 | - regressiontest/rtree/Makefile.in, |
1513 | - regressiontest/tprtree/Makefile.in, src/Makefile.am, |
1514 | - src/Makefile.in, src/mvrtree/Makefile.in, src/rtree/Makefile.in, |
1515 | - src/spatialindex/Makefile.in, src/storagemanager/Makefile.in, |
1516 | - src/tools, src/tools/Makefile.in, src/tools/geometry/Makefile.am, |
1517 | - src/tools/geometry/Makefile.in, src/tools/tools/Makefile.am, |
1518 | - src/tools/tools/Makefile.in, src/tprtree/Makefile.in: start |
1519 | - incorporating -ltools into the tree |
1520 | - |
1521 | -2007-08-30 15:16 mhadji |
1522 | - |
1523 | - * INSTALL, a: README should be INSTALL, and INSTALL should be |
1524 | - README |
1525 | - |
1526 | -2007-08-30 15:15 mhadji |
1527 | - |
1528 | - * INSTALL, README: README should be INSTALL, and INSTALL should be |
1529 | - README |
1530 | - |
1531 | -2007-08-30 15:13 mhadji |
1532 | - |
1533 | - * README, a: README file should be INSTALL, and INSTALL should be |
1534 | - README |
1535 | - |
1536 | -2007-08-02 04:37 hobu |
1537 | - |
1538 | - * src/storagemanager/DiskStorageManager.cc: revert r9 |
1539 | - |
1540 | -2007-08-02 04:37 hobu |
1541 | - |
1542 | - * src/rtree/Leaf.cc: revert r10 |
1543 | - |
1544 | -2007-08-02 04:36 hobu |
1545 | - |
1546 | - * src/rtree/Node.cc: revert r11 |
1547 | - |
1548 | -2007-08-02 04:36 hobu |
1549 | - |
1550 | - * src/rtree/RTree.cc: revert r12 |
1551 | - |
1552 | -2007-08-02 04:35 hobu |
1553 | - |
1554 | - * src/mvrtree/MVRTree.cc: revert r13 |
1555 | - |
1556 | -2007-08-02 04:34 hobu |
1557 | - |
1558 | - * src/spatialindex/SpatialIndexImpl.h: add strings.h |
1559 | - |
1560 | -2007-08-02 04:27 hobu |
1561 | - |
1562 | - * src/mvrtree/MVRTree.cc: add strings.h |
1563 | - |
1564 | -2007-08-02 04:26 hobu |
1565 | - |
1566 | - * src/rtree/RTree.cc: add strings.h |
1567 | - |
1568 | -2007-08-02 04:25 hobu |
1569 | - |
1570 | - * src/rtree/Node.cc: add strings.h |
1571 | - |
1572 | -2007-08-02 02:23 hobu |
1573 | - |
1574 | - * src/rtree/Leaf.cc: include <strings.h> |
1575 | - |
1576 | -2007-08-02 02:21 hobu |
1577 | - |
1578 | - * src/storagemanager/DiskStorageManager.cc: include <strings.h> in |
1579 | - DiskStorageManager (this is not available on Solaris by default) |
1580 | - |
1581 | -2007-08-01 20:49 hobu |
1582 | - |
1583 | - * regressiontest/rtree/test1/data, |
1584 | - regressiontest/rtree/test1/queries: add data and queries for |
1585 | - tests |
1586 | - |
1587 | -2007-08-01 20:48 hobu |
1588 | - |
1589 | - * INSTALL, Makefile.in, README, aclocal.m4, |
1590 | - regressiontest/Makefile.in, regressiontest/mvrtree/Makefile.in, |
1591 | - regressiontest/rtree/Makefile.in, |
1592 | - regressiontest/rtree/RTreeLoad.cc, |
1593 | - regressiontest/rtree/RTreeQuery.cc, |
1594 | - regressiontest/tprtree/Makefile.in, src/Makefile.in, |
1595 | - src/mvrtree/Makefile.in, src/rtree/Makefile.in, |
1596 | - src/spatialindex/Makefile.in, src/storagemanager/Makefile.in, |
1597 | - src/tprtree/Makefile.in: add Marios' latest updates |
1598 | - |
1599 | -2007-08-01 20:40 hobu |
1600 | - |
1601 | - * spatialindex.111.zip: oops, don't include zip files |
1602 | - |
1603 | -2007-08-01 20:37 hobu |
1604 | - |
1605 | - * AUTHORS, COPYING, ChangeLog, INSTALL, Makefile.am, Makefile.in, |
1606 | - NEWS, README, aclocal.m4, config.guess, config.sub, configure, |
1607 | - configure.ac, depcomp, include, include/MVRTree.h, |
1608 | - include/MovingPoint.h, include/MovingRegion.h, include/RTree.h, |
1609 | - include/SpatialIndex.h, include/TPRTree.h, include/TimePoint.h, |
1610 | - include/TimeRegion.h, install-sh, ltmain.sh, missing, |
1611 | - mkinstalldirs, regressiontest, regressiontest/Makefile.am, |
1612 | - regressiontest/Makefile.in, regressiontest/mvrtree, |
1613 | - regressiontest/mvrtree/Exhaustive.cc, |
1614 | - regressiontest/mvrtree/Generator.cc, |
1615 | - regressiontest/mvrtree/MVRTreeLoad.cc, |
1616 | - regressiontest/mvrtree/MVRTreeQuery.cc, |
1617 | - regressiontest/mvrtree/Makefile.am, |
1618 | - regressiontest/mvrtree/Makefile.in, regressiontest/mvrtree/test1, |
1619 | - regressiontest/mvrtree/test1/run, regressiontest/mvrtree/test2, |
1620 | - regressiontest/mvrtree/test2/run, regressiontest/rtree, |
1621 | - regressiontest/rtree/Exhaustive.cc, |
1622 | - regressiontest/rtree/Generator.cc, |
1623 | - regressiontest/rtree/Makefile.am, |
1624 | - regressiontest/rtree/Makefile.in, |
1625 | - regressiontest/rtree/RTreeBulkLoad.cc, |
1626 | - regressiontest/rtree/RTreeLoad.cc, |
1627 | - regressiontest/rtree/RTreeQuery.cc, regressiontest/rtree/test1, |
1628 | - regressiontest/rtree/test1/run, regressiontest/rtree/test2, |
1629 | - regressiontest/rtree/test2/run, regressiontest/rtree/test3, |
1630 | - regressiontest/rtree/test3/run, regressiontest/rtree/test4, |
1631 | - regressiontest/rtree/test4/run, regressiontest/tprtree, |
1632 | - regressiontest/tprtree/Exhaustive.cc, |
1633 | - regressiontest/tprtree/Generator.cc, |
1634 | - regressiontest/tprtree/Makefile.am, |
1635 | - regressiontest/tprtree/Makefile.in, |
1636 | - regressiontest/tprtree/RandomGenerator.cc, |
1637 | - regressiontest/tprtree/RandomGenerator.h, |
1638 | - regressiontest/tprtree/TPRTreeLoad.cc, |
1639 | - regressiontest/tprtree/TPRTreeQuery.cc, |
1640 | - regressiontest/tprtree/test1, regressiontest/tprtree/test1/run, |
1641 | - regressiontest/tprtree/test2, regressiontest/tprtree/test2/run, |
1642 | - spatialindex.111.zip, src, src/Makefile.am, src/Makefile.in, |
1643 | - src/mvrtree, src/mvrtree/Index.cc, src/mvrtree/Index.h, |
1644 | - src/mvrtree/Leaf.cc, src/mvrtree/Leaf.h, src/mvrtree/MVRTree.cc, |
1645 | - src/mvrtree/MVRTree.h, src/mvrtree/Makefile.am, |
1646 | - src/mvrtree/Makefile.in, src/mvrtree/Node.cc, src/mvrtree/Node.h, |
1647 | - src/mvrtree/PointerPoolNode.h, src/mvrtree/Statistics.cc, |
1648 | - src/mvrtree/Statistics.h, src/rtree, src/rtree/BulkLoader.cc, |
1649 | - src/rtree/BulkLoader.h, src/rtree/Index.cc, src/rtree/Index.h, |
1650 | - src/rtree/Leaf.cc, src/rtree/Leaf.h, src/rtree/Makefile.am, |
1651 | - src/rtree/Makefile.in, src/rtree/Node.cc, src/rtree/Node.h, |
1652 | - src/rtree/PointerPoolNode.h, src/rtree/RTree.cc, |
1653 | - src/rtree/RTree.h, src/rtree/Statistics.cc, |
1654 | - src/rtree/Statistics.h, src/spatialindex, |
1655 | - src/spatialindex/Makefile.am, src/spatialindex/Makefile.in, |
1656 | - src/spatialindex/MovingPoint.cc, |
1657 | - src/spatialindex/MovingRegion.cc, |
1658 | - src/spatialindex/SpatialIndexImpl.cc, |
1659 | - src/spatialindex/SpatialIndexImpl.h, |
1660 | - src/spatialindex/TimePoint.cc, src/spatialindex/TimeRegion.cc, |
1661 | - src/storagemanager, src/storagemanager/Buffer.cc, |
1662 | - src/storagemanager/Buffer.h, |
1663 | - src/storagemanager/DiskStorageManager.cc, |
1664 | - src/storagemanager/DiskStorageManager.h, |
1665 | - src/storagemanager/Makefile.am, src/storagemanager/Makefile.in, |
1666 | - src/storagemanager/MemoryStorageManager.cc, |
1667 | - src/storagemanager/MemoryStorageManager.h, |
1668 | - src/storagemanager/RandomEvictionsBuffer.cc, |
1669 | - src/storagemanager/RandomEvictionsBuffer.h, src/tprtree, |
1670 | - src/tprtree/Index.cc, src/tprtree/Index.h, src/tprtree/Leaf.cc, |
1671 | - src/tprtree/Leaf.h, src/tprtree/Makefile.am, |
1672 | - src/tprtree/Makefile.in, src/tprtree/Node.cc, src/tprtree/Node.h, |
1673 | - src/tprtree/PointerPoolNode.h, src/tprtree/Statistics.cc, |
1674 | - src/tprtree/Statistics.h, src/tprtree/TPRTree.cc, |
1675 | - src/tprtree/TPRTree.h: add 1.1.1 version of library |
1676 | - |
1677 | -2007-08-01 20:32 hobu |
1678 | - |
1679 | - * .: basic layout |
1680 | - |
1681 | |
1682 | === removed file 'spatialindex-1.5/HOWTORELEASE.txt' |
1683 | --- spatialindex-1.5/HOWTORELEASE.txt 2010-03-17 17:45:31 +0000 |
1684 | +++ spatialindex-1.5/HOWTORELEASE.txt 1970-01-01 00:00:00 +0000 |
1685 | @@ -1,82 +0,0 @@ |
1686 | - |
1687 | -Steps for Making a libLAS Release |
1688 | -============================================================================== |
1689 | - |
1690 | -:Author: Howard Butler |
1691 | -:Contact: hobu.inc@gmail.com |
1692 | -:Revision: $Revision: 178 $ |
1693 | -:Date: $Date: 2010-03-05 14:19:51 +0000 (Fri, 05 Mar 2010) $ |
1694 | - |
1695 | -This document describes the process for releasing a new version of libspatialindex. |
1696 | - |
1697 | -General Notes |
1698 | ------------------------------------------------------------------------------- |
1699 | - |
1700 | -Release Process |
1701 | - |
1702 | -1) Increment Version Numbers |
1703 | - |
1704 | - - configure.ac |
1705 | - * sidx_version_major |
1706 | - * sidx_version_minor |
1707 | - * sidx_version_micro |
1708 | - - include/Version.h |
1709 | - * SIDX_VERSION_MAJOR |
1710 | - * SIDX_VERSION_MINOR |
1711 | - * SIDX_VERSION_REV |
1712 | - * SIDX_RELEASE_NAME |
1713 | - - makefile.vc's |
1714 | - *PACKAGE_VERSION |
1715 | - |
1716 | -2) Update README to include any relevant info about the release that |
1717 | - might have changed. |
1718 | - |
1719 | -3) Update ChangeLog with svn2cl |
1720 | - |
1721 | -4) Run the regression tests. Really. |
1722 | - |
1723 | -5) Build Windows version |
1724 | - |
1725 | - - Issue nmake and nmake install commands |
1726 | - |
1727 | - :: |
1728 | - |
1729 | - nmake /f makefile.vc clean |
1730 | - nmake /f makefile.vc |
1731 | - nmake /f makefile.vc install |
1732 | - nmake /f makefile.vc package |
1733 | - |
1734 | - |
1735 | -6) Make the source distribution |
1736 | - |
1737 | - :: |
1738 | - |
1739 | - make dist |
1740 | - |
1741 | - |
1742 | -7) Generate MD5 sums |
1743 | - |
1744 | - :: |
1745 | - |
1746 | - md5 spatialindex-src-1.5.0.tar.bz2 > spatialindex-src-1.5.0.tar.bz2.md5 |
1747 | - md5 spatialindex-src-1.5.0.tar.gz > spatialindex-src-1.5.0.tar.gz.md5 |
1748 | - md5 liblas-1.3.1-win32.zip > liblas-1.3.1-win32.zip.md5 |
1749 | - |
1750 | -8) Update http://trac.gispython.org/spatialindex/wiki/Releases |
1751 | - |
1752 | -9) Upload windows and source package as attachments to the new release page. |
1753 | - |
1754 | -10) Tag the release. Use the ``-f`` switch if you are retagging because you |
1755 | - missed something. |
1756 | - |
1757 | - :: |
1758 | - |
1759 | - svn cp http://svn.gispython.org/svn/spatialindex/spatialindex/trunk http://svn.gispython.org/svn/spatialindex/spatialindex/tags/1.5.0 |
1760 | - |
1761 | -11) Write the release notes. Place a copy of the release notes on the release |
1762 | - page you created as well as send an email to spatalindex list announcing the |
1763 | - new release. |
1764 | - |
1765 | - |
1766 | - |
1767 | -$Id: HOWTORELEASE.txt 178 2010-03-05 14:19:51Z hobu $ |
1768 | |
1769 | === removed file 'spatialindex-1.5/INSTALL' |
1770 | --- spatialindex-1.5/INSTALL 2010-03-17 17:45:31 +0000 |
1771 | +++ spatialindex-1.5/INSTALL 1970-01-01 00:00:00 +0000 |
1772 | @@ -1,231 +0,0 @@ |
1773 | -Installation Instructions |
1774 | -************************* |
1775 | - |
1776 | -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free |
1777 | -Software Foundation, Inc. |
1778 | - |
1779 | -This file is free documentation; the Free Software Foundation gives |
1780 | -unlimited permission to copy, distribute and modify it. |
1781 | - |
1782 | -Basic Installation |
1783 | -================== |
1784 | - |
1785 | -These are generic installation instructions. |
1786 | - |
1787 | - The `configure' shell script attempts to guess correct values for |
1788 | -various system-dependent variables used during compilation. It uses |
1789 | -those values to create a `Makefile' in each directory of the package. |
1790 | -It may also create one or more `.h' files containing system-dependent |
1791 | -definitions. Finally, it creates a shell script `config.status' that |
1792 | -you can run in the future to recreate the current configuration, and a |
1793 | -file `config.log' containing compiler output (useful mainly for |
1794 | -debugging `configure'). |
1795 | - |
1796 | - It can also use an optional file (typically called `config.cache' |
1797 | -and enabled with `--cache-file=config.cache' or simply `-C') that saves |
1798 | -the results of its tests to speed up reconfiguring. (Caching is |
1799 | -disabled by default to prevent problems with accidental use of stale |
1800 | -cache files.) |
1801 | - |
1802 | - If you need to do unusual things to compile the package, please try |
1803 | -to figure out how `configure' could check whether to do them, and mail |
1804 | -diffs or instructions to the address given in the `README' so they can |
1805 | -be considered for the next release. If you are using the cache, and at |
1806 | -some point `config.cache' contains results you don't want to keep, you |
1807 | -may remove or edit it. |
1808 | - |
1809 | - The file `configure.ac' (or `configure.in') is used to create |
1810 | -`configure' by a program called `autoconf'. You only need |
1811 | -`configure.ac' if you want to change it or regenerate `configure' using |
1812 | -a newer version of `autoconf'. |
1813 | - |
1814 | -The simplest way to compile this package is: |
1815 | - |
1816 | - 1. `cd' to the directory containing the package's source code and type |
1817 | - `./configure' to configure the package for your system. If you're |
1818 | - using `csh' on an old version of System V, you might need to type |
1819 | - `sh ./configure' instead to prevent `csh' from trying to execute |
1820 | - `configure' itself. |
1821 | - |
1822 | - Running `configure' takes awhile. While running, it prints some |
1823 | - messages telling which features it is checking for. |
1824 | - |
1825 | - 2. Type `make' to compile the package. |
1826 | - |
1827 | - 3. Optionally, type `make check' to run any self-tests that come with |
1828 | - the package. |
1829 | - |
1830 | - 4. Type `make install' to install the programs and any data files and |
1831 | - documentation. |
1832 | - |
1833 | - 5. You can remove the program binaries and object files from the |
1834 | - source code directory by typing `make clean'. To also remove the |
1835 | - files that `configure' created (so you can compile the package for |
1836 | - a different kind of computer), type `make distclean'. There is |
1837 | - also a `make maintainer-clean' target, but that is intended mainly |
1838 | - for the package's developers. If you use it, you may have to get |
1839 | - all sorts of other programs in order to regenerate files that came |
1840 | - with the distribution. |
1841 | - |
1842 | -Compilers and Options |
1843 | -===================== |
1844 | - |
1845 | -Some systems require unusual options for compilation or linking that the |
1846 | -`configure' script does not know about. Run `./configure --help' for |
1847 | -details on some of the pertinent environment variables. |
1848 | - |
1849 | - You can give `configure' initial values for configuration parameters |
1850 | -by setting variables in the command line or in the environment. Here |
1851 | -is an example: |
1852 | - |
1853 | - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix |
1854 | - |
1855 | - *Note Defining Variables::, for more details. |
1856 | - |
1857 | -Compiling For Multiple Architectures |
1858 | -==================================== |
1859 | - |
1860 | -You can compile the package for more than one kind of computer at the |
1861 | -same time, by placing the object files for each architecture in their |
1862 | -own directory. To do this, you must use a version of `make' that |
1863 | -supports the `VPATH' variable, such as GNU `make'. `cd' to the |
1864 | -directory where you want the object files and executables to go and run |
1865 | -the `configure' script. `configure' automatically checks for the |
1866 | -source code in the directory that `configure' is in and in `..'. |
1867 | - |
1868 | - If you have to use a `make' that does not support the `VPATH' |
1869 | -variable, you have to compile the package for one architecture at a |
1870 | -time in the source code directory. After you have installed the |
1871 | -package for one architecture, use `make distclean' before reconfiguring |
1872 | -for another architecture. |
1873 | - |
1874 | -Installation Names |
1875 | -================== |
1876 | - |
1877 | -By default, `make install' will install the package's files in |
1878 | -`/usr/local/bin', `/usr/local/man', etc. You can specify an |
1879 | -installation prefix other than `/usr/local' by giving `configure' the |
1880 | -option `--prefix=PREFIX'. |
1881 | - |
1882 | - You can specify separate installation prefixes for |
1883 | -architecture-specific files and architecture-independent files. If you |
1884 | -give `configure' the option `--exec-prefix=PREFIX', the package will |
1885 | -use PREFIX as the prefix for installing programs and libraries. |
1886 | -Documentation and other data files will still use the regular prefix. |
1887 | - |
1888 | - In addition, if you use an unusual directory layout you can give |
1889 | -options like `--bindir=DIR' to specify different values for particular |
1890 | -kinds of files. Run `configure --help' for a list of the directories |
1891 | -you can set and what kinds of files go in them. |
1892 | - |
1893 | - If the package supports it, you can cause programs to be installed |
1894 | -with an extra prefix or suffix on their names by giving `configure' the |
1895 | -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. |
1896 | - |
1897 | -Optional Features |
1898 | -================= |
1899 | - |
1900 | -Some packages pay attention to `--enable-FEATURE' options to |
1901 | -`configure', where FEATURE indicates an optional part of the package. |
1902 | -They may also pay attention to `--with-PACKAGE' options, where PACKAGE |
1903 | -is something like `gnu-as' or `x' (for the X Window System). The |
1904 | -`README' should mention any `--enable-' and `--with-' options that the |
1905 | -package recognizes. |
1906 | - |
1907 | - For packages that use the X Window System, `configure' can usually |
1908 | -find the X include and library files automatically, but if it doesn't, |
1909 | -you can use the `configure' options `--x-includes=DIR' and |
1910 | -`--x-libraries=DIR' to specify their locations. |
1911 | - |
1912 | -Specifying the System Type |
1913 | -========================== |
1914 | - |
1915 | -There may be some features `configure' cannot figure out automatically, |
1916 | -but needs to determine by the type of machine the package will run on. |
1917 | -Usually, assuming the package is built to be run on the _same_ |
1918 | -architectures, `configure' can figure that out, but if it prints a |
1919 | -message saying it cannot guess the machine type, give it the |
1920 | -`--build=TYPE' option. TYPE can either be a short name for the system |
1921 | -type, such as `sun4', or a canonical name which has the form: |
1922 | - |
1923 | - CPU-COMPANY-SYSTEM |
1924 | - |
1925 | -where SYSTEM can have one of these forms: |
1926 | - |
1927 | - OS KERNEL-OS |
1928 | - |
1929 | - See the file `config.sub' for the possible values of each field. If |
1930 | -`config.sub' isn't included in this package, then this package doesn't |
1931 | -need to know the machine type. |
1932 | - |
1933 | - If you are _building_ compiler tools for cross-compiling, you should |
1934 | -use the `--target=TYPE' option to select the type of system they will |
1935 | -produce code for. |
1936 | - |
1937 | - If you want to _use_ a cross compiler, that generates code for a |
1938 | -platform different from the build platform, you should specify the |
1939 | -"host" platform (i.e., that on which the generated programs will |
1940 | -eventually be run) with `--host=TYPE'. |
1941 | - |
1942 | -Sharing Defaults |
1943 | -================ |
1944 | - |
1945 | -If you want to set default values for `configure' scripts to share, you |
1946 | -can create a site shell script called `config.site' that gives default |
1947 | -values for variables like `CC', `cache_file', and `prefix'. |
1948 | -`configure' looks for `PREFIX/share/config.site' if it exists, then |
1949 | -`PREFIX/etc/config.site' if it exists. Or, you can set the |
1950 | -`CONFIG_SITE' environment variable to the location of the site script. |
1951 | -A warning: not all `configure' scripts look for a site script. |
1952 | - |
1953 | -Defining Variables |
1954 | -================== |
1955 | - |
1956 | -Variables not defined in a site shell script can be set in the |
1957 | -environment passed to `configure'. However, some packages may run |
1958 | -configure again during the build, and the customized values of these |
1959 | -variables may be lost. In order to avoid this problem, you should set |
1960 | -them in the `configure' command line, using `VAR=value'. For example: |
1961 | - |
1962 | - ./configure CC=/usr/local2/bin/gcc |
1963 | - |
1964 | -will cause the specified gcc to be used as the C compiler (unless it is |
1965 | -overridden in the site shell script). |
1966 | - |
1967 | -`configure' Invocation |
1968 | -====================== |
1969 | - |
1970 | -`configure' recognizes the following options to control how it operates. |
1971 | - |
1972 | -`--help' |
1973 | -`-h' |
1974 | - Print a summary of the options to `configure', and exit. |
1975 | - |
1976 | -`--version' |
1977 | -`-V' |
1978 | - Print the version of Autoconf used to generate the `configure' |
1979 | - script, and exit. |
1980 | - |
1981 | -`--cache-file=FILE' |
1982 | - Enable the cache: use and save the results of the tests in FILE, |
1983 | - traditionally `config.cache'. FILE defaults to `/dev/null' to |
1984 | - disable caching. |
1985 | - |
1986 | -`--config-cache' |
1987 | -`-C' |
1988 | - Alias for `--cache-file=config.cache'. |
1989 | - |
1990 | -`--quiet' |
1991 | -`--silent' |
1992 | -`-q' |
1993 | - Do not print messages saying which checks are being made. To |
1994 | - suppress all normal output, redirect it to `/dev/null' (any error |
1995 | - messages will still be shown). |
1996 | - |
1997 | -`--srcdir=DIR' |
1998 | - Look for the package's source code in directory DIR. Usually |
1999 | - `configure' can determine that directory automatically. |
2000 | - |
2001 | -`configure' also accepts some other, not widely useful, options. Run |
2002 | -`configure --help' for more details. |
2003 | - |
2004 | |
2005 | === removed file 'spatialindex-1.5/INSTALL.WIN' |
2006 | --- spatialindex-1.5/INSTALL.WIN 2010-03-17 17:45:31 +0000 |
2007 | +++ spatialindex-1.5/INSTALL.WIN 1970-01-01 00:00:00 +0000 |
2008 | @@ -1,28 +0,0 @@ |
2009 | -Visual Studio 2005: |
2010 | -You have to open the spatialindex.sln solution from the IDE and build. |
2011 | -Unfortunatelly, vcbuild.exe does not work as expected, hence you cannot |
2012 | -build the DLL from the command line. |
2013 | - |
2014 | -Visutal Studio 2008: |
2015 | -Either use the IDE or use vcbuild to compile from the command line: |
2016 | - |
2017 | -To create 32bit DLL: |
2018 | -1. Open a Visual Studio command prompt (or open any shell |
2019 | - and run vcvars32.bat). |
2020 | - |
2021 | -2a. Release build: |
2022 | - Run vcbuild.exe /useenv spatialindex.sln "Release|Win32" |
2023 | -2b. Debug build: |
2024 | - Run vcbuild.exe /useenv spatialindex.sln "Debug|Win32" |
2025 | - |
2026 | -To create 64bit DLL: |
2027 | -1. Open a Visual Studio x64 command prompt (or open any shell |
2028 | - and run vcvarsall.bat x64). |
2029 | - |
2030 | -2a. Release build: |
2031 | - Run vcbuild.exe /useenv spatialindex.sln "Release|x64" |
2032 | -2b. Debug build: |
2033 | - Run vcbuild.exe /useenv spatialindex.sln "Debug|x64" |
2034 | - |
2035 | -Enjoy! |
2036 | - |
2037 | |
2038 | === removed file 'spatialindex-1.5/Makefile.am' |
2039 | --- spatialindex-1.5/Makefile.am 2010-03-17 17:45:31 +0000 |
2040 | +++ spatialindex-1.5/Makefile.am 1970-01-01 00:00:00 +0000 |
2041 | @@ -1,23 +0,0 @@ |
2042 | -## Makefile.am -- Process this file with automake to produce Makefile.in |
2043 | -SUBDIRS = src . regressiontest include |
2044 | - |
2045 | -lib_LTLIBRARIES = libspatialindex.la libspatialindex_c.la |
2046 | - |
2047 | -libspatialindex_la_SOURCES = |
2048 | -libspatialindex_la_LIBADD = \ |
2049 | - src/spatialindex/liblibrary.la \ |
2050 | - src/storagemanager/libstoragemanager.la \ |
2051 | - src/rtree/librtree.la \ |
2052 | - src/mvrtree/libmvrtree.la \ |
2053 | - src/tprtree/libtprtree.la \ |
2054 | - src/tools/libtools.la |
2055 | - |
2056 | -libspatialindex_c_la_SOURCES = |
2057 | -libspatialindex_c_la_LIBADD = \ |
2058 | - libspatialindex.la \ |
2059 | - src/capi/libsidxc.la |
2060 | - |
2061 | -libspatialindex_la_LDFLAGS = -version-info 1:0:0 |
2062 | -libspatialindex_c_la_LDFLAGS = -version-info 1:0:0 -lstdc++ |
2063 | - |
2064 | -EXTRA_DIST = makefile.vc INSTALL.WIN |
2065 | |
2066 | === removed file 'spatialindex-1.5/Makefile.in' |
2067 | --- spatialindex-1.5/Makefile.in 2010-03-17 22:27:58 +0000 |
2068 | +++ spatialindex-1.5/Makefile.in 1970-01-01 00:00:00 +0000 |
2069 | @@ -1,816 +0,0 @@ |
2070 | -# Makefile.in generated by automake 1.11 from Makefile.am. |
2071 | -# @configure_input@ |
2072 | - |
2073 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
2074 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
2075 | -# Inc. |
2076 | -# This Makefile.in is free software; the Free Software Foundation |
2077 | -# gives unlimited permission to copy and/or distribute it, |
2078 | -# with or without modifications, as long as this notice is preserved. |
2079 | - |
2080 | -# This program is distributed in the hope that it will be useful, |
2081 | -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
2082 | -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
2083 | -# PARTICULAR PURPOSE. |
2084 | - |
2085 | -@SET_MAKE@ |
2086 | - |
2087 | -VPATH = @srcdir@ |
2088 | -pkgdatadir = $(datadir)/@PACKAGE@ |
2089 | -pkgincludedir = $(includedir)/@PACKAGE@ |
2090 | -pkglibdir = $(libdir)/@PACKAGE@ |
2091 | -pkglibexecdir = $(libexecdir)/@PACKAGE@ |
2092 | -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
2093 | -install_sh_DATA = $(install_sh) -c -m 644 |
2094 | -install_sh_PROGRAM = $(install_sh) -c |
2095 | -install_sh_SCRIPT = $(install_sh) -c |
2096 | -INSTALL_HEADER = $(INSTALL_DATA) |
2097 | -transform = $(program_transform_name) |
2098 | -NORMAL_INSTALL = : |
2099 | -PRE_INSTALL = : |
2100 | -POST_INSTALL = : |
2101 | -NORMAL_UNINSTALL = : |
2102 | -PRE_UNINSTALL = : |
2103 | -POST_UNINSTALL = : |
2104 | -build_triplet = @build@ |
2105 | -host_triplet = @host@ |
2106 | -subdir = . |
2107 | -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
2108 | - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ |
2109 | - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ |
2110 | - install-sh ltmain.sh missing mkinstalldirs |
2111 | -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2112 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2113 | -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2114 | - $(ACLOCAL_M4) |
2115 | -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
2116 | - configure.lineno config.status.lineno |
2117 | -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
2118 | -CONFIG_CLEAN_FILES = |
2119 | -CONFIG_CLEAN_VPATH_FILES = |
2120 | -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
2121 | -am__vpath_adj = case $$p in \ |
2122 | - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
2123 | - *) f=$$p;; \ |
2124 | - esac; |
2125 | -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; |
2126 | -am__install_max = 40 |
2127 | -am__nobase_strip_setup = \ |
2128 | - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` |
2129 | -am__nobase_strip = \ |
2130 | - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" |
2131 | -am__nobase_list = $(am__nobase_strip_setup); \ |
2132 | - for p in $$list; do echo "$$p $$p"; done | \ |
2133 | - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ |
2134 | - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ |
2135 | - if (++n[$$2] == $(am__install_max)) \ |
2136 | - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ |
2137 | - END { for (dir in files) print dir, files[dir] }' |
2138 | -am__base_list = \ |
2139 | - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
2140 | - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
2141 | -am__installdirs = "$(DESTDIR)$(libdir)" |
2142 | -LTLIBRARIES = $(lib_LTLIBRARIES) |
2143 | -libspatialindex_la_DEPENDENCIES = src/spatialindex/liblibrary.la \ |
2144 | - src/storagemanager/libstoragemanager.la src/rtree/librtree.la \ |
2145 | - src/mvrtree/libmvrtree.la src/tprtree/libtprtree.la \ |
2146 | - src/tools/libtools.la |
2147 | -am_libspatialindex_la_OBJECTS = |
2148 | -libspatialindex_la_OBJECTS = $(am_libspatialindex_la_OBJECTS) |
2149 | -libspatialindex_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2150 | - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2151 | - $(libspatialindex_la_LDFLAGS) $(LDFLAGS) -o $@ |
2152 | -libspatialindex_c_la_DEPENDENCIES = libspatialindex.la \ |
2153 | - src/capi/libsidxc.la |
2154 | -am_libspatialindex_c_la_OBJECTS = |
2155 | -libspatialindex_c_la_OBJECTS = $(am_libspatialindex_c_la_OBJECTS) |
2156 | -libspatialindex_c_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2157 | - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2158 | - $(libspatialindex_c_la_LDFLAGS) $(LDFLAGS) -o $@ |
2159 | -DEFAULT_INCLUDES = -I.@am__isrc@ |
2160 | -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
2161 | - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
2162 | -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
2163 | - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ |
2164 | - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
2165 | -CCLD = $(CC) |
2166 | -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
2167 | - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
2168 | - $(LDFLAGS) -o $@ |
2169 | -SOURCES = $(libspatialindex_la_SOURCES) \ |
2170 | - $(libspatialindex_c_la_SOURCES) |
2171 | -DIST_SOURCES = $(libspatialindex_la_SOURCES) \ |
2172 | - $(libspatialindex_c_la_SOURCES) |
2173 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
2174 | - html-recursive info-recursive install-data-recursive \ |
2175 | - install-dvi-recursive install-exec-recursive \ |
2176 | - install-html-recursive install-info-recursive \ |
2177 | - install-pdf-recursive install-ps-recursive install-recursive \ |
2178 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
2179 | - ps-recursive uninstall-recursive |
2180 | -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
2181 | - distclean-recursive maintainer-clean-recursive |
2182 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
2183 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
2184 | - distdir dist dist-all distcheck |
2185 | -ETAGS = etags |
2186 | -CTAGS = ctags |
2187 | -DIST_SUBDIRS = $(SUBDIRS) |
2188 | -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
2189 | -distdir = $(PACKAGE)-$(VERSION) |
2190 | -top_distdir = $(distdir) |
2191 | -am__remove_distdir = \ |
2192 | - { test ! -d "$(distdir)" \ |
2193 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
2194 | - && rm -fr "$(distdir)"; }; } |
2195 | -am__relativize = \ |
2196 | - dir0=`pwd`; \ |
2197 | - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
2198 | - sed_rest='s,^[^/]*/*,,'; \ |
2199 | - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ |
2200 | - sed_butlast='s,/*[^/]*$$,,'; \ |
2201 | - while test -n "$$dir1"; do \ |
2202 | - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ |
2203 | - if test "$$first" != "."; then \ |
2204 | - if test "$$first" = ".."; then \ |
2205 | - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ |
2206 | - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ |
2207 | - else \ |
2208 | - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ |
2209 | - if test "$$first2" = "$$first"; then \ |
2210 | - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ |
2211 | - else \ |
2212 | - dir2="../$$dir2"; \ |
2213 | - fi; \ |
2214 | - dir0="$$dir0"/"$$first"; \ |
2215 | - fi; \ |
2216 | - fi; \ |
2217 | - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
2218 | - done; \ |
2219 | - reldir="$$dir2" |
2220 | -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 |
2221 | -GZIP_ENV = --best |
2222 | -distuninstallcheck_listfiles = find . -type f -print |
2223 | -distcleancheck_listfiles = find . -type f -print |
2224 | -ACLOCAL = @ACLOCAL@ |
2225 | -AMTAR = @AMTAR@ |
2226 | -AR = @AR@ |
2227 | -AUTOCONF = @AUTOCONF@ |
2228 | -AUTOHEADER = @AUTOHEADER@ |
2229 | -AUTOMAKE = @AUTOMAKE@ |
2230 | -AWK = @AWK@ |
2231 | -CC = @CC@ |
2232 | -CCDEPMODE = @CCDEPMODE@ |
2233 | -CFLAGS = @CFLAGS@ |
2234 | -CPP = @CPP@ |
2235 | -CPPFLAGS = @CPPFLAGS@ |
2236 | -CXX = @CXX@ |
2237 | -CXXCPP = @CXXCPP@ |
2238 | -CXXDEPMODE = @CXXDEPMODE@ |
2239 | -CXXFLAGS = @CXXFLAGS@ |
2240 | -CYGPATH_W = @CYGPATH_W@ |
2241 | -DEFS = @DEFS@ |
2242 | -DEPDIR = @DEPDIR@ |
2243 | -DSYMUTIL = @DSYMUTIL@ |
2244 | -DUMPBIN = @DUMPBIN@ |
2245 | -ECHO_C = @ECHO_C@ |
2246 | -ECHO_N = @ECHO_N@ |
2247 | -ECHO_T = @ECHO_T@ |
2248 | -EGREP = @EGREP@ |
2249 | -EXEEXT = @EXEEXT@ |
2250 | -FGREP = @FGREP@ |
2251 | -GREP = @GREP@ |
2252 | -INSTALL = @INSTALL@ |
2253 | -INSTALL_DATA = @INSTALL_DATA@ |
2254 | -INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
2255 | -INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
2256 | -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
2257 | -LD = @LD@ |
2258 | -LDFLAGS = @LDFLAGS@ |
2259 | -LIBOBJS = @LIBOBJS@ |
2260 | -LIBS = @LIBS@ |
2261 | -LIBTOOL = @LIBTOOL@ |
2262 | -LIPO = @LIPO@ |
2263 | -LN_S = @LN_S@ |
2264 | -LTLIBOBJS = @LTLIBOBJS@ |
2265 | -MAKEINFO = @MAKEINFO@ |
2266 | -MKDIR_P = @MKDIR_P@ |
2267 | -NM = @NM@ |
2268 | -NMEDIT = @NMEDIT@ |
2269 | -OBJDUMP = @OBJDUMP@ |
2270 | -OBJEXT = @OBJEXT@ |
2271 | -OTOOL = @OTOOL@ |
2272 | -OTOOL64 = @OTOOL64@ |
2273 | -PACKAGE = @PACKAGE@ |
2274 | -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
2275 | -PACKAGE_NAME = @PACKAGE_NAME@ |
2276 | -PACKAGE_STRING = @PACKAGE_STRING@ |
2277 | -PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
2278 | -PACKAGE_URL = @PACKAGE_URL@ |
2279 | -PACKAGE_VERSION = @PACKAGE_VERSION@ |
2280 | -PATH_SEPARATOR = @PATH_SEPARATOR@ |
2281 | -RANLIB = @RANLIB@ |
2282 | -SED = @SED@ |
2283 | -SET_MAKE = @SET_MAKE@ |
2284 | -SHELL = @SHELL@ |
2285 | -STRIP = @STRIP@ |
2286 | -VERSION = @VERSION@ |
2287 | -abs_builddir = @abs_builddir@ |
2288 | -abs_srcdir = @abs_srcdir@ |
2289 | -abs_top_builddir = @abs_top_builddir@ |
2290 | -abs_top_srcdir = @abs_top_srcdir@ |
2291 | -ac_ct_CC = @ac_ct_CC@ |
2292 | -ac_ct_CXX = @ac_ct_CXX@ |
2293 | -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
2294 | -am__include = @am__include@ |
2295 | -am__leading_dot = @am__leading_dot@ |
2296 | -am__quote = @am__quote@ |
2297 | -am__tar = @am__tar@ |
2298 | -am__untar = @am__untar@ |
2299 | -bindir = @bindir@ |
2300 | -build = @build@ |
2301 | -build_alias = @build_alias@ |
2302 | -build_cpu = @build_cpu@ |
2303 | -build_os = @build_os@ |
2304 | -build_vendor = @build_vendor@ |
2305 | -builddir = @builddir@ |
2306 | -datadir = @datadir@ |
2307 | -datarootdir = @datarootdir@ |
2308 | -docdir = @docdir@ |
2309 | -dvidir = @dvidir@ |
2310 | -exec_prefix = @exec_prefix@ |
2311 | -host = @host@ |
2312 | -host_alias = @host_alias@ |
2313 | -host_cpu = @host_cpu@ |
2314 | -host_os = @host_os@ |
2315 | -host_vendor = @host_vendor@ |
2316 | -htmldir = @htmldir@ |
2317 | -includedir = @includedir@ |
2318 | -infodir = @infodir@ |
2319 | -install_sh = @install_sh@ |
2320 | -libdir = @libdir@ |
2321 | -libexecdir = @libexecdir@ |
2322 | -localedir = @localedir@ |
2323 | -localstatedir = @localstatedir@ |
2324 | -lt_ECHO = @lt_ECHO@ |
2325 | -mandir = @mandir@ |
2326 | -mkdir_p = @mkdir_p@ |
2327 | -oldincludedir = @oldincludedir@ |
2328 | -pdfdir = @pdfdir@ |
2329 | -prefix = @prefix@ |
2330 | -program_transform_name = @program_transform_name@ |
2331 | -psdir = @psdir@ |
2332 | -sbindir = @sbindir@ |
2333 | -sharedstatedir = @sharedstatedir@ |
2334 | -srcdir = @srcdir@ |
2335 | -sysconfdir = @sysconfdir@ |
2336 | -target_alias = @target_alias@ |
2337 | -top_build_prefix = @top_build_prefix@ |
2338 | -top_builddir = @top_builddir@ |
2339 | -top_srcdir = @top_srcdir@ |
2340 | -SUBDIRS = src . include |
2341 | -lib_LTLIBRARIES = libspatialindex.la libspatialindex_c.la |
2342 | -libspatialindex_la_SOURCES = |
2343 | -libspatialindex_la_LIBADD = \ |
2344 | - src/spatialindex/liblibrary.la \ |
2345 | - src/storagemanager/libstoragemanager.la \ |
2346 | - src/rtree/librtree.la \ |
2347 | - src/mvrtree/libmvrtree.la \ |
2348 | - src/tprtree/libtprtree.la \ |
2349 | - src/tools/libtools.la |
2350 | - |
2351 | -libspatialindex_c_la_SOURCES = |
2352 | -libspatialindex_c_la_LIBADD = \ |
2353 | - libspatialindex.la \ |
2354 | - src/capi/libsidxc.la |
2355 | - |
2356 | -libspatialindex_la_LDFLAGS = -version-info 1:0:0 |
2357 | -libspatialindex_c_la_LDFLAGS = -version-info 1:0:0 -lstdc++ |
2358 | -EXTRA_DIST = makefile.vc INSTALL.WIN |
2359 | -all: all-recursive |
2360 | - |
2361 | -.SUFFIXES: |
2362 | -am--refresh: |
2363 | - @: |
2364 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
2365 | - @for dep in $?; do \ |
2366 | - case '$(am__configure_deps)' in \ |
2367 | - *$$dep*) \ |
2368 | - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ |
2369 | - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ |
2370 | - && exit 0; \ |
2371 | - exit 1;; \ |
2372 | - esac; \ |
2373 | - done; \ |
2374 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
2375 | - $(am__cd) $(top_srcdir) && \ |
2376 | - $(AUTOMAKE) --gnu Makefile |
2377 | -.PRECIOUS: Makefile |
2378 | -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
2379 | - @case '$?' in \ |
2380 | - *config.status*) \ |
2381 | - echo ' $(SHELL) ./config.status'; \ |
2382 | - $(SHELL) ./config.status;; \ |
2383 | - *) \ |
2384 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
2385 | - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
2386 | - esac; |
2387 | - |
2388 | -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
2389 | - $(SHELL) ./config.status --recheck |
2390 | - |
2391 | -$(top_srcdir)/configure: $(am__configure_deps) |
2392 | - $(am__cd) $(srcdir) && $(AUTOCONF) |
2393 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
2394 | - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
2395 | -$(am__aclocal_m4_deps): |
2396 | -install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
2397 | - @$(NORMAL_INSTALL) |
2398 | - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" |
2399 | - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
2400 | - list2=; for p in $$list; do \ |
2401 | - if test -f $$p; then \ |
2402 | - list2="$$list2 $$p"; \ |
2403 | - else :; fi; \ |
2404 | - done; \ |
2405 | - test -z "$$list2" || { \ |
2406 | - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ |
2407 | - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ |
2408 | - } |
2409 | - |
2410 | -uninstall-libLTLIBRARIES: |
2411 | - @$(NORMAL_UNINSTALL) |
2412 | - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
2413 | - for p in $$list; do \ |
2414 | - $(am__strip_dir) \ |
2415 | - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ |
2416 | - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ |
2417 | - done |
2418 | - |
2419 | -clean-libLTLIBRARIES: |
2420 | - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) |
2421 | - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
2422 | - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ |
2423 | - test "$$dir" != "$$p" || dir=.; \ |
2424 | - echo "rm -f \"$${dir}/so_locations\""; \ |
2425 | - rm -f "$${dir}/so_locations"; \ |
2426 | - done |
2427 | -libspatialindex.la: $(libspatialindex_la_OBJECTS) $(libspatialindex_la_DEPENDENCIES) |
2428 | - $(libspatialindex_la_LINK) -rpath $(libdir) $(libspatialindex_la_OBJECTS) $(libspatialindex_la_LIBADD) $(LIBS) |
2429 | -libspatialindex_c.la: $(libspatialindex_c_la_OBJECTS) $(libspatialindex_c_la_DEPENDENCIES) |
2430 | - $(libspatialindex_c_la_LINK) -rpath $(libdir) $(libspatialindex_c_la_OBJECTS) $(libspatialindex_c_la_LIBADD) $(LIBS) |
2431 | - |
2432 | -mostlyclean-compile: |
2433 | - -rm -f *.$(OBJEXT) |
2434 | - |
2435 | -distclean-compile: |
2436 | - -rm -f *.tab.c |
2437 | - |
2438 | -mostlyclean-libtool: |
2439 | - -rm -f *.lo |
2440 | - |
2441 | -clean-libtool: |
2442 | - -rm -rf .libs _libs |
2443 | - |
2444 | -distclean-libtool: |
2445 | - -rm -f libtool config.lt |
2446 | - |
2447 | -# This directory's subdirectories are mostly independent; you can cd |
2448 | -# into them and run `make' without going through this Makefile. |
2449 | -# To change the values of `make' variables: instead of editing Makefiles, |
2450 | -# (1) if the variable is set in `config.status', edit `config.status' |
2451 | -# (which will cause the Makefiles to be regenerated when you run `make'); |
2452 | -# (2) otherwise, pass the desired values on the `make' command line. |
2453 | -$(RECURSIVE_TARGETS): |
2454 | - @failcom='exit 1'; \ |
2455 | - for f in x $$MAKEFLAGS; do \ |
2456 | - case $$f in \ |
2457 | - *=* | --[!k]*);; \ |
2458 | - *k*) failcom='fail=yes';; \ |
2459 | - esac; \ |
2460 | - done; \ |
2461 | - dot_seen=no; \ |
2462 | - target=`echo $@ | sed s/-recursive//`; \ |
2463 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
2464 | - echo "Making $$target in $$subdir"; \ |
2465 | - if test "$$subdir" = "."; then \ |
2466 | - dot_seen=yes; \ |
2467 | - local_target="$$target-am"; \ |
2468 | - else \ |
2469 | - local_target="$$target"; \ |
2470 | - fi; \ |
2471 | - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
2472 | - || eval $$failcom; \ |
2473 | - done; \ |
2474 | - if test "$$dot_seen" = "no"; then \ |
2475 | - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
2476 | - fi; test -z "$$fail" |
2477 | - |
2478 | -$(RECURSIVE_CLEAN_TARGETS): |
2479 | - @failcom='exit 1'; \ |
2480 | - for f in x $$MAKEFLAGS; do \ |
2481 | - case $$f in \ |
2482 | - *=* | --[!k]*);; \ |
2483 | - *k*) failcom='fail=yes';; \ |
2484 | - esac; \ |
2485 | - done; \ |
2486 | - dot_seen=no; \ |
2487 | - case "$@" in \ |
2488 | - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
2489 | - *) list='$(SUBDIRS)' ;; \ |
2490 | - esac; \ |
2491 | - rev=''; for subdir in $$list; do \ |
2492 | - if test "$$subdir" = "."; then :; else \ |
2493 | - rev="$$subdir $$rev"; \ |
2494 | - fi; \ |
2495 | - done; \ |
2496 | - rev="$$rev ."; \ |
2497 | - target=`echo $@ | sed s/-recursive//`; \ |
2498 | - for subdir in $$rev; do \ |
2499 | - echo "Making $$target in $$subdir"; \ |
2500 | - if test "$$subdir" = "."; then \ |
2501 | - local_target="$$target-am"; \ |
2502 | - else \ |
2503 | - local_target="$$target"; \ |
2504 | - fi; \ |
2505 | - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
2506 | - || eval $$failcom; \ |
2507 | - done && test -z "$$fail" |
2508 | -tags-recursive: |
2509 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
2510 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
2511 | - done |
2512 | -ctags-recursive: |
2513 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
2514 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
2515 | - done |
2516 | - |
2517 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
2518 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2519 | - unique=`for i in $$list; do \ |
2520 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2521 | - done | \ |
2522 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2523 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2524 | - mkid -fID $$unique |
2525 | -tags: TAGS |
2526 | - |
2527 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
2528 | - $(TAGS_FILES) $(LISP) |
2529 | - set x; \ |
2530 | - here=`pwd`; \ |
2531 | - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
2532 | - include_option=--etags-include; \ |
2533 | - empty_fix=.; \ |
2534 | - else \ |
2535 | - include_option=--include; \ |
2536 | - empty_fix=; \ |
2537 | - fi; \ |
2538 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
2539 | - if test "$$subdir" = .; then :; else \ |
2540 | - test ! -f $$subdir/TAGS || \ |
2541 | - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
2542 | - fi; \ |
2543 | - done; \ |
2544 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2545 | - unique=`for i in $$list; do \ |
2546 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2547 | - done | \ |
2548 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2549 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2550 | - shift; \ |
2551 | - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
2552 | - test -n "$$unique" || unique=$$empty_fix; \ |
2553 | - if test $$# -gt 0; then \ |
2554 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
2555 | - "$$@" $$unique; \ |
2556 | - else \ |
2557 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
2558 | - $$unique; \ |
2559 | - fi; \ |
2560 | - fi |
2561 | -ctags: CTAGS |
2562 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
2563 | - $(TAGS_FILES) $(LISP) |
2564 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2565 | - unique=`for i in $$list; do \ |
2566 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2567 | - done | \ |
2568 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2569 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2570 | - test -z "$(CTAGS_ARGS)$$unique" \ |
2571 | - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
2572 | - $$unique |
2573 | - |
2574 | -GTAGS: |
2575 | - here=`$(am__cd) $(top_builddir) && pwd` \ |
2576 | - && $(am__cd) $(top_srcdir) \ |
2577 | - && gtags -i $(GTAGS_ARGS) "$$here" |
2578 | - |
2579 | -distclean-tags: |
2580 | - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
2581 | - |
2582 | -distdir: $(DISTFILES) |
2583 | - $(am__remove_distdir) |
2584 | - test -d "$(distdir)" || mkdir "$(distdir)" |
2585 | - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
2586 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
2587 | - list='$(DISTFILES)'; \ |
2588 | - dist_files=`for file in $$list; do echo $$file; done | \ |
2589 | - sed -e "s|^$$srcdirstrip/||;t" \ |
2590 | - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
2591 | - case $$dist_files in \ |
2592 | - */*) $(MKDIR_P) `echo "$$dist_files" | \ |
2593 | - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
2594 | - sort -u` ;; \ |
2595 | - esac; \ |
2596 | - for file in $$dist_files; do \ |
2597 | - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
2598 | - if test -d $$d/$$file; then \ |
2599 | - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
2600 | - if test -d "$(distdir)/$$file"; then \ |
2601 | - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
2602 | - fi; \ |
2603 | - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
2604 | - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
2605 | - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
2606 | - fi; \ |
2607 | - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
2608 | - else \ |
2609 | - test -f "$(distdir)/$$file" \ |
2610 | - || cp -p $$d/$$file "$(distdir)/$$file" \ |
2611 | - || exit 1; \ |
2612 | - fi; \ |
2613 | - done |
2614 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
2615 | - if test "$$subdir" = .; then :; else \ |
2616 | - test -d "$(distdir)/$$subdir" \ |
2617 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
2618 | - || exit 1; \ |
2619 | - fi; \ |
2620 | - done |
2621 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
2622 | - if test "$$subdir" = .; then :; else \ |
2623 | - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
2624 | - $(am__relativize); \ |
2625 | - new_distdir=$$reldir; \ |
2626 | - dir1=$$subdir; dir2="$(top_distdir)"; \ |
2627 | - $(am__relativize); \ |
2628 | - new_top_distdir=$$reldir; \ |
2629 | - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ |
2630 | - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ |
2631 | - ($(am__cd) $$subdir && \ |
2632 | - $(MAKE) $(AM_MAKEFLAGS) \ |
2633 | - top_distdir="$$new_top_distdir" \ |
2634 | - distdir="$$new_distdir" \ |
2635 | - am__remove_distdir=: \ |
2636 | - am__skip_length_check=: \ |
2637 | - am__skip_mode_fix=: \ |
2638 | - distdir) \ |
2639 | - || exit 1; \ |
2640 | - fi; \ |
2641 | - done |
2642 | - -test -n "$(am__skip_mode_fix)" \ |
2643 | - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ |
2644 | - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ |
2645 | - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
2646 | - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
2647 | - || chmod -R a+r "$(distdir)" |
2648 | -dist-gzip: distdir |
2649 | - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
2650 | - $(am__remove_distdir) |
2651 | -dist-bzip2: distdir |
2652 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
2653 | - $(am__remove_distdir) |
2654 | - |
2655 | -dist-lzma: distdir |
2656 | - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
2657 | - $(am__remove_distdir) |
2658 | - |
2659 | -dist-xz: distdir |
2660 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
2661 | - $(am__remove_distdir) |
2662 | - |
2663 | -dist-tarZ: distdir |
2664 | - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
2665 | - $(am__remove_distdir) |
2666 | - |
2667 | -dist-shar: distdir |
2668 | - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
2669 | - $(am__remove_distdir) |
2670 | - |
2671 | -dist-zip: distdir |
2672 | - -rm -f $(distdir).zip |
2673 | - zip -rq $(distdir).zip $(distdir) |
2674 | - $(am__remove_distdir) |
2675 | - |
2676 | -dist dist-all: distdir |
2677 | - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
2678 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
2679 | - $(am__remove_distdir) |
2680 | - |
2681 | -# This target untars the dist file and tries a VPATH configuration. Then |
2682 | -# it guarantees that the distribution is self-contained by making another |
2683 | -# tarfile. |
2684 | -distcheck: dist |
2685 | - case '$(DIST_ARCHIVES)' in \ |
2686 | - *.tar.gz*) \ |
2687 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ |
2688 | - *.tar.bz2*) \ |
2689 | - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ |
2690 | - *.tar.lzma*) \ |
2691 | - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ |
2692 | - *.tar.xz*) \ |
2693 | - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
2694 | - *.tar.Z*) \ |
2695 | - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
2696 | - *.shar.gz*) \ |
2697 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ |
2698 | - *.zip*) \ |
2699 | - unzip $(distdir).zip ;;\ |
2700 | - esac |
2701 | - chmod -R a-w $(distdir); chmod a+w $(distdir) |
2702 | - mkdir $(distdir)/_build |
2703 | - mkdir $(distdir)/_inst |
2704 | - chmod a-w $(distdir) |
2705 | - test -d $(distdir)/_build || exit 0; \ |
2706 | - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
2707 | - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
2708 | - && am__cwd=`pwd` \ |
2709 | - && $(am__cd) $(distdir)/_build \ |
2710 | - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
2711 | - $(DISTCHECK_CONFIGURE_FLAGS) \ |
2712 | - && $(MAKE) $(AM_MAKEFLAGS) \ |
2713 | - && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
2714 | - && $(MAKE) $(AM_MAKEFLAGS) check \ |
2715 | - && $(MAKE) $(AM_MAKEFLAGS) install \ |
2716 | - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ |
2717 | - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ |
2718 | - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ |
2719 | - distuninstallcheck \ |
2720 | - && chmod -R a-w "$$dc_install_base" \ |
2721 | - && ({ \ |
2722 | - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ |
2723 | - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ |
2724 | - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ |
2725 | - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ |
2726 | - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ |
2727 | - } || { rm -rf "$$dc_destdir"; exit 1; }) \ |
2728 | - && rm -rf "$$dc_destdir" \ |
2729 | - && $(MAKE) $(AM_MAKEFLAGS) dist \ |
2730 | - && rm -rf $(DIST_ARCHIVES) \ |
2731 | - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
2732 | - && cd "$$am__cwd" \ |
2733 | - || exit 1 |
2734 | - $(am__remove_distdir) |
2735 | - @(echo "$(distdir) archives ready for distribution: "; \ |
2736 | - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
2737 | - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
2738 | -distuninstallcheck: |
2739 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
2740 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
2741 | - || { echo "ERROR: files left after uninstall:" ; \ |
2742 | - if test -n "$(DESTDIR)"; then \ |
2743 | - echo " (check DESTDIR support)"; \ |
2744 | - fi ; \ |
2745 | - $(distuninstallcheck_listfiles) ; \ |
2746 | - exit 1; } >&2 |
2747 | -distcleancheck: distclean |
2748 | - @if test '$(srcdir)' = . ; then \ |
2749 | - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ |
2750 | - exit 1 ; \ |
2751 | - fi |
2752 | - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ |
2753 | - || { echo "ERROR: files left in build directory after distclean:" ; \ |
2754 | - $(distcleancheck_listfiles) ; \ |
2755 | - exit 1; } >&2 |
2756 | -check-am: all-am |
2757 | -check: check-recursive |
2758 | -all-am: Makefile $(LTLIBRARIES) |
2759 | -installdirs: installdirs-recursive |
2760 | -installdirs-am: |
2761 | - for dir in "$(DESTDIR)$(libdir)"; do \ |
2762 | - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
2763 | - done |
2764 | -install: install-recursive |
2765 | -install-exec: install-exec-recursive |
2766 | -install-data: install-data-recursive |
2767 | -uninstall: uninstall-recursive |
2768 | - |
2769 | -install-am: all-am |
2770 | - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |
2771 | - |
2772 | -installcheck: installcheck-recursive |
2773 | -install-strip: |
2774 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
2775 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
2776 | - `test -z '$(STRIP)' || \ |
2777 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
2778 | -mostlyclean-generic: |
2779 | - |
2780 | -clean-generic: |
2781 | - |
2782 | -distclean-generic: |
2783 | - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
2784 | - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
2785 | - |
2786 | -maintainer-clean-generic: |
2787 | - @echo "This command is intended for maintainers to use" |
2788 | - @echo "it deletes files that may require special tools to rebuild." |
2789 | -clean: clean-recursive |
2790 | - |
2791 | -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ |
2792 | - mostlyclean-am |
2793 | - |
2794 | -distclean: distclean-recursive |
2795 | - -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
2796 | - -rm -f Makefile |
2797 | -distclean-am: clean-am distclean-compile distclean-generic \ |
2798 | - distclean-libtool distclean-tags |
2799 | - |
2800 | -dvi: dvi-recursive |
2801 | - |
2802 | -dvi-am: |
2803 | - |
2804 | -html: html-recursive |
2805 | - |
2806 | -html-am: |
2807 | - |
2808 | -info: info-recursive |
2809 | - |
2810 | -info-am: |
2811 | - |
2812 | -install-data-am: |
2813 | - |
2814 | -install-dvi: install-dvi-recursive |
2815 | - |
2816 | -install-dvi-am: |
2817 | - |
2818 | -install-exec-am: install-libLTLIBRARIES |
2819 | - |
2820 | -install-html: install-html-recursive |
2821 | - |
2822 | -install-html-am: |
2823 | - |
2824 | -install-info: install-info-recursive |
2825 | - |
2826 | -install-info-am: |
2827 | - |
2828 | -install-man: |
2829 | - |
2830 | -install-pdf: install-pdf-recursive |
2831 | - |
2832 | -install-pdf-am: |
2833 | - |
2834 | -install-ps: install-ps-recursive |
2835 | - |
2836 | -install-ps-am: |
2837 | - |
2838 | -installcheck-am: |
2839 | - |
2840 | -maintainer-clean: maintainer-clean-recursive |
2841 | - -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
2842 | - -rm -rf $(top_srcdir)/autom4te.cache |
2843 | - -rm -f Makefile |
2844 | -maintainer-clean-am: distclean-am maintainer-clean-generic |
2845 | - |
2846 | -mostlyclean: mostlyclean-recursive |
2847 | - |
2848 | -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ |
2849 | - mostlyclean-libtool |
2850 | - |
2851 | -pdf: pdf-recursive |
2852 | - |
2853 | -pdf-am: |
2854 | - |
2855 | -ps: ps-recursive |
2856 | - |
2857 | -ps-am: |
2858 | - |
2859 | -uninstall-am: uninstall-libLTLIBRARIES |
2860 | - |
2861 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ |
2862 | - install-am install-strip tags-recursive |
2863 | - |
2864 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
2865 | - all all-am am--refresh check check-am clean clean-generic \ |
2866 | - clean-libLTLIBRARIES clean-libtool ctags ctags-recursive dist \ |
2867 | - dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ |
2868 | - dist-xz dist-zip distcheck distclean distclean-compile \ |
2869 | - distclean-generic distclean-libtool distclean-tags \ |
2870 | - distcleancheck distdir distuninstallcheck dvi dvi-am html \ |
2871 | - html-am info info-am install install-am install-data \ |
2872 | - install-data-am install-dvi install-dvi-am install-exec \ |
2873 | - install-exec-am install-html install-html-am install-info \ |
2874 | - install-info-am install-libLTLIBRARIES install-man install-pdf \ |
2875 | - install-pdf-am install-ps install-ps-am install-strip \ |
2876 | - installcheck installcheck-am installdirs installdirs-am \ |
2877 | - maintainer-clean maintainer-clean-generic mostlyclean \ |
2878 | - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ |
2879 | - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ |
2880 | - uninstall-libLTLIBRARIES |
2881 | - |
2882 | - |
2883 | -# Tell versions [3.59,3.63) of GNU make to not export all variables. |
2884 | -# Otherwise a system limit (for SysV at least) may be exceeded. |
2885 | -.NOEXPORT: |
2886 | |
2887 | === removed file 'spatialindex-1.5/NEWS' |
2888 | === removed file 'spatialindex-1.5/README' |
2889 | --- spatialindex-1.5/README 2010-03-17 17:45:31 +0000 |
2890 | +++ spatialindex-1.5/README 1970-01-01 00:00:00 +0000 |
2891 | @@ -1,389 +0,0 @@ |
2892 | -***************************************************************************** |
2893 | - SpatialIndex Reference |
2894 | -***************************************************************************** |
2895 | - |
2896 | -:Author: Marios Hadjieleftheriou |
2897 | -:Contact: mhadji@gmail.com |
2898 | -:Revision: $Revision: 65 $ |
2899 | -:Date: $Date: 2008-01-21 14:19:44 +0000 (Mon, 21 Jan 2008) $ |
2900 | - |
2901 | -.. The next heading encountered becomes our H2 |
2902 | -.. |
2903 | - |
2904 | -.. sectnum:: |
2905 | - |
2906 | -.. contents:: |
2907 | - :depth: 2 |
2908 | - :backlinks: top |
2909 | - |
2910 | ------------------------------------------------------------------------------- |
2911 | -Introduction |
2912 | ------------------------------------------------------------------------------- |
2913 | - |
2914 | -You have downloaded the SpatialIndex Library. This is free software under LGPL. |
2915 | -The library is in beta testing stage. Use at your own risk. |
2916 | - |
2917 | -The purpose of this library is to provide: |
2918 | - 1. An extensible framework that will support robust spatial indexing |
2919 | - methods. |
2920 | - 2. Support for sophisticated spatial queries. Range, point location, |
2921 | - nearest neighbor and k-nearest neighbor as well as parametric |
2922 | - queries (defined by spatial constraints) should be easy to deploy and run. |
2923 | - 3. Easy to use interfaces for inserting, deleting and updating information. |
2924 | - 4. Wide variety of customization capabilities. Basic index and storage |
2925 | - characteristics like the page size, node capacity, minimum fan-out, |
2926 | - splitting algorithm, etc. should be easy to customize. |
2927 | - 5. Index persistence. Internal memory and external memory structures |
2928 | - should be supported. Clustered and non-clustered indices should |
2929 | - be easy to be persisted. |
2930 | - |
2931 | ------------------------------------------------------------------------------- |
2932 | -Installation |
2933 | ------------------------------------------------------------------------------- |
2934 | - |
2935 | -By default include files and library files will be installed in /usr/local. If |
2936 | -you would like to use a different installation directory (e.g., in case |
2937 | -that you do not have root access) run the configure script with |
2938 | -the --prefix option: |
2939 | - |
2940 | -:: |
2941 | - |
2942 | - ./configure --prefix=/home/marioh/usr |
2943 | - |
2944 | -Make the library:: |
2945 | - |
2946 | - make |
2947 | - |
2948 | -Install the library:: |
2949 | - |
2950 | - make install |
2951 | - |
2952 | ------------------------------------------------------------------------------- |
2953 | -Using the Library |
2954 | ------------------------------------------------------------------------------- |
2955 | - |
2956 | -You are ready to use the library. All you have to |
2957 | -do is to include the file SpatialIndex.h in your source |
2958 | -files and then compile with the following options: |
2959 | - |
2960 | -:: |
2961 | - |
2962 | - g++ MyFile.cc -o MyFile -L/home/marioh/usr/lib -I/home/marioh/usr/include -lpthread -lspatialindex |
2963 | - |
2964 | -If the library is installed in the default /usr/local path, then the |
2965 | --I and -L options are not necessary. |
2966 | - |
2967 | -If you are compiling on Mac OS X you will might need to add the -bind_at_load |
2968 | -option when linking against the dynamic link libraries. OS X Tiger should |
2969 | -work out of the box, however, with XCode 3.0. |
2970 | - |
2971 | ------------------------------------------------------------------------------- |
2972 | -Library Overview |
2973 | ------------------------------------------------------------------------------- |
2974 | - |
2975 | -The library currently consists of six packages: |
2976 | - 1. The core spatialindex utilities. |
2977 | - 2. The storagemanager files. |
2978 | - 3. The spatialindex interfaces. |
2979 | - 4. The rtree index. |
2980 | - 5. The mvrtree index. |
2981 | - 6. The tprtree index. |
2982 | - |
2983 | -I will briefly present the basic features supported by each package. |
2984 | -For more details you will have to refer to the code, for now. |
2985 | - |
2986 | -Spatial Index Utilities |
2987 | ------------------------------------------------------------------------------- |
2988 | - |
2989 | -To provide common constructors and uniform initialization for all objects |
2990 | -provided by the library a PropertySet class is provided. A PropertySet |
2991 | -associates strings with Variants. Each property corresponds to one string. |
2992 | - |
2993 | -A basic implementation of a Variant is also provided that supports a |
2994 | -number of data types. The supported data types can be found in SpatialIndex.h |
2995 | - |
2996 | -PropertySet supports three functions: |
2997 | - |
2998 | - 1. getProperty returns the Variant associated with the given string. |
2999 | - 2. setProperty associates the given Variant with the given string. |
3000 | - 3. removeProperty removes the specified property from the PropertySet. |
3001 | - |
3002 | -A number of exceptions are also defined here. All exceptions extend |
3003 | -Exception and thus provide the what() method that returns a string |
3004 | -representation of the exception with useful comments. It is advisable to |
3005 | -use enclosing try/catch blocks when using any library objects. Many |
3006 | -constructors throw exceptions when invalid initialization properties are specified. |
3007 | - |
3008 | -A general IShape interface is defined. All shape classes should extend |
3009 | -IShape. Basic Region and Point classes are already provided. Please |
3010 | -check Region.h and Point.h for further details. |
3011 | - |
3012 | -Storage Manager |
3013 | ------------------------------------------------------------------------------- |
3014 | - |
3015 | -The library provides a common interface for storage management of all |
3016 | -indices. It consists of the IStorageManager interface, which provides functions |
3017 | -for storing and retrieving entities. An entity is viewed as a simple byte |
3018 | -array; hence it can be an index entry, a data entry or anything else that the |
3019 | -user wants to store. The storage manager interface is generic and does not apply |
3020 | -only to spatial indices. |
3021 | - |
3022 | -Classes that implement the IStorageManager interface decide on how to |
3023 | -store entities. simple main memory implementation is provided, for example, |
3024 | -that stores the entities using a vector, associating every entity with a |
3025 | -unique ID (the entry's index in the vector). A disk based storage manager |
3026 | -could choose to store the entities in a simple random access file, or a |
3027 | -database storage manager could store them in a relational table, etc. as long |
3028 | -as unique IDs are associated with every entity. Also, storage managers should |
3029 | -implement their own paging, compaction and deletion policies transparently |
3030 | -from the callers (be it an index or a user). |
3031 | - |
3032 | -The storeByteArray method gets a byte array and its length and an entity ID. |
3033 | -If the caller specifies NewPage as the input ID, the storage manager allocates |
3034 | -a new ID, stores the entity and returns the ID associated with the entity. |
3035 | -If, instead, the user specifies an already existing ID the storage manager |
3036 | -overwrites the old data. An exception is thrown if the caller requests |
3037 | -an invalid ID to be overwritten. |
3038 | - |
3039 | -The loadByteArray method gets an entity ID and returns the associated byte |
3040 | -array along with its length. If an invalid ID is requested, an exception is thrown. |
3041 | - |
3042 | -The deleteByteArray method removes the requested entity from storage. |
3043 | - |
3044 | -The storage managers should have no information about the types of entities |
3045 | -that are stored. There are three main reasons for this decision: |
3046 | - |
3047 | - 1. Any number of spatial indices can be stored in a single storage manager |
3048 | - (i.e. the same relational table, or binary file, or hash table, etc., can |
3049 | - be used to store many indices) using an arbitrary number of pages and |
3050 | - a unique index ID per index (this will be discussed shortly). |
3051 | - 2. Both clustered and non-clustered indices can be supported. A clustered |
3052 | - index stores the data associated with the entries that it contains along |
3053 | - with the spatial information that it indexes. A non-clustered index stores |
3054 | - only the spatial information of its entries. Any associated data are |
3055 | - stored separately and are associated with the index entries by a unique ID. |
3056 | - To support both types of indices, the storage manager interface should be |
3057 | - quite generic, allowing the index to decide how to store its data. |
3058 | - Otherwise clustered and non-clustered indices would have to be |
3059 | - implemented separately. |
3060 | - 3. Decision flexibility. For example, the users can choose a clustered index |
3061 | - that will take care of storing everything. They can choose a main memory |
3062 | - non-clustered index and store the actual data in MySQL. They can choose |
3063 | - a disk based non-clustered index and store the data manually in a |
3064 | - separate binary file or even in the same storage manager but doing a low |
3065 | - level customized data processing. |
3066 | - |
3067 | -Two storage managers are provided in the current implementation: |
3068 | - |
3069 | - 1) MemoryStorageManager |
3070 | - 2) DiskStorageManager |
3071 | - |
3072 | -MemoryStorageManager |
3073 | -~~~~~~~~~~~~~~~~~~~~~~~ |
3074 | - |
3075 | -As it is implied be the name, this is a main memory implementation. Everything |
3076 | -is stored in main memory using a simple vector. No properties are needed to |
3077 | -initialize a MemoryStorageManager object. When a MemoryStorageManager instance |
3078 | -goes out of scope, all data that it contains are lost. |
3079 | - |
3080 | -DiskStorageManager |
3081 | -~~~~~~~~~~~~~~~~~~~~~~~ |
3082 | - |
3083 | -The disk storage manager uses two random access files for storing information. |
3084 | -One with extension .idx and the other with extension .dat. |
3085 | - |
3086 | -A list of all the supported properties that can be provided during |
3087 | -initialization, follows: |
3088 | - |
3089 | -========= ======== =========================================================== |
3090 | -Property Type Description |
3091 | -========= ======== =========================================================== |
3092 | -FileName VT_PCHAR The base name of the file to open (no extension) |
3093 | -Overwrite VT_BOOL If Overwrite is true and a storage manager with the |
3094 | - specified filename already exists, it will be |
3095 | - truncated and overwritten. All data will be lost. |
3096 | -PageSize VT_ULONG The page size to use. If the specified filename |
3097 | - already exists and Overwrite is false, PageSize is ignored. |
3098 | -========= ======== =========================================================== |
3099 | - |
3100 | -For entities that are larger than the page size, multiple pages are used. |
3101 | -Although, the empty space on the last page is lost. Also, there is no effort |
3102 | -whatsoever to use as many sequential pages as possible. A future version |
3103 | -might support sequential I/O. Thus, real clustered indices cannot be supported yet. |
3104 | - |
3105 | -The purpose of the .idx file is to store vital information like the page size, |
3106 | -the next available page, a list of empty pages and the sequence of pages |
3107 | -associated with every entity ID. |
3108 | - |
3109 | -This class also provides a flush method that practically overwrites the |
3110 | -.idx file and syncs both file pointers. |
3111 | - |
3112 | -The .idx file is loaded into main memory during initialization and is |
3113 | -written to disk only after flushing the storage manager or during object |
3114 | -destruction. In case of an unexpected failure changes to the storage manager |
3115 | -will be lost due to a stale .idx file. Avoiding such disasters is future work. |
3116 | - |
3117 | -SpatialIndex Interfaces |
3118 | ------------------------------------------------------------------------------- |
3119 | - |
3120 | -A spatial index is any index structure that accesses spatial information |
3121 | -efficiently. It could range from a simple grid file to a complicated tree |
3122 | -structure. A spatial index indexes entries of type IEntry, which can be index |
3123 | -nodes, leaf nodes, data etc. depending on the structure characteristics. |
3124 | -The appropriate interfaces with useful accessor methods should be provided |
3125 | -for all types of entries. |
3126 | - |
3127 | -A spatial index should implement the ISpatialIndex interface. |
3128 | - |
3129 | -The containmentQuery method requires a query shape and a reference to a |
3130 | -valid IVisitor instance (described shortly). The intersectionQuery method |
3131 | -is the same. Both accept an IShape as the query. If the query shape is a simple |
3132 | -Region, than a classic range query is performed. The user though has the |
3133 | -ability to create her own shapes, thus defining her own intersection and |
3134 | -containment methods making possible to run any kind of range query without |
3135 | -having to modify the index. An example of a trapezoidal query is given in the |
3136 | -regressiontest directory. Have in mind that it is the users responsibility |
3137 | -to implement the correct intersection and containment methods between their |
3138 | -shape and the type of shapes that are stored by the specific index that they |
3139 | -are planning to use. For example, if an rtree index will be used, a trapezoid |
3140 | -should define intersection and containment between itself and Regions, since |
3141 | -all rtree nodes are of type Region. Hence, the user should have some knowledge |
3142 | -about the index internal representation, to run more sophisticated queries. |
3143 | - |
3144 | -A point location query is performed using the pointLocationQuery method. It |
3145 | -takes the query point and a visitor as arguments. |
3146 | - |
3147 | -Nearest neighbor queries can be performed with the nearestNeighborQuery method. |
3148 | -Its first argument is the number k of nearest neighbors requested. This |
3149 | -method also requires the query shape and a visitor object. The default |
3150 | -implementation uses the getMinimumDistance function of IShape for calculating |
3151 | -the distance of the query from the rectangular node and data entries stored |
3152 | -in the tree. A more sophisticated distance measure can be used by implementing |
3153 | -the INearestNeighborComparator interface and passing it as the last argument |
3154 | -of nearestNeighborQuery. For example, a comparator is necessary when the query |
3155 | -needs to be checked against the actual data stored in the tree, instead of |
3156 | -the rectangular data entry approximations stored in the leaves. |
3157 | - |
3158 | -For customizing queries the IVisitor interface (based on the Visitor |
3159 | -pattern [gamma94]) provides callback functions for visiting index and |
3160 | -leaf nodes, as well as data entries. Node and data information can be obtained |
3161 | -using the INode and IData interfaces (both extend IEntry). Examples of using |
3162 | -this interface include visualizing a query, counting the number of leaf |
3163 | -or index nodes visited for a specific query, throwing alerts when a |
3164 | -specific spatial region is accessed, etc. |
3165 | - |
3166 | -The queryStrategy method provides the ability to design more sophisticated |
3167 | -queries. It uses the IQueryStrategy interface as a callback that is called |
3168 | -continuously until no more entries are requested. It can be used to |
3169 | -implement custom query algorithms (based on the strategy pattern [gamma94]). |
3170 | - |
3171 | -A data entry can be inserted using the insertData method. The insertion |
3172 | -function will convert any shape into an internal representation depending on |
3173 | -the index. Every inserted object should be assigned an ID (called object |
3174 | -identifier) that will allow updating, deleting and reporting the object. |
3175 | -It is the responsibility of the caller to provide the index with IDs |
3176 | -(unique or not). Also, a byte array can be associated with an entry. The |
3177 | -byte arrays are stored along with the spatial information inside the leaf |
3178 | -nodes. Clustered indices can be supported in that way. The byte array can |
3179 | -also by null (in which case the length field should be zero), and no extra |
3180 | -space should be used per node. |
3181 | - |
3182 | -A data entry can be deleted using the deleteData method. The object shape |
3183 | -and ID should be provided. Spatial indices cluster objects according to |
3184 | -spatial characteristics and not IDs. Hence, the shape is essential for |
3185 | -locating and deleting an entry. |
3186 | - |
3187 | -Useful statistics are provided through the IStatistics interface and |
3188 | -the getStatistics method. |
3189 | - |
3190 | -Method getIndexProperties returns a PropertySet with all useful index |
3191 | -properties like dimensionality etc. |
3192 | - |
3193 | -A NodeCommand interface is provided for customizing Node operations. Using |
3194 | -the addWriteNodeCommand, addReadNodeCommand and addDeleteNodeCommand methods, |
3195 | -custom command objects are added in listener lists and get executed after |
3196 | -the corresponding operations. |
3197 | - |
3198 | -The isIndexValid method performs internal checks for testing the |
3199 | -integrity of a structure. It is used for debugging purposes. |
3200 | - |
3201 | -When a new index is created a unique index ID should be assigned to it, that |
3202 | -will be used when reloading the index from persistent storage. This index ID |
3203 | -should be returned as an IndexIdentifier property in the instance of the |
3204 | -PropsertySet that was used for constructing the index instance. Using |
3205 | -index IDs, multiple indices can be stored in the same storage manager. |
3206 | -It is the users responsibility to manager the index IDs. Associating the |
3207 | -wrong index ID with the wrong storage manager or index type has undefined |
3208 | -results. |
3209 | - |
3210 | -The RTree Package |
3211 | ------------------------------------------------------------------------------- |
3212 | - |
3213 | -The RTree index [guttman84] is a balanced tree structure that consists of |
3214 | -index nodes, leaf nodes and data. Every node (leaf and index) has a fixed |
3215 | -capacity of entries, (the node capacity) chosen at index creation An RTree |
3216 | -abstracts the data with their Minimum Bounding Region (MBR) and clusters |
3217 | -these MBRs according to various heuristics in the leaf nodes. Queries are |
3218 | -evaluated from the root of the tree down the leaves. Since the index is |
3219 | -balanced nodes can be under full. They cannot be empty though. A fill |
3220 | -factor specifies the minimum number of entries allowed in any node. The |
3221 | -fill factor is usually close to 70%. |
3222 | - |
3223 | -RTree creation involves: |
3224 | - |
3225 | - 1. Deciding if the index will be internal or external memory and selecting |
3226 | - the appropriate storage manager. |
3227 | - 2. Choosing the index and leaf capacity (also known as fan-out). |
3228 | - 3. Choosing the fill factor (from 1% to 99% of the node capacity). |
3229 | - 4. Choosing the dimensionality of the data. |
3230 | - 5. Choosing the insert/update policy (the RTree variant). |
3231 | - |
3232 | -If an already stored RTree is being reloaded for reuse, only the index ID |
3233 | -needs to be supplied during construction. In that case, some options cannot |
3234 | -be modified. These include: the index and leaf capacity, the fill factor and |
3235 | -the dimensionality. Note here, that the RTree variant can actually be |
3236 | -modified. The variant affects only when and how splitting occurs, and |
3237 | -thus can be changed at any time. |
3238 | - |
3239 | -An initialization PropertySet is used for setting the above options, |
3240 | -complying with the following property strings: |
3241 | - |
3242 | -========================== =========== ============================================================ |
3243 | -Property Type Description |
3244 | -========================== =========== ============================================================ |
3245 | -IndexIndentifier VT_LONG If specified an existing index will be |
3246 | - opened from the supplied storage manager with |
3247 | - the given index id. Behavior is unspecified |
3248 | - if the index id or the storage manager are incorrect. |
3249 | -Dimension VT_ULONG Dimensionality of the data that will be inserted. |
3250 | -IndexCapacity VT_ULONG The index node capacity. Default is 100. |
3251 | -LeafCapactiy VT_ULONG The leaf node capacity. Default is 100. |
3252 | -FillFactor VT_DOUBLE The fill factor. Default is 70% |
3253 | -TreeVariant VT_LONG Can be one of Linear, Quadratic or Rstar. Default is Rstar |
3254 | -NearMinimumOverlapFactor VT_ULONG Default is 32. |
3255 | -SplitDistributionFactor VT_DOUBLE Default is 0.4 |
3256 | -ReinsertFactor VT_DOUBLE Default is 0.3 |
3257 | -EnsureTightMBRs VT_BOOL Default is true |
3258 | -IndexPoolCapacity VT_LONG Default is 100 |
3259 | -LeafPoolCapacity VT_LONG Default is 100 |
3260 | -RegionPoolCapacity VT_LONG Default is 1000 |
3261 | -PointPoolCapacity VT_LONG Default is 500 |
3262 | -========================== =========== ============================================================ |
3263 | - |
3264 | - |
3265 | ------------------------------------------------------------------------------- |
3266 | -Contact Information |
3267 | ------------------------------------------------------------------------------- |
3268 | - |
3269 | -You can contact me at mhadji@gmail.com for further assistance. Please read the |
3270 | -above information carefully and also do not be afraid to browse through the |
3271 | -code and especially the test files inside regressiontest directory. |
3272 | - |
3273 | ------------------------------------------------------------------------------- |
3274 | -References |
3275 | ------------------------------------------------------------------------------- |
3276 | -[guttman84] "R-Trees: A Dynamic Index Structure for Spatial Searching" |
3277 | - Antonin Guttman, Proc. 1984 ACM-SIGMOD Conference on Management of Data (1985), 47-57. |
3278 | -[gamma94] "Design Patterns: Elements of Reusable Object-Oriented Software" |
3279 | - Erich Gamma, Richard Helm, Ralph Johnson and John Vlissides, Addison Wesley. October 1994. |
3280 | - |
3281 | |
3282 | === removed file 'spatialindex-1.5/aclocal.m4' |
3283 | --- spatialindex-1.5/aclocal.m4 2010-03-17 17:45:31 +0000 |
3284 | +++ spatialindex-1.5/aclocal.m4 1970-01-01 00:00:00 +0000 |
3285 | @@ -1,8916 +0,0 @@ |
3286 | -# generated automatically by aclocal 1.11 -*- Autoconf -*- |
3287 | - |
3288 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
3289 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
3290 | -# This file is free software; the Free Software Foundation |
3291 | -# gives unlimited permission to copy and/or distribute it, |
3292 | -# with or without modifications, as long as this notice is preserved. |
3293 | - |
3294 | -# This program is distributed in the hope that it will be useful, |
3295 | -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
3296 | -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3297 | -# PARTICULAR PURPOSE. |
3298 | - |
3299 | -m4_ifndef([AC_AUTOCONF_VERSION], |
3300 | - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
3301 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, |
3302 | -[m4_warning([this file was generated for autoconf 2.64. |
3303 | -You have another version of autoconf. It may work, but is not guaranteed to. |
3304 | -If you have problems, you may need to regenerate the build system entirely. |
3305 | -To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
3306 | - |
3307 | -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
3308 | -# |
3309 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3310 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
3311 | -# Written by Gordon Matzigkeit, 1996 |
3312 | -# |
3313 | -# This file is free software; the Free Software Foundation gives |
3314 | -# unlimited permission to copy and/or distribute it, with or without |
3315 | -# modifications, as long as this notice is preserved. |
3316 | - |
3317 | -m4_define([_LT_COPYING], [dnl |
3318 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3319 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
3320 | -# Written by Gordon Matzigkeit, 1996 |
3321 | -# |
3322 | -# This file is part of GNU Libtool. |
3323 | -# |
3324 | -# GNU Libtool is free software; you can redistribute it and/or |
3325 | -# modify it under the terms of the GNU General Public License as |
3326 | -# published by the Free Software Foundation; either version 2 of |
3327 | -# the License, or (at your option) any later version. |
3328 | -# |
3329 | -# As a special exception to the GNU General Public License, |
3330 | -# if you distribute this file as part of a program or library that |
3331 | -# is built using GNU Libtool, you may include this file under the |
3332 | -# same distribution terms that you use for the rest of that program. |
3333 | -# |
3334 | -# GNU Libtool is distributed in the hope that it will be useful, |
3335 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
3336 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3337 | -# GNU General Public License for more details. |
3338 | -# |
3339 | -# You should have received a copy of the GNU General Public License |
3340 | -# along with GNU Libtool; see the file COPYING. If not, a copy |
3341 | -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or |
3342 | -# obtained by writing to the Free Software Foundation, Inc., |
3343 | -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
3344 | -]) |
3345 | - |
3346 | -# serial 56 LT_INIT |
3347 | - |
3348 | - |
3349 | -# LT_PREREQ(VERSION) |
3350 | -# ------------------ |
3351 | -# Complain and exit if this libtool version is less that VERSION. |
3352 | -m4_defun([LT_PREREQ], |
3353 | -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, |
3354 | - [m4_default([$3], |
3355 | - [m4_fatal([Libtool version $1 or higher is required], |
3356 | - 63)])], |
3357 | - [$2])]) |
3358 | - |
3359 | - |
3360 | -# _LT_CHECK_BUILDDIR |
3361 | -# ------------------ |
3362 | -# Complain if the absolute build directory name contains unusual characters |
3363 | -m4_defun([_LT_CHECK_BUILDDIR], |
3364 | -[case `pwd` in |
3365 | - *\ * | *\ *) |
3366 | - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; |
3367 | -esac |
3368 | -]) |
3369 | - |
3370 | - |
3371 | -# LT_INIT([OPTIONS]) |
3372 | -# ------------------ |
3373 | -AC_DEFUN([LT_INIT], |
3374 | -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
3375 | -AC_BEFORE([$0], [LT_LANG])dnl |
3376 | -AC_BEFORE([$0], [LT_OUTPUT])dnl |
3377 | -AC_BEFORE([$0], [LTDL_INIT])dnl |
3378 | -m4_require([_LT_CHECK_BUILDDIR])dnl |
3379 | - |
3380 | -dnl Autoconf doesn't catch unexpanded LT_ macros by default: |
3381 | -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl |
3382 | -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl |
3383 | -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 |
3384 | -dnl unless we require an AC_DEFUNed macro: |
3385 | -AC_REQUIRE([LTOPTIONS_VERSION])dnl |
3386 | -AC_REQUIRE([LTSUGAR_VERSION])dnl |
3387 | -AC_REQUIRE([LTVERSION_VERSION])dnl |
3388 | -AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
3389 | -m4_require([_LT_PROG_LTMAIN])dnl |
3390 | - |
3391 | -dnl Parse OPTIONS |
3392 | -_LT_SET_OPTIONS([$0], [$1]) |
3393 | - |
3394 | -# This can be used to rebuild libtool when needed |
3395 | -LIBTOOL_DEPS="$ltmain" |
3396 | - |
3397 | -# Always use our own libtool. |
3398 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
3399 | -AC_SUBST(LIBTOOL)dnl |
3400 | - |
3401 | -_LT_SETUP |
3402 | - |
3403 | -# Only expand once: |
3404 | -m4_define([LT_INIT]) |
3405 | -])# LT_INIT |
3406 | - |
3407 | -# Old names: |
3408 | -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) |
3409 | -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) |
3410 | -dnl aclocal-1.4 backwards compatibility: |
3411 | -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) |
3412 | -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) |
3413 | - |
3414 | - |
3415 | -# _LT_CC_BASENAME(CC) |
3416 | -# ------------------- |
3417 | -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. |
3418 | -m4_defun([_LT_CC_BASENAME], |
3419 | -[for cc_temp in $1""; do |
3420 | - case $cc_temp in |
3421 | - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; |
3422 | - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; |
3423 | - \-*) ;; |
3424 | - *) break;; |
3425 | - esac |
3426 | -done |
3427 | -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
3428 | -]) |
3429 | - |
3430 | - |
3431 | -# _LT_FILEUTILS_DEFAULTS |
3432 | -# ---------------------- |
3433 | -# It is okay to use these file commands and assume they have been set |
3434 | -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. |
3435 | -m4_defun([_LT_FILEUTILS_DEFAULTS], |
3436 | -[: ${CP="cp -f"} |
3437 | -: ${MV="mv -f"} |
3438 | -: ${RM="rm -f"} |
3439 | -])# _LT_FILEUTILS_DEFAULTS |
3440 | - |
3441 | - |
3442 | -# _LT_SETUP |
3443 | -# --------- |
3444 | -m4_defun([_LT_SETUP], |
3445 | -[AC_REQUIRE([AC_CANONICAL_HOST])dnl |
3446 | -AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
3447 | -_LT_DECL([], [host_alias], [0], [The host system])dnl |
3448 | -_LT_DECL([], [host], [0])dnl |
3449 | -_LT_DECL([], [host_os], [0])dnl |
3450 | -dnl |
3451 | -_LT_DECL([], [build_alias], [0], [The build system])dnl |
3452 | -_LT_DECL([], [build], [0])dnl |
3453 | -_LT_DECL([], [build_os], [0])dnl |
3454 | -dnl |
3455 | -AC_REQUIRE([AC_PROG_CC])dnl |
3456 | -AC_REQUIRE([LT_PATH_LD])dnl |
3457 | -AC_REQUIRE([LT_PATH_NM])dnl |
3458 | -dnl |
3459 | -AC_REQUIRE([AC_PROG_LN_S])dnl |
3460 | -test -z "$LN_S" && LN_S="ln -s" |
3461 | -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl |
3462 | -dnl |
3463 | -AC_REQUIRE([LT_CMD_MAX_LEN])dnl |
3464 | -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl |
3465 | -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl |
3466 | -dnl |
3467 | -m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3468 | -m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
3469 | -m4_require([_LT_CMD_RELOAD])dnl |
3470 | -m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
3471 | -m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
3472 | -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
3473 | - |
3474 | -_LT_CONFIG_LIBTOOL_INIT([ |
3475 | -# See if we are running on zsh, and set the options which allow our |
3476 | -# commands through without removal of \ escapes INIT. |
3477 | -if test -n "\${ZSH_VERSION+set}" ; then |
3478 | - setopt NO_GLOB_SUBST |
3479 | -fi |
3480 | -]) |
3481 | -if test -n "${ZSH_VERSION+set}" ; then |
3482 | - setopt NO_GLOB_SUBST |
3483 | -fi |
3484 | - |
3485 | -_LT_CHECK_OBJDIR |
3486 | - |
3487 | -m4_require([_LT_TAG_COMPILER])dnl |
3488 | -_LT_PROG_ECHO_BACKSLASH |
3489 | - |
3490 | -case $host_os in |
3491 | -aix3*) |
3492 | - # AIX sometimes has problems with the GCC collect2 program. For some |
3493 | - # reason, if we set the COLLECT_NAMES environment variable, the problems |
3494 | - # vanish in a puff of smoke. |
3495 | - if test "X${COLLECT_NAMES+set}" != Xset; then |
3496 | - COLLECT_NAMES= |
3497 | - export COLLECT_NAMES |
3498 | - fi |
3499 | - ;; |
3500 | -esac |
3501 | - |
3502 | -# Sed substitution that helps us do robust quoting. It backslashifies |
3503 | -# metacharacters that are still active within double-quoted strings. |
3504 | -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
3505 | - |
3506 | -# Same as above, but do not quote variable references. |
3507 | -double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
3508 | - |
3509 | -# Sed substitution to delay expansion of an escaped shell variable in a |
3510 | -# double_quote_subst'ed string. |
3511 | -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
3512 | - |
3513 | -# Sed substitution to delay expansion of an escaped single quote. |
3514 | -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
3515 | - |
3516 | -# Sed substitution to avoid accidental globbing in evaled expressions |
3517 | -no_glob_subst='s/\*/\\\*/g' |
3518 | - |
3519 | -# Global variables: |
3520 | -ofile=libtool |
3521 | -can_build_shared=yes |
3522 | - |
3523 | -# All known linkers require a `.a' archive for static linking (except MSVC, |
3524 | -# which needs '.lib'). |
3525 | -libext=a |
3526 | - |
3527 | -with_gnu_ld="$lt_cv_prog_gnu_ld" |
3528 | - |
3529 | -old_CC="$CC" |
3530 | -old_CFLAGS="$CFLAGS" |
3531 | - |
3532 | -# Set sane defaults for various variables |
3533 | -test -z "$CC" && CC=cc |
3534 | -test -z "$LTCC" && LTCC=$CC |
3535 | -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS |
3536 | -test -z "$LD" && LD=ld |
3537 | -test -z "$ac_objext" && ac_objext=o |
3538 | - |
3539 | -_LT_CC_BASENAME([$compiler]) |
3540 | - |
3541 | -# Only perform the check for file, if the check method requires it |
3542 | -test -z "$MAGIC_CMD" && MAGIC_CMD=file |
3543 | -case $deplibs_check_method in |
3544 | -file_magic*) |
3545 | - if test "$file_magic_cmd" = '$MAGIC_CMD'; then |
3546 | - _LT_PATH_MAGIC |
3547 | - fi |
3548 | - ;; |
3549 | -esac |
3550 | - |
3551 | -# Use C for the default configuration in the libtool script |
3552 | -LT_SUPPORTED_TAG([CC]) |
3553 | -_LT_LANG_C_CONFIG |
3554 | -_LT_LANG_DEFAULT_CONFIG |
3555 | -_LT_CONFIG_COMMANDS |
3556 | -])# _LT_SETUP |
3557 | - |
3558 | - |
3559 | -# _LT_PROG_LTMAIN |
3560 | -# --------------- |
3561 | -# Note that this code is called both from `configure', and `config.status' |
3562 | -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, |
3563 | -# `config.status' has no value for ac_aux_dir unless we are using Automake, |
3564 | -# so we pass a copy along to make sure it has a sensible value anyway. |
3565 | -m4_defun([_LT_PROG_LTMAIN], |
3566 | -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl |
3567 | -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) |
3568 | -ltmain="$ac_aux_dir/ltmain.sh" |
3569 | -])# _LT_PROG_LTMAIN |
3570 | - |
3571 | - |
3572 | - |
3573 | -# So that we can recreate a full libtool script including additional |
3574 | -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS |
3575 | -# in macros and then make a single call at the end using the `libtool' |
3576 | -# label. |
3577 | - |
3578 | - |
3579 | -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) |
3580 | -# ---------------------------------------- |
3581 | -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. |
3582 | -m4_define([_LT_CONFIG_LIBTOOL_INIT], |
3583 | -[m4_ifval([$1], |
3584 | - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], |
3585 | - [$1 |
3586 | -])])]) |
3587 | - |
3588 | -# Initialize. |
3589 | -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) |
3590 | - |
3591 | - |
3592 | -# _LT_CONFIG_LIBTOOL([COMMANDS]) |
3593 | -# ------------------------------ |
3594 | -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. |
3595 | -m4_define([_LT_CONFIG_LIBTOOL], |
3596 | -[m4_ifval([$1], |
3597 | - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], |
3598 | - [$1 |
3599 | -])])]) |
3600 | - |
3601 | -# Initialize. |
3602 | -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) |
3603 | - |
3604 | - |
3605 | -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) |
3606 | -# ----------------------------------------------------- |
3607 | -m4_defun([_LT_CONFIG_SAVE_COMMANDS], |
3608 | -[_LT_CONFIG_LIBTOOL([$1]) |
3609 | -_LT_CONFIG_LIBTOOL_INIT([$2]) |
3610 | -]) |
3611 | - |
3612 | - |
3613 | -# _LT_FORMAT_COMMENT([COMMENT]) |
3614 | -# ----------------------------- |
3615 | -# Add leading comment marks to the start of each line, and a trailing |
3616 | -# full-stop to the whole comment if one is not present already. |
3617 | -m4_define([_LT_FORMAT_COMMENT], |
3618 | -[m4_ifval([$1], [ |
3619 | -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], |
3620 | - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) |
3621 | -)]) |
3622 | - |
3623 | - |
3624 | - |
3625 | - |
3626 | - |
3627 | -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) |
3628 | -# ------------------------------------------------------------------- |
3629 | -# CONFIGNAME is the name given to the value in the libtool script. |
3630 | -# VARNAME is the (base) name used in the configure script. |
3631 | -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on |
3632 | -# VARNAME. Any other value will be used directly. |
3633 | -m4_define([_LT_DECL], |
3634 | -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], |
3635 | - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], |
3636 | - [m4_ifval([$1], [$1], [$2])]) |
3637 | - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) |
3638 | - m4_ifval([$4], |
3639 | - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) |
3640 | - lt_dict_add_subkey([lt_decl_dict], [$2], |
3641 | - [tagged?], [m4_ifval([$5], [yes], [no])])]) |
3642 | -]) |
3643 | - |
3644 | - |
3645 | -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) |
3646 | -# -------------------------------------------------------- |
3647 | -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) |
3648 | - |
3649 | - |
3650 | -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) |
3651 | -# ------------------------------------------------ |
3652 | -m4_define([lt_decl_tag_varnames], |
3653 | -[_lt_decl_filter([tagged?], [yes], $@)]) |
3654 | - |
3655 | - |
3656 | -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) |
3657 | -# --------------------------------------------------------- |
3658 | -m4_define([_lt_decl_filter], |
3659 | -[m4_case([$#], |
3660 | - [0], [m4_fatal([$0: too few arguments: $#])], |
3661 | - [1], [m4_fatal([$0: too few arguments: $#: $1])], |
3662 | - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], |
3663 | - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], |
3664 | - [lt_dict_filter([lt_decl_dict], $@)])[]dnl |
3665 | -]) |
3666 | - |
3667 | - |
3668 | -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) |
3669 | -# -------------------------------------------------- |
3670 | -m4_define([lt_decl_quote_varnames], |
3671 | -[_lt_decl_filter([value], [1], $@)]) |
3672 | - |
3673 | - |
3674 | -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) |
3675 | -# --------------------------------------------------- |
3676 | -m4_define([lt_decl_dquote_varnames], |
3677 | -[_lt_decl_filter([value], [2], $@)]) |
3678 | - |
3679 | - |
3680 | -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) |
3681 | -# --------------------------------------------------- |
3682 | -m4_define([lt_decl_varnames_tagged], |
3683 | -[m4_assert([$# <= 2])dnl |
3684 | -_$0(m4_quote(m4_default([$1], [[, ]])), |
3685 | - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), |
3686 | - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) |
3687 | -m4_define([_lt_decl_varnames_tagged], |
3688 | -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) |
3689 | - |
3690 | - |
3691 | -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) |
3692 | -# ------------------------------------------------ |
3693 | -m4_define([lt_decl_all_varnames], |
3694 | -[_$0(m4_quote(m4_default([$1], [[, ]])), |
3695 | - m4_if([$2], [], |
3696 | - m4_quote(lt_decl_varnames), |
3697 | - m4_quote(m4_shift($@))))[]dnl |
3698 | -]) |
3699 | -m4_define([_lt_decl_all_varnames], |
3700 | -[lt_join($@, lt_decl_varnames_tagged([$1], |
3701 | - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl |
3702 | -]) |
3703 | - |
3704 | - |
3705 | -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) |
3706 | -# ------------------------------------ |
3707 | -# Quote a variable value, and forward it to `config.status' so that its |
3708 | -# declaration there will have the same value as in `configure'. VARNAME |
3709 | -# must have a single quote delimited value for this to work. |
3710 | -m4_define([_LT_CONFIG_STATUS_DECLARE], |
3711 | -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) |
3712 | - |
3713 | - |
3714 | -# _LT_CONFIG_STATUS_DECLARATIONS |
3715 | -# ------------------------------ |
3716 | -# We delimit libtool config variables with single quotes, so when |
3717 | -# we write them to config.status, we have to be sure to quote all |
3718 | -# embedded single quotes properly. In configure, this macro expands |
3719 | -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
3720 | -# |
3721 | -# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' |
3722 | -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
3723 | -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
3724 | - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
3725 | - |
3726 | - |
3727 | -# _LT_LIBTOOL_TAGS |
3728 | -# ---------------- |
3729 | -# Output comment and list of tags supported by the script |
3730 | -m4_defun([_LT_LIBTOOL_TAGS], |
3731 | -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl |
3732 | -available_tags="_LT_TAGS"dnl |
3733 | -]) |
3734 | - |
3735 | - |
3736 | -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) |
3737 | -# ----------------------------------- |
3738 | -# Extract the dictionary values for VARNAME (optionally with TAG) and |
3739 | -# expand to a commented shell variable setting: |
3740 | -# |
3741 | -# # Some comment about what VAR is for. |
3742 | -# visible_name=$lt_internal_name |
3743 | -m4_define([_LT_LIBTOOL_DECLARE], |
3744 | -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], |
3745 | - [description])))[]dnl |
3746 | -m4_pushdef([_libtool_name], |
3747 | - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl |
3748 | -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), |
3749 | - [0], [_libtool_name=[$]$1], |
3750 | - [1], [_libtool_name=$lt_[]$1], |
3751 | - [2], [_libtool_name=$lt_[]$1], |
3752 | - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl |
3753 | -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl |
3754 | -]) |
3755 | - |
3756 | - |
3757 | -# _LT_LIBTOOL_CONFIG_VARS |
3758 | -# ----------------------- |
3759 | -# Produce commented declarations of non-tagged libtool config variables |
3760 | -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' |
3761 | -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG |
3762 | -# section) are produced by _LT_LIBTOOL_TAG_VARS. |
3763 | -m4_defun([_LT_LIBTOOL_CONFIG_VARS], |
3764 | -[m4_foreach([_lt_var], |
3765 | - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), |
3766 | - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) |
3767 | - |
3768 | - |
3769 | -# _LT_LIBTOOL_TAG_VARS(TAG) |
3770 | -# ------------------------- |
3771 | -m4_define([_LT_LIBTOOL_TAG_VARS], |
3772 | -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), |
3773 | - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) |
3774 | - |
3775 | - |
3776 | -# _LT_TAGVAR(VARNAME, [TAGNAME]) |
3777 | -# ------------------------------ |
3778 | -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) |
3779 | - |
3780 | - |
3781 | -# _LT_CONFIG_COMMANDS |
3782 | -# ------------------- |
3783 | -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of |
3784 | -# variables for single and double quote escaping we saved from calls |
3785 | -# to _LT_DECL, we can put quote escaped variables declarations |
3786 | -# into `config.status', and then the shell code to quote escape them in |
3787 | -# for loops in `config.status'. Finally, any additional code accumulated |
3788 | -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. |
3789 | -m4_defun([_LT_CONFIG_COMMANDS], |
3790 | -[AC_PROVIDE_IFELSE([LT_OUTPUT], |
3791 | - dnl If the libtool generation code has been placed in $CONFIG_LT, |
3792 | - dnl instead of duplicating it all over again into config.status, |
3793 | - dnl then we will have config.status run $CONFIG_LT later, so it |
3794 | - dnl needs to know what name is stored there: |
3795 | - [AC_CONFIG_COMMANDS([libtool], |
3796 | - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], |
3797 | - dnl If the libtool generation code is destined for config.status, |
3798 | - dnl expand the accumulated commands and init code now: |
3799 | - [AC_CONFIG_COMMANDS([libtool], |
3800 | - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) |
3801 | -])#_LT_CONFIG_COMMANDS |
3802 | - |
3803 | - |
3804 | -# Initialize. |
3805 | -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], |
3806 | -[ |
3807 | - |
3808 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
3809 | -# if CDPATH is set. |
3810 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
3811 | - |
3812 | -sed_quote_subst='$sed_quote_subst' |
3813 | -double_quote_subst='$double_quote_subst' |
3814 | -delay_variable_subst='$delay_variable_subst' |
3815 | -_LT_CONFIG_STATUS_DECLARATIONS |
3816 | -LTCC='$LTCC' |
3817 | -LTCFLAGS='$LTCFLAGS' |
3818 | -compiler='$compiler_DEFAULT' |
3819 | - |
3820 | -# Quote evaled strings. |
3821 | -for var in lt_decl_all_varnames([[ \ |
3822 | -]], lt_decl_quote_varnames); do |
3823 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
3824 | - *[[\\\\\\\`\\"\\\$]]*) |
3825 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
3826 | - ;; |
3827 | - *) |
3828 | - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
3829 | - ;; |
3830 | - esac |
3831 | -done |
3832 | - |
3833 | -# Double-quote double-evaled strings. |
3834 | -for var in lt_decl_all_varnames([[ \ |
3835 | -]], lt_decl_dquote_varnames); do |
3836 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
3837 | - *[[\\\\\\\`\\"\\\$]]*) |
3838 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
3839 | - ;; |
3840 | - *) |
3841 | - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
3842 | - ;; |
3843 | - esac |
3844 | -done |
3845 | - |
3846 | -# Fix-up fallback echo if it was mangled by the above quoting rules. |
3847 | -case \$lt_ECHO in |
3848 | -*'\\\[$]0 --fallback-echo"')dnl " |
3849 | - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` |
3850 | - ;; |
3851 | -esac |
3852 | - |
3853 | -_LT_OUTPUT_LIBTOOL_INIT |
3854 | -]) |
3855 | - |
3856 | - |
3857 | -# LT_OUTPUT |
3858 | -# --------- |
3859 | -# This macro allows early generation of the libtool script (before |
3860 | -# AC_OUTPUT is called), incase it is used in configure for compilation |
3861 | -# tests. |
3862 | -AC_DEFUN([LT_OUTPUT], |
3863 | -[: ${CONFIG_LT=./config.lt} |
3864 | -AC_MSG_NOTICE([creating $CONFIG_LT]) |
3865 | -cat >"$CONFIG_LT" <<_LTEOF |
3866 | -#! $SHELL |
3867 | -# Generated by $as_me. |
3868 | -# Run this file to recreate a libtool stub with the current configuration. |
3869 | - |
3870 | -lt_cl_silent=false |
3871 | -SHELL=\${CONFIG_SHELL-$SHELL} |
3872 | -_LTEOF |
3873 | - |
3874 | -cat >>"$CONFIG_LT" <<\_LTEOF |
3875 | -AS_SHELL_SANITIZE |
3876 | -_AS_PREPARE |
3877 | - |
3878 | -exec AS_MESSAGE_FD>&1 |
3879 | -exec AS_MESSAGE_LOG_FD>>config.log |
3880 | -{ |
3881 | - echo |
3882 | - AS_BOX([Running $as_me.]) |
3883 | -} >&AS_MESSAGE_LOG_FD |
3884 | - |
3885 | -lt_cl_help="\ |
3886 | -\`$as_me' creates a local libtool stub from the current configuration, |
3887 | -for use in further configure time tests before the real libtool is |
3888 | -generated. |
3889 | - |
3890 | -Usage: $[0] [[OPTIONS]] |
3891 | - |
3892 | - -h, --help print this help, then exit |
3893 | - -V, --version print version number, then exit |
3894 | - -q, --quiet do not print progress messages |
3895 | - -d, --debug don't remove temporary files |
3896 | - |
3897 | -Report bugs to <bug-libtool@gnu.org>." |
3898 | - |
3899 | -lt_cl_version="\ |
3900 | -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl |
3901 | -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
3902 | -configured by $[0], generated by m4_PACKAGE_STRING. |
3903 | - |
3904 | -Copyright (C) 2008 Free Software Foundation, Inc. |
3905 | -This config.lt script is free software; the Free Software Foundation |
3906 | -gives unlimited permision to copy, distribute and modify it." |
3907 | - |
3908 | -while test $[#] != 0 |
3909 | -do |
3910 | - case $[1] in |
3911 | - --version | --v* | -V ) |
3912 | - echo "$lt_cl_version"; exit 0 ;; |
3913 | - --help | --h* | -h ) |
3914 | - echo "$lt_cl_help"; exit 0 ;; |
3915 | - --debug | --d* | -d ) |
3916 | - debug=: ;; |
3917 | - --quiet | --q* | --silent | --s* | -q ) |
3918 | - lt_cl_silent=: ;; |
3919 | - |
3920 | - -*) AC_MSG_ERROR([unrecognized option: $[1] |
3921 | -Try \`$[0] --help' for more information.]) ;; |
3922 | - |
3923 | - *) AC_MSG_ERROR([unrecognized argument: $[1] |
3924 | -Try \`$[0] --help' for more information.]) ;; |
3925 | - esac |
3926 | - shift |
3927 | -done |
3928 | - |
3929 | -if $lt_cl_silent; then |
3930 | - exec AS_MESSAGE_FD>/dev/null |
3931 | -fi |
3932 | -_LTEOF |
3933 | - |
3934 | -cat >>"$CONFIG_LT" <<_LTEOF |
3935 | -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT |
3936 | -_LTEOF |
3937 | - |
3938 | -cat >>"$CONFIG_LT" <<\_LTEOF |
3939 | -AC_MSG_NOTICE([creating $ofile]) |
3940 | -_LT_OUTPUT_LIBTOOL_COMMANDS |
3941 | -AS_EXIT(0) |
3942 | -_LTEOF |
3943 | -chmod +x "$CONFIG_LT" |
3944 | - |
3945 | -# configure is writing to config.log, but config.lt does its own redirection, |
3946 | -# appending to config.log, which fails on DOS, as config.log is still kept |
3947 | -# open by configure. Here we exec the FD to /dev/null, effectively closing |
3948 | -# config.log, so it can be properly (re)opened and appended to by config.lt. |
3949 | -if test "$no_create" != yes; then |
3950 | - lt_cl_success=: |
3951 | - test "$silent" = yes && |
3952 | - lt_config_lt_args="$lt_config_lt_args --quiet" |
3953 | - exec AS_MESSAGE_LOG_FD>/dev/null |
3954 | - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
3955 | - exec AS_MESSAGE_LOG_FD>>config.log |
3956 | - $lt_cl_success || AS_EXIT(1) |
3957 | -fi |
3958 | -])# LT_OUTPUT |
3959 | - |
3960 | - |
3961 | -# _LT_CONFIG(TAG) |
3962 | -# --------------- |
3963 | -# If TAG is the built-in tag, create an initial libtool script with a |
3964 | -# default configuration from the untagged config vars. Otherwise add code |
3965 | -# to config.status for appending the configuration named by TAG from the |
3966 | -# matching tagged config vars. |
3967 | -m4_defun([_LT_CONFIG], |
3968 | -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3969 | -_LT_CONFIG_SAVE_COMMANDS([ |
3970 | - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl |
3971 | - m4_if(_LT_TAG, [C], [ |
3972 | - # See if we are running on zsh, and set the options which allow our |
3973 | - # commands through without removal of \ escapes. |
3974 | - if test -n "${ZSH_VERSION+set}" ; then |
3975 | - setopt NO_GLOB_SUBST |
3976 | - fi |
3977 | - |
3978 | - cfgfile="${ofile}T" |
3979 | - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 |
3980 | - $RM "$cfgfile" |
3981 | - |
3982 | - cat <<_LT_EOF >> "$cfgfile" |
3983 | -#! $SHELL |
3984 | - |
3985 | -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. |
3986 | -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION |
3987 | -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
3988 | -# NOTE: Changes made to this file will be lost: look at ltmain.sh. |
3989 | -# |
3990 | -_LT_COPYING |
3991 | -_LT_LIBTOOL_TAGS |
3992 | - |
3993 | -# ### BEGIN LIBTOOL CONFIG |
3994 | -_LT_LIBTOOL_CONFIG_VARS |
3995 | -_LT_LIBTOOL_TAG_VARS |
3996 | -# ### END LIBTOOL CONFIG |
3997 | - |
3998 | -_LT_EOF |
3999 | - |
4000 | - case $host_os in |
4001 | - aix3*) |
4002 | - cat <<\_LT_EOF >> "$cfgfile" |
4003 | -# AIX sometimes has problems with the GCC collect2 program. For some |
4004 | -# reason, if we set the COLLECT_NAMES environment variable, the problems |
4005 | -# vanish in a puff of smoke. |
4006 | -if test "X${COLLECT_NAMES+set}" != Xset; then |
4007 | - COLLECT_NAMES= |
4008 | - export COLLECT_NAMES |
4009 | -fi |
4010 | -_LT_EOF |
4011 | - ;; |
4012 | - esac |
4013 | - |
4014 | - _LT_PROG_LTMAIN |
4015 | - |
4016 | - # We use sed instead of cat because bash on DJGPP gets confused if |
4017 | - # if finds mixed CR/LF and LF-only lines. Since sed operates in |
4018 | - # text mode, it properly converts lines to CR/LF. This bash problem |
4019 | - # is reportedly fixed, but why not run on old versions too? |
4020 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
4021 | - || (rm -f "$cfgfile"; exit 1) |
4022 | - |
4023 | - _LT_PROG_XSI_SHELLFNS |
4024 | - |
4025 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
4026 | - || (rm -f "$cfgfile"; exit 1) |
4027 | - |
4028 | - mv -f "$cfgfile" "$ofile" || |
4029 | - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
4030 | - chmod +x "$ofile" |
4031 | -], |
4032 | -[cat <<_LT_EOF >> "$ofile" |
4033 | - |
4034 | -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded |
4035 | -dnl in a comment (ie after a #). |
4036 | -# ### BEGIN LIBTOOL TAG CONFIG: $1 |
4037 | -_LT_LIBTOOL_TAG_VARS(_LT_TAG) |
4038 | -# ### END LIBTOOL TAG CONFIG: $1 |
4039 | -_LT_EOF |
4040 | -])dnl /m4_if |
4041 | -], |
4042 | -[m4_if([$1], [], [ |
4043 | - PACKAGE='$PACKAGE' |
4044 | - VERSION='$VERSION' |
4045 | - TIMESTAMP='$TIMESTAMP' |
4046 | - RM='$RM' |
4047 | - ofile='$ofile'], []) |
4048 | -])dnl /_LT_CONFIG_SAVE_COMMANDS |
4049 | -])# _LT_CONFIG |
4050 | - |
4051 | - |
4052 | -# LT_SUPPORTED_TAG(TAG) |
4053 | -# --------------------- |
4054 | -# Trace this macro to discover what tags are supported by the libtool |
4055 | -# --tag option, using: |
4056 | -# autoconf --trace 'LT_SUPPORTED_TAG:$1' |
4057 | -AC_DEFUN([LT_SUPPORTED_TAG], []) |
4058 | - |
4059 | - |
4060 | -# C support is built-in for now |
4061 | -m4_define([_LT_LANG_C_enabled], []) |
4062 | -m4_define([_LT_TAGS], []) |
4063 | - |
4064 | - |
4065 | -# LT_LANG(LANG) |
4066 | -# ------------- |
4067 | -# Enable libtool support for the given language if not already enabled. |
4068 | -AC_DEFUN([LT_LANG], |
4069 | -[AC_BEFORE([$0], [LT_OUTPUT])dnl |
4070 | -m4_case([$1], |
4071 | - [C], [_LT_LANG(C)], |
4072 | - [C++], [_LT_LANG(CXX)], |
4073 | - [Java], [_LT_LANG(GCJ)], |
4074 | - [Fortran 77], [_LT_LANG(F77)], |
4075 | - [Fortran], [_LT_LANG(FC)], |
4076 | - [Windows Resource], [_LT_LANG(RC)], |
4077 | - [m4_ifdef([_LT_LANG_]$1[_CONFIG], |
4078 | - [_LT_LANG($1)], |
4079 | - [m4_fatal([$0: unsupported language: "$1"])])])dnl |
4080 | -])# LT_LANG |
4081 | - |
4082 | - |
4083 | -# _LT_LANG(LANGNAME) |
4084 | -# ------------------ |
4085 | -m4_defun([_LT_LANG], |
4086 | -[m4_ifdef([_LT_LANG_]$1[_enabled], [], |
4087 | - [LT_SUPPORTED_TAG([$1])dnl |
4088 | - m4_append([_LT_TAGS], [$1 ])dnl |
4089 | - m4_define([_LT_LANG_]$1[_enabled], [])dnl |
4090 | - _LT_LANG_$1_CONFIG($1)])dnl |
4091 | -])# _LT_LANG |
4092 | - |
4093 | - |
4094 | -# _LT_LANG_DEFAULT_CONFIG |
4095 | -# ----------------------- |
4096 | -m4_defun([_LT_LANG_DEFAULT_CONFIG], |
4097 | -[AC_PROVIDE_IFELSE([AC_PROG_CXX], |
4098 | - [LT_LANG(CXX)], |
4099 | - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) |
4100 | - |
4101 | -AC_PROVIDE_IFELSE([AC_PROG_F77], |
4102 | - [LT_LANG(F77)], |
4103 | - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) |
4104 | - |
4105 | -AC_PROVIDE_IFELSE([AC_PROG_FC], |
4106 | - [LT_LANG(FC)], |
4107 | - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) |
4108 | - |
4109 | -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal |
4110 | -dnl pulling things in needlessly. |
4111 | -AC_PROVIDE_IFELSE([AC_PROG_GCJ], |
4112 | - [LT_LANG(GCJ)], |
4113 | - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], |
4114 | - [LT_LANG(GCJ)], |
4115 | - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], |
4116 | - [LT_LANG(GCJ)], |
4117 | - [m4_ifdef([AC_PROG_GCJ], |
4118 | - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) |
4119 | - m4_ifdef([A][M_PROG_GCJ], |
4120 | - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) |
4121 | - m4_ifdef([LT_PROG_GCJ], |
4122 | - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
4123 | - |
4124 | -AC_PROVIDE_IFELSE([LT_PROG_RC], |
4125 | - [LT_LANG(RC)], |
4126 | - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
4127 | -])# _LT_LANG_DEFAULT_CONFIG |
4128 | - |
4129 | -# Obsolete macros: |
4130 | -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) |
4131 | -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
4132 | -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
4133 | -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
4134 | -dnl aclocal-1.4 backwards compatibility: |
4135 | -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
4136 | -dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
4137 | -dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
4138 | -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
4139 | - |
4140 | - |
4141 | -# _LT_TAG_COMPILER |
4142 | -# ---------------- |
4143 | -m4_defun([_LT_TAG_COMPILER], |
4144 | -[AC_REQUIRE([AC_PROG_CC])dnl |
4145 | - |
4146 | -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl |
4147 | -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl |
4148 | -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl |
4149 | -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl |
4150 | - |
4151 | -# If no C compiler was specified, use CC. |
4152 | -LTCC=${LTCC-"$CC"} |
4153 | - |
4154 | -# If no C compiler flags were specified, use CFLAGS. |
4155 | -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} |
4156 | - |
4157 | -# Allow CC to be a program name with arguments. |
4158 | -compiler=$CC |
4159 | -])# _LT_TAG_COMPILER |
4160 | - |
4161 | - |
4162 | -# _LT_COMPILER_BOILERPLATE |
4163 | -# ------------------------ |
4164 | -# Check for compiler boilerplate output or warnings with |
4165 | -# the simple compiler test code. |
4166 | -m4_defun([_LT_COMPILER_BOILERPLATE], |
4167 | -[m4_require([_LT_DECL_SED])dnl |
4168 | -ac_outfile=conftest.$ac_objext |
4169 | -echo "$lt_simple_compile_test_code" >conftest.$ac_ext |
4170 | -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
4171 | -_lt_compiler_boilerplate=`cat conftest.err` |
4172 | -$RM conftest* |
4173 | -])# _LT_COMPILER_BOILERPLATE |
4174 | - |
4175 | - |
4176 | -# _LT_LINKER_BOILERPLATE |
4177 | -# ---------------------- |
4178 | -# Check for linker boilerplate output or warnings with |
4179 | -# the simple link test code. |
4180 | -m4_defun([_LT_LINKER_BOILERPLATE], |
4181 | -[m4_require([_LT_DECL_SED])dnl |
4182 | -ac_outfile=conftest.$ac_objext |
4183 | -echo "$lt_simple_link_test_code" >conftest.$ac_ext |
4184 | -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
4185 | -_lt_linker_boilerplate=`cat conftest.err` |
4186 | -$RM -r conftest* |
4187 | -])# _LT_LINKER_BOILERPLATE |
4188 | - |
4189 | -# _LT_REQUIRED_DARWIN_CHECKS |
4190 | -# ------------------------- |
4191 | -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ |
4192 | - case $host_os in |
4193 | - rhapsody* | darwin*) |
4194 | - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) |
4195 | - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) |
4196 | - AC_CHECK_TOOL([LIPO], [lipo], [:]) |
4197 | - AC_CHECK_TOOL([OTOOL], [otool], [:]) |
4198 | - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) |
4199 | - _LT_DECL([], [DSYMUTIL], [1], |
4200 | - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) |
4201 | - _LT_DECL([], [NMEDIT], [1], |
4202 | - [Tool to change global to local symbols on Mac OS X]) |
4203 | - _LT_DECL([], [LIPO], [1], |
4204 | - [Tool to manipulate fat objects and archives on Mac OS X]) |
4205 | - _LT_DECL([], [OTOOL], [1], |
4206 | - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) |
4207 | - _LT_DECL([], [OTOOL64], [1], |
4208 | - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) |
4209 | - |
4210 | - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], |
4211 | - [lt_cv_apple_cc_single_mod=no |
4212 | - if test -z "${LT_MULTI_MODULE}"; then |
4213 | - # By default we will add the -single_module flag. You can override |
4214 | - # by either setting the environment variable LT_MULTI_MODULE |
4215 | - # non-empty at configure time, or by adding -multi_module to the |
4216 | - # link flags. |
4217 | - rm -rf libconftest.dylib* |
4218 | - echo "int foo(void){return 1;}" > conftest.c |
4219 | - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
4220 | --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD |
4221 | - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
4222 | - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
4223 | - _lt_result=$? |
4224 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
4225 | - lt_cv_apple_cc_single_mod=yes |
4226 | - else |
4227 | - cat conftest.err >&AS_MESSAGE_LOG_FD |
4228 | - fi |
4229 | - rm -rf libconftest.dylib* |
4230 | - rm -f conftest.* |
4231 | - fi]) |
4232 | - AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
4233 | - [lt_cv_ld_exported_symbols_list], |
4234 | - [lt_cv_ld_exported_symbols_list=no |
4235 | - save_LDFLAGS=$LDFLAGS |
4236 | - echo "_main" > conftest.sym |
4237 | - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" |
4238 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
4239 | - [lt_cv_ld_exported_symbols_list=yes], |
4240 | - [lt_cv_ld_exported_symbols_list=no]) |
4241 | - LDFLAGS="$save_LDFLAGS" |
4242 | - ]) |
4243 | - case $host_os in |
4244 | - rhapsody* | darwin1.[[012]]) |
4245 | - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
4246 | - darwin1.*) |
4247 | - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
4248 | - darwin*) # darwin 5.x on |
4249 | - # if running on 10.5 or later, the deployment target defaults |
4250 | - # to the OS version, if on x86, and 10.4, the deployment |
4251 | - # target defaults to 10.4. Don't you love it? |
4252 | - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in |
4253 | - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) |
4254 | - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
4255 | - 10.[[012]]*) |
4256 | - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
4257 | - 10.*) |
4258 | - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
4259 | - esac |
4260 | - ;; |
4261 | - esac |
4262 | - if test "$lt_cv_apple_cc_single_mod" = "yes"; then |
4263 | - _lt_dar_single_mod='$single_module' |
4264 | - fi |
4265 | - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then |
4266 | - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' |
4267 | - else |
4268 | - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
4269 | - fi |
4270 | - if test "$DSYMUTIL" != ":"; then |
4271 | - _lt_dsymutil='~$DSYMUTIL $lib || :' |
4272 | - else |
4273 | - _lt_dsymutil= |
4274 | - fi |
4275 | - ;; |
4276 | - esac |
4277 | -]) |
4278 | - |
4279 | - |
4280 | -# _LT_DARWIN_LINKER_FEATURES |
4281 | -# -------------------------- |
4282 | -# Checks for linker and compiler features on darwin |
4283 | -m4_defun([_LT_DARWIN_LINKER_FEATURES], |
4284 | -[ |
4285 | - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) |
4286 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4287 | - _LT_TAGVAR(hardcode_direct, $1)=no |
4288 | - _LT_TAGVAR(hardcode_automatic, $1)=yes |
4289 | - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4290 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
4291 | - _LT_TAGVAR(link_all_deplibs, $1)=yes |
4292 | - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
4293 | - case $cc_basename in |
4294 | - ifort*) _lt_dar_can_shared=yes ;; |
4295 | - *) _lt_dar_can_shared=$GCC ;; |
4296 | - esac |
4297 | - if test "$_lt_dar_can_shared" = "yes"; then |
4298 | - output_verbose_link_cmd=echo |
4299 | - _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}" |
4300 | - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
4301 | - _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}" |
4302 | - _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}" |
4303 | - m4_if([$1], [CXX], |
4304 | -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then |
4305 | - _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}" |
4306 | - _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}" |
4307 | - fi |
4308 | -],[]) |
4309 | - else |
4310 | - _LT_TAGVAR(ld_shlibs, $1)=no |
4311 | - fi |
4312 | -]) |
4313 | - |
4314 | -# _LT_SYS_MODULE_PATH_AIX |
4315 | -# ----------------------- |
4316 | -# Links a minimal program and checks the executable |
4317 | -# for the system default hardcoded library path. In most cases, |
4318 | -# this is /usr/lib:/lib, but when the MPI compilers are used |
4319 | -# the location of the communication and MPI libs are included too. |
4320 | -# If we don't find anything, use the default library path according |
4321 | -# to the aix ld manual. |
4322 | -m4_defun([_LT_SYS_MODULE_PATH_AIX], |
4323 | -[m4_require([_LT_DECL_SED])dnl |
4324 | -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
4325 | -lt_aix_libpath_sed=' |
4326 | - /Import File Strings/,/^$/ { |
4327 | - /^0/ { |
4328 | - s/^0 *\(.*\)$/\1/ |
4329 | - p |
4330 | - } |
4331 | - }' |
4332 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4333 | -# Check for a 64-bit object if we didn't find anything. |
4334 | -if test -z "$aix_libpath"; then |
4335 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4336 | -fi],[]) |
4337 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4338 | -])# _LT_SYS_MODULE_PATH_AIX |
4339 | - |
4340 | - |
4341 | -# _LT_SHELL_INIT(ARG) |
4342 | -# ------------------- |
4343 | -m4_define([_LT_SHELL_INIT], |
4344 | -[ifdef([AC_DIVERSION_NOTICE], |
4345 | - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], |
4346 | - [AC_DIVERT_PUSH(NOTICE)]) |
4347 | -$1 |
4348 | -AC_DIVERT_POP |
4349 | -])# _LT_SHELL_INIT |
4350 | - |
4351 | - |
4352 | -# _LT_PROG_ECHO_BACKSLASH |
4353 | -# ----------------------- |
4354 | -# Add some code to the start of the generated configure script which |
4355 | -# will find an echo command which doesn't interpret backslashes. |
4356 | -m4_defun([_LT_PROG_ECHO_BACKSLASH], |
4357 | -[_LT_SHELL_INIT([ |
4358 | -# Check that we are running under the correct shell. |
4359 | -SHELL=${CONFIG_SHELL-/bin/sh} |
4360 | - |
4361 | -case X$lt_ECHO in |
4362 | -X*--fallback-echo) |
4363 | - # Remove one level of quotation (which was required for Make). |
4364 | - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` |
4365 | - ;; |
4366 | -esac |
4367 | - |
4368 | -ECHO=${lt_ECHO-echo} |
4369 | -if test "X[$]1" = X--no-reexec; then |
4370 | - # Discard the --no-reexec flag, and continue. |
4371 | - shift |
4372 | -elif test "X[$]1" = X--fallback-echo; then |
4373 | - # Avoid inline document here, it may be left over |
4374 | - : |
4375 | -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
4376 | - # Yippee, $ECHO works! |
4377 | - : |
4378 | -else |
4379 | - # Restart under the correct shell. |
4380 | - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} |
4381 | -fi |
4382 | - |
4383 | -if test "X[$]1" = X--fallback-echo; then |
4384 | - # used as fallback echo |
4385 | - shift |
4386 | - cat <<_LT_EOF |
4387 | -[$]* |
4388 | -_LT_EOF |
4389 | - exit 0 |
4390 | -fi |
4391 | - |
4392 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
4393 | -# if CDPATH is set. |
4394 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
4395 | - |
4396 | -if test -z "$lt_ECHO"; then |
4397 | - if test "X${echo_test_string+set}" != Xset; then |
4398 | - # find a string as large as possible, as long as the shell can cope with it |
4399 | - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
4400 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
4401 | - if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
4402 | - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
4403 | - then |
4404 | - break |
4405 | - fi |
4406 | - done |
4407 | - fi |
4408 | - |
4409 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
4410 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
4411 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
4412 | - : |
4413 | - else |
4414 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
4415 | - # backslashes. This makes it impossible to quote backslashes using |
4416 | - # echo "$something" | sed 's/\\/\\\\/g' |
4417 | - # |
4418 | - # So, first we look for a working echo in the user's PATH. |
4419 | - |
4420 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
4421 | - for dir in $PATH /usr/ucb; do |
4422 | - IFS="$lt_save_ifs" |
4423 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
4424 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
4425 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
4426 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
4427 | - ECHO="$dir/echo" |
4428 | - break |
4429 | - fi |
4430 | - done |
4431 | - IFS="$lt_save_ifs" |
4432 | - |
4433 | - if test "X$ECHO" = Xecho; then |
4434 | - # We didn't find a better echo, so look for alternatives. |
4435 | - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
4436 | - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
4437 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
4438 | - # This shell has a builtin print -r that does the trick. |
4439 | - ECHO='print -r' |
4440 | - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
4441 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
4442 | - # If we have ksh, try running configure again with it. |
4443 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
4444 | - export ORIGINAL_CONFIG_SHELL |
4445 | - CONFIG_SHELL=/bin/ksh |
4446 | - export CONFIG_SHELL |
4447 | - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} |
4448 | - else |
4449 | - # Try using printf. |
4450 | - ECHO='printf %s\n' |
4451 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
4452 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
4453 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
4454 | - # Cool, printf works |
4455 | - : |
4456 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
4457 | - test "X$echo_testing_string" = 'X\t' && |
4458 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
4459 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
4460 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
4461 | - export CONFIG_SHELL |
4462 | - SHELL="$CONFIG_SHELL" |
4463 | - export SHELL |
4464 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
4465 | - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
4466 | - test "X$echo_testing_string" = 'X\t' && |
4467 | - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
4468 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
4469 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
4470 | - else |
4471 | - # maybe with a smaller string... |
4472 | - prev=: |
4473 | - |
4474 | - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do |
4475 | - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
4476 | - then |
4477 | - break |
4478 | - fi |
4479 | - prev="$cmd" |
4480 | - done |
4481 | - |
4482 | - if test "$prev" != 'sed 50q "[$]0"'; then |
4483 | - echo_test_string=`eval $prev` |
4484 | - export echo_test_string |
4485 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} |
4486 | - else |
4487 | - # Oops. We lost completely, so just stick with echo. |
4488 | - ECHO=echo |
4489 | - fi |
4490 | - fi |
4491 | - fi |
4492 | - fi |
4493 | - fi |
4494 | -fi |
4495 | - |
4496 | -# Copy echo and quote the copy suitably for passing to libtool from |
4497 | -# the Makefile, instead of quoting the original, which is used later. |
4498 | -lt_ECHO=$ECHO |
4499 | -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then |
4500 | - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" |
4501 | -fi |
4502 | - |
4503 | -AC_SUBST(lt_ECHO) |
4504 | -]) |
4505 | -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) |
4506 | -_LT_DECL([], [ECHO], [1], |
4507 | - [An echo program that does not interpret backslashes]) |
4508 | -])# _LT_PROG_ECHO_BACKSLASH |
4509 | - |
4510 | - |
4511 | -# _LT_ENABLE_LOCK |
4512 | -# --------------- |
4513 | -m4_defun([_LT_ENABLE_LOCK], |
4514 | -[AC_ARG_ENABLE([libtool-lock], |
4515 | - [AS_HELP_STRING([--disable-libtool-lock], |
4516 | - [avoid locking (might break parallel builds)])]) |
4517 | -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes |
4518 | - |
4519 | -# Some flags need to be propagated to the compiler or linker for good |
4520 | -# libtool support. |
4521 | -case $host in |
4522 | -ia64-*-hpux*) |
4523 | - # Find out which ABI we are using. |
4524 | - echo 'int i;' > conftest.$ac_ext |
4525 | - if AC_TRY_EVAL(ac_compile); then |
4526 | - case `/usr/bin/file conftest.$ac_objext` in |
4527 | - *ELF-32*) |
4528 | - HPUX_IA64_MODE="32" |
4529 | - ;; |
4530 | - *ELF-64*) |
4531 | - HPUX_IA64_MODE="64" |
4532 | - ;; |
4533 | - esac |
4534 | - fi |
4535 | - rm -rf conftest* |
4536 | - ;; |
4537 | -*-*-irix6*) |
4538 | - # Find out which ABI we are using. |
4539 | - echo '[#]line __oline__ "configure"' > conftest.$ac_ext |
4540 | - if AC_TRY_EVAL(ac_compile); then |
4541 | - if test "$lt_cv_prog_gnu_ld" = yes; then |
4542 | - case `/usr/bin/file conftest.$ac_objext` in |
4543 | - *32-bit*) |
4544 | - LD="${LD-ld} -melf32bsmip" |
4545 | - ;; |
4546 | - *N32*) |
4547 | - LD="${LD-ld} -melf32bmipn32" |
4548 | - ;; |
4549 | - *64-bit*) |
4550 | - LD="${LD-ld} -melf64bmip" |
4551 | - ;; |
4552 | - esac |
4553 | - else |
4554 | - case `/usr/bin/file conftest.$ac_objext` in |
4555 | - *32-bit*) |
4556 | - LD="${LD-ld} -32" |
4557 | - ;; |
4558 | - *N32*) |
4559 | - LD="${LD-ld} -n32" |
4560 | - ;; |
4561 | - *64-bit*) |
4562 | - LD="${LD-ld} -64" |
4563 | - ;; |
4564 | - esac |
4565 | - fi |
4566 | - fi |
4567 | - rm -rf conftest* |
4568 | - ;; |
4569 | - |
4570 | -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
4571 | -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
4572 | - # Find out which ABI we are using. |
4573 | - echo 'int i;' > conftest.$ac_ext |
4574 | - if AC_TRY_EVAL(ac_compile); then |
4575 | - case `/usr/bin/file conftest.o` in |
4576 | - *32-bit*) |
4577 | - case $host in |
4578 | - x86_64-*kfreebsd*-gnu) |
4579 | - LD="${LD-ld} -m elf_i386_fbsd" |
4580 | - ;; |
4581 | - x86_64-*linux*) |
4582 | - LD="${LD-ld} -m elf_i386" |
4583 | - ;; |
4584 | - ppc64-*linux*|powerpc64-*linux*) |
4585 | - LD="${LD-ld} -m elf32ppclinux" |
4586 | - ;; |
4587 | - s390x-*linux*) |
4588 | - LD="${LD-ld} -m elf_s390" |
4589 | - ;; |
4590 | - sparc64-*linux*) |
4591 | - LD="${LD-ld} -m elf32_sparc" |
4592 | - ;; |
4593 | - esac |
4594 | - ;; |
4595 | - *64-bit*) |
4596 | - case $host in |
4597 | - x86_64-*kfreebsd*-gnu) |
4598 | - LD="${LD-ld} -m elf_x86_64_fbsd" |
4599 | - ;; |
4600 | - x86_64-*linux*) |
4601 | - LD="${LD-ld} -m elf_x86_64" |
4602 | - ;; |
4603 | - ppc*-*linux*|powerpc*-*linux*) |
4604 | - LD="${LD-ld} -m elf64ppc" |
4605 | - ;; |
4606 | - s390*-*linux*|s390*-*tpf*) |
4607 | - LD="${LD-ld} -m elf64_s390" |
4608 | - ;; |
4609 | - sparc*-*linux*) |
4610 | - LD="${LD-ld} -m elf64_sparc" |
4611 | - ;; |
4612 | - esac |
4613 | - ;; |
4614 | - esac |
4615 | - fi |
4616 | - rm -rf conftest* |
4617 | - ;; |
4618 | - |
4619 | -*-*-sco3.2v5*) |
4620 | - # On SCO OpenServer 5, we need -belf to get full-featured binaries. |
4621 | - SAVE_CFLAGS="$CFLAGS" |
4622 | - CFLAGS="$CFLAGS -belf" |
4623 | - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, |
4624 | - [AC_LANG_PUSH(C) |
4625 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) |
4626 | - AC_LANG_POP]) |
4627 | - if test x"$lt_cv_cc_needs_belf" != x"yes"; then |
4628 | - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf |
4629 | - CFLAGS="$SAVE_CFLAGS" |
4630 | - fi |
4631 | - ;; |
4632 | -sparc*-*solaris*) |
4633 | - # Find out which ABI we are using. |
4634 | - echo 'int i;' > conftest.$ac_ext |
4635 | - if AC_TRY_EVAL(ac_compile); then |
4636 | - case `/usr/bin/file conftest.o` in |
4637 | - *64-bit*) |
4638 | - case $lt_cv_prog_gnu_ld in |
4639 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
4640 | - *) |
4641 | - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
4642 | - LD="${LD-ld} -64" |
4643 | - fi |
4644 | - ;; |
4645 | - esac |
4646 | - ;; |
4647 | - esac |
4648 | - fi |
4649 | - rm -rf conftest* |
4650 | - ;; |
4651 | -esac |
4652 | - |
4653 | -need_locks="$enable_libtool_lock" |
4654 | -])# _LT_ENABLE_LOCK |
4655 | - |
4656 | - |
4657 | -# _LT_CMD_OLD_ARCHIVE |
4658 | -# ------------------- |
4659 | -m4_defun([_LT_CMD_OLD_ARCHIVE], |
4660 | -[AC_CHECK_TOOL(AR, ar, false) |
4661 | -test -z "$AR" && AR=ar |
4662 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
4663 | -_LT_DECL([], [AR], [1], [The archiver]) |
4664 | -_LT_DECL([], [AR_FLAGS], [1]) |
4665 | - |
4666 | -AC_CHECK_TOOL(STRIP, strip, :) |
4667 | -test -z "$STRIP" && STRIP=: |
4668 | -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) |
4669 | - |
4670 | -AC_CHECK_TOOL(RANLIB, ranlib, :) |
4671 | -test -z "$RANLIB" && RANLIB=: |
4672 | -_LT_DECL([], [RANLIB], [1], |
4673 | - [Commands used to install an old-style archive]) |
4674 | - |
4675 | -# Determine commands to create old-style static archives. |
4676 | -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
4677 | -old_postinstall_cmds='chmod 644 $oldlib' |
4678 | -old_postuninstall_cmds= |
4679 | - |
4680 | -if test -n "$RANLIB"; then |
4681 | - case $host_os in |
4682 | - openbsd*) |
4683 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
4684 | - ;; |
4685 | - *) |
4686 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
4687 | - ;; |
4688 | - esac |
4689 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
4690 | -fi |
4691 | -_LT_DECL([], [old_postinstall_cmds], [2]) |
4692 | -_LT_DECL([], [old_postuninstall_cmds], [2]) |
4693 | -_LT_TAGDECL([], [old_archive_cmds], [2], |
4694 | - [Commands used to build an old-style archive]) |
4695 | -])# _LT_CMD_OLD_ARCHIVE |
4696 | - |
4697 | - |
4698 | -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, |
4699 | -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) |
4700 | -# ---------------------------------------------------------------- |
4701 | -# Check whether the given compiler option works |
4702 | -AC_DEFUN([_LT_COMPILER_OPTION], |
4703 | -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
4704 | -m4_require([_LT_DECL_SED])dnl |
4705 | -AC_CACHE_CHECK([$1], [$2], |
4706 | - [$2=no |
4707 | - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) |
4708 | - echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
4709 | - lt_compiler_flag="$3" |
4710 | - # Insert the option either (1) after the last *FLAGS variable, or |
4711 | - # (2) before a word containing "conftest.", or (3) at the end. |
4712 | - # Note that $ac_compile itself does not contain backslashes and begins |
4713 | - # with a dollar sign (not a hyphen), so the echo should work correctly. |
4714 | - # The option is referenced via a variable to avoid confusing sed. |
4715 | - lt_compile=`echo "$ac_compile" | $SED \ |
4716 | - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4717 | - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
4718 | - -e 's:$: $lt_compiler_flag:'` |
4719 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
4720 | - (eval "$lt_compile" 2>conftest.err) |
4721 | - ac_status=$? |
4722 | - cat conftest.err >&AS_MESSAGE_LOG_FD |
4723 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
4724 | - if (exit $ac_status) && test -s "$ac_outfile"; then |
4725 | - # The compiler can only warn and ignore the option if not recognized |
4726 | - # So say no if there are warnings other than the usual output. |
4727 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
4728 | - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4729 | - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
4730 | - $2=yes |
4731 | - fi |
4732 | - fi |
4733 | - $RM conftest* |
4734 | -]) |
4735 | - |
4736 | -if test x"[$]$2" = xyes; then |
4737 | - m4_if([$5], , :, [$5]) |
4738 | -else |
4739 | - m4_if([$6], , :, [$6]) |
4740 | -fi |
4741 | -])# _LT_COMPILER_OPTION |
4742 | - |
4743 | -# Old name: |
4744 | -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) |
4745 | -dnl aclocal-1.4 backwards compatibility: |
4746 | -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) |
4747 | - |
4748 | - |
4749 | -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, |
4750 | -# [ACTION-SUCCESS], [ACTION-FAILURE]) |
4751 | -# ---------------------------------------------------- |
4752 | -# Check whether the given linker option works |
4753 | -AC_DEFUN([_LT_LINKER_OPTION], |
4754 | -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
4755 | -m4_require([_LT_DECL_SED])dnl |
4756 | -AC_CACHE_CHECK([$1], [$2], |
4757 | - [$2=no |
4758 | - save_LDFLAGS="$LDFLAGS" |
4759 | - LDFLAGS="$LDFLAGS $3" |
4760 | - echo "$lt_simple_link_test_code" > conftest.$ac_ext |
4761 | - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
4762 | - # The linker can only warn and ignore the option if not recognized |
4763 | - # So say no if there are warnings |
4764 | - if test -s conftest.err; then |
4765 | - # Append any errors to the config.log. |
4766 | - cat conftest.err 1>&AS_MESSAGE_LOG_FD |
4767 | - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
4768 | - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4769 | - if diff conftest.exp conftest.er2 >/dev/null; then |
4770 | - $2=yes |
4771 | - fi |
4772 | - else |
4773 | - $2=yes |
4774 | - fi |
4775 | - fi |
4776 | - $RM -r conftest* |
4777 | - LDFLAGS="$save_LDFLAGS" |
4778 | -]) |
4779 | - |
4780 | -if test x"[$]$2" = xyes; then |
4781 | - m4_if([$4], , :, [$4]) |
4782 | -else |
4783 | - m4_if([$5], , :, [$5]) |
4784 | -fi |
4785 | -])# _LT_LINKER_OPTION |
4786 | - |
4787 | -# Old name: |
4788 | -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) |
4789 | -dnl aclocal-1.4 backwards compatibility: |
4790 | -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) |
4791 | - |
4792 | - |
4793 | -# LT_CMD_MAX_LEN |
4794 | -#--------------- |
4795 | -AC_DEFUN([LT_CMD_MAX_LEN], |
4796 | -[AC_REQUIRE([AC_CANONICAL_HOST])dnl |
4797 | -# find the maximum length of command line arguments |
4798 | -AC_MSG_CHECKING([the maximum length of command line arguments]) |
4799 | -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl |
4800 | - i=0 |
4801 | - teststring="ABCD" |
4802 | - |
4803 | - case $build_os in |
4804 | - msdosdjgpp*) |
4805 | - # On DJGPP, this test can blow up pretty badly due to problems in libc |
4806 | - # (any single argument exceeding 2000 bytes causes a buffer overrun |
4807 | - # during glob expansion). Even if it were fixed, the result of this |
4808 | - # check would be larger than it should be. |
4809 | - lt_cv_sys_max_cmd_len=12288; # 12K is about right |
4810 | - ;; |
4811 | - |
4812 | - gnu*) |
4813 | - # Under GNU Hurd, this test is not required because there is |
4814 | - # no limit to the length of command line arguments. |
4815 | - # Libtool will interpret -1 as no limit whatsoever |
4816 | - lt_cv_sys_max_cmd_len=-1; |
4817 | - ;; |
4818 | - |
4819 | - cygwin* | mingw* | cegcc*) |
4820 | - # On Win9x/ME, this test blows up -- it succeeds, but takes |
4821 | - # about 5 minutes as the teststring grows exponentially. |
4822 | - # Worse, since 9x/ME are not pre-emptively multitasking, |
4823 | - # you end up with a "frozen" computer, even though with patience |
4824 | - # the test eventually succeeds (with a max line length of 256k). |
4825 | - # Instead, let's just punt: use the minimum linelength reported by |
4826 | - # all of the supported platforms: 8192 (on NT/2K/XP). |
4827 | - lt_cv_sys_max_cmd_len=8192; |
4828 | - ;; |
4829 | - |
4830 | - amigaos*) |
4831 | - # On AmigaOS with pdksh, this test takes hours, literally. |
4832 | - # So we just punt and use a minimum line length of 8192. |
4833 | - lt_cv_sys_max_cmd_len=8192; |
4834 | - ;; |
4835 | - |
4836 | - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) |
4837 | - # This has been around since 386BSD, at least. Likely further. |
4838 | - if test -x /sbin/sysctl; then |
4839 | - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` |
4840 | - elif test -x /usr/sbin/sysctl; then |
4841 | - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` |
4842 | - else |
4843 | - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs |
4844 | - fi |
4845 | - # And add a safety zone |
4846 | - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
4847 | - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
4848 | - ;; |
4849 | - |
4850 | - interix*) |
4851 | - # We know the value 262144 and hardcode it with a safety zone (like BSD) |
4852 | - lt_cv_sys_max_cmd_len=196608 |
4853 | - ;; |
4854 | - |
4855 | - osf*) |
4856 | - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
4857 | - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
4858 | - # nice to cause kernel panics so lets avoid the loop below. |
4859 | - # First set a reasonable default. |
4860 | - lt_cv_sys_max_cmd_len=16384 |
4861 | - # |
4862 | - if test -x /sbin/sysconfig; then |
4863 | - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in |
4864 | - *1*) lt_cv_sys_max_cmd_len=-1 ;; |
4865 | - esac |
4866 | - fi |
4867 | - ;; |
4868 | - sco3.2v5*) |
4869 | - lt_cv_sys_max_cmd_len=102400 |
4870 | - ;; |
4871 | - sysv5* | sco5v6* | sysv4.2uw2*) |
4872 | - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` |
4873 | - if test -n "$kargmax"; then |
4874 | - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` |
4875 | - else |
4876 | - lt_cv_sys_max_cmd_len=32768 |
4877 | - fi |
4878 | - ;; |
4879 | - *) |
4880 | - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
4881 | - if test -n "$lt_cv_sys_max_cmd_len"; then |
4882 | - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
4883 | - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
4884 | - else |
4885 | - # Make teststring a little bigger before we do anything with it. |
4886 | - # a 1K string should be a reasonable start. |
4887 | - for i in 1 2 3 4 5 6 7 8 ; do |
4888 | - teststring=$teststring$teststring |
4889 | - done |
4890 | - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
4891 | - # If test is not a shell built-in, we'll probably end up computing a |
4892 | - # maximum length that is only half of the actual maximum length, but |
4893 | - # we can't tell. |
4894 | - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
4895 | - = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
4896 | - test $i != 17 # 1/2 MB should be enough |
4897 | - do |
4898 | - i=`expr $i + 1` |
4899 | - teststring=$teststring$teststring |
4900 | - done |
4901 | - # Only check the string length outside the loop. |
4902 | - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` |
4903 | - teststring= |
4904 | - # Add a significant safety factor because C++ compilers can tack on |
4905 | - # massive amounts of additional arguments before passing them to the |
4906 | - # linker. It appears as though 1/2 is a usable value. |
4907 | - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` |
4908 | - fi |
4909 | - ;; |
4910 | - esac |
4911 | -]) |
4912 | -if test -n $lt_cv_sys_max_cmd_len ; then |
4913 | - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) |
4914 | -else |
4915 | - AC_MSG_RESULT(none) |
4916 | -fi |
4917 | -max_cmd_len=$lt_cv_sys_max_cmd_len |
4918 | -_LT_DECL([], [max_cmd_len], [0], |
4919 | - [What is the maximum length of a command?]) |
4920 | -])# LT_CMD_MAX_LEN |
4921 | - |
4922 | -# Old name: |
4923 | -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) |
4924 | -dnl aclocal-1.4 backwards compatibility: |
4925 | -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) |
4926 | - |
4927 | - |
4928 | -# _LT_HEADER_DLFCN |
4929 | -# ---------------- |
4930 | -m4_defun([_LT_HEADER_DLFCN], |
4931 | -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl |
4932 | -])# _LT_HEADER_DLFCN |
4933 | - |
4934 | - |
4935 | -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, |
4936 | -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) |
4937 | -# ---------------------------------------------------------------- |
4938 | -m4_defun([_LT_TRY_DLOPEN_SELF], |
4939 | -[m4_require([_LT_HEADER_DLFCN])dnl |
4940 | -if test "$cross_compiling" = yes; then : |
4941 | - [$4] |
4942 | -else |
4943 | - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
4944 | - lt_status=$lt_dlunknown |
4945 | - cat > conftest.$ac_ext <<_LT_EOF |
4946 | -[#line __oline__ "configure" |
4947 | -#include "confdefs.h" |
4948 | - |
4949 | -#if HAVE_DLFCN_H |
4950 | -#include <dlfcn.h> |
4951 | -#endif |
4952 | - |
4953 | -#include <stdio.h> |
4954 | - |
4955 | -#ifdef RTLD_GLOBAL |
4956 | -# define LT_DLGLOBAL RTLD_GLOBAL |
4957 | -#else |
4958 | -# ifdef DL_GLOBAL |
4959 | -# define LT_DLGLOBAL DL_GLOBAL |
4960 | -# else |
4961 | -# define LT_DLGLOBAL 0 |
4962 | -# endif |
4963 | -#endif |
4964 | - |
4965 | -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we |
4966 | - find out it does not work in some platform. */ |
4967 | -#ifndef LT_DLLAZY_OR_NOW |
4968 | -# ifdef RTLD_LAZY |
4969 | -# define LT_DLLAZY_OR_NOW RTLD_LAZY |
4970 | -# else |
4971 | -# ifdef DL_LAZY |
4972 | -# define LT_DLLAZY_OR_NOW DL_LAZY |
4973 | -# else |
4974 | -# ifdef RTLD_NOW |
4975 | -# define LT_DLLAZY_OR_NOW RTLD_NOW |
4976 | -# else |
4977 | -# ifdef DL_NOW |
4978 | -# define LT_DLLAZY_OR_NOW DL_NOW |
4979 | -# else |
4980 | -# define LT_DLLAZY_OR_NOW 0 |
4981 | -# endif |
4982 | -# endif |
4983 | -# endif |
4984 | -# endif |
4985 | -#endif |
4986 | - |
4987 | -void fnord() { int i=42;} |
4988 | -int main () |
4989 | -{ |
4990 | - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
4991 | - int status = $lt_dlunknown; |
4992 | - |
4993 | - if (self) |
4994 | - { |
4995 | - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
4996 | - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
4997 | - /* dlclose (self); */ |
4998 | - } |
4999 | - else |
5000 | - puts (dlerror ()); |
The diff has been truncated for viewing.
This is currently running through buildbot, see:
http:// buildbot- ocean.ese. ic.ac.uk: 8080/builders/ update- spatialindex