[Liblas-commits] r1300 - in trunk: . apps include src

[liblas-commits at liblas.org]

Author: hobu
Date: Mon Jun 29 21:15:32 2009
New Revision: 1300
URL: http://liblas.org/changeset/1300

Log:
fix redefinition of HAVE_BOOST_API

Modified:
   trunk/Makefile.am
   trunk/apps/Makefile.am
   trunk/apps/lasindex.cpp
   trunk/configure.ac
   trunk/include/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Jun 29 21:15:32 2009
@@ -22,7 +22,7 @@
 endif
 
 if BOOST_IS_CONFIG
-BOOST_FLAGS = @BOOST_CPPFLAGS@ -DHAVE_BOOST_API=1
+BOOST_FLAGS = @BOOST_CPPFLAGS@ -DHAVE_BOOST=1
 endif
 
 AM_CPPFLAGS = -I../include/liblas/capi -I../include $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) $(SPATIALINDEX_CPPFLAGS) $(OCI_CPPFLAGS) $(ZLIB_CPPFLAGS) $(BOOST_FLAGS)

Modified: trunk/apps/Makefile.am
==============================================================================
--- trunk/apps/Makefile.am	(original)
+++ trunk/apps/Makefile.am	Mon Jun 29 21:15:32 2009
@@ -19,7 +19,7 @@
 endif
 
 if BOOST_IS_CONFIG
-BOOST_FLAGS = @BOOST_CPPFLAGS@ -DHAVE_BOOST_API=1
+BOOST_FLAGS = @BOOST_CPPFLAGS@ -DHAVE_BOOST=1
 endif
 
 AM_CPPFLAGS = -I../include/liblas/capi -I../include $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) $(SPATIALINDEX_CPPFLAGS) $(OCI_CPPFLAGS) $(ZLIB_CPPFLAGS) $(BOOST_FLAGS)

Modified: trunk/apps/lasindex.cpp
==============================================================================
--- trunk/apps/lasindex.cpp	(original)
+++ trunk/apps/lasindex.cpp	Mon Jun 29 21:15:32 2009
@@ -9,7 +9,7 @@
 #include <liblas/lasvariablerecord.hpp>
 #include <liblas/index/index.hpp>
 
-#ifdef HAVE_BOOST_API
+#ifdef HAVE_BOOST
 #include <boost/iostreams/filter/zlib.hpp>
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/filtering_stream.hpp>
@@ -185,7 +185,12 @@
         std::string s = e.what();
         std::cout << "error querying index value" << s <<std::endl; exit(1);
     }
-        
+    
+    std::cout << "hits: ";
+    for (int i=0;i<ids->size();i++) {
+        std::cout << ids->at(i) <<",";
+    }
+    std::cout << std::endl;
     // 
     // if (ids != 0) delete ids;
     // if (idx != 0) delete idx;
@@ -206,6 +211,7 @@
     LASVariableRecord *vlr = idx->GetVLR();
 
     std::string data("some junkdsfasdfasdfqwerasdfasdfasdfasdfasdfweradsfasdfasdfasdfasdfasdqwerasdfasdfasdfasdfqwerasdfasdfv");
+    // std::string data(vlr->GetData());
     std::cout << "uncompressed size " << data.size() << std::endl;
     
     io::copy(boost::make_iterator_range(data),ofilter);

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jun 29 21:15:32 2009
@@ -281,7 +281,7 @@
 echo ${HAVE_BOOST}
 if test "${HAVE_BOOST}" == "yes" ; then
     HAVE_BOOST="yes"
-    LIBS="$BOOST_LDFLAGS -lboost_iostreams $LIBS"
+    LIBS="$BOOST_LDFLAGS -lboost_iostreams-gcc40-mt $LIBS"
 fi
 
 

Modified: trunk/include/Makefile.am
==============================================================================
--- trunk/include/Makefile.am	(original)
+++ trunk/include/Makefile.am	Mon Jun 29 21:15:32 2009
@@ -37,4 +37,5 @@
     liblas/index/datastream.hpp \
     liblas/index/index.hpp \
     liblas/index/storage.hpp \
+	liblas/index/query.hpp \
     liblas/index/visitor.hpp
\ No newline at end of file

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Jun 29 21:15:32 2009
@@ -22,7 +22,7 @@
 endif
 
 if BOOST_IS_CONFIG
-BOOST_FLAGS = @BOOST_CPPFLAGS@ -DHAVE_BOOST_API=1
+BOOST_FLAGS = @BOOST_CPPFLAGS@ -DHAVE_BOOST=1
 endif
 
 AM_CPPFLAGS = -I../include/liblas/capi -I../include $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) $(SPATIALINDEX_CPPFLAGS) $(OCI_CPPFLAGS) $(ZLIB_CPPFLAGS) $(BOOST_FLAGS)
@@ -59,6 +59,7 @@
 liblas_la_SOURCES +=    index/index.cpp \
                         index/datastream.cpp \
                         index/visitor.cpp \
+						index/query.cpp \
                         index/storage.cpp