Browse files

configure: Add GDAL as a direct dependency of ASP

We use some features of GDAL that we don't acquire through VW. This
requires us to list GDAL directly as a dependency on Ubuntu 12.04. No
free lunches on dependences.
  • Loading branch information...
1 parent 41ec9d3 commit da50fab4469c0e456e98d224b0ed7a4fc585b729 Zack Moratto committed Oct 10, 2012
Showing with 11 additions and 10 deletions.
  1. +11 −10 configure.ac
View
21 configure.ac
@@ -209,6 +209,7 @@ if test x"$PROTOC" = "xno" && test x"$HAVE_PKG_PROTOBUF" = "xyes"; then
AC_MSG_ERROR([cannot find protoc used by protobuf])
fi
AX_PKG(FLANN, [], [-lflann_cpp],[flann/flann.hpp])
+AX_PKG(GDAL, [], [-lgdal], [gdal.h])
# Vision Workbench Core
AX_PKG(VW_CORE, [BOOST_THREAD BOOST BOOST_PROGRAM_OPTIONS LAPACK], [-lvwCore], [vw/Core/Log.h] )
@@ -394,27 +395,27 @@ AX_MODULE(SESSIONS, [src/asp/Sessions], [libaspSessions.la], yes, [CORE], [XERCE
AX_MODULE(MPI, [src/asp/MPI], [], no, [VW_BUNDLEADJUSTMENT ISISIO CORE], [BOOST_SERIALIZATION BOOST_MPI OPEN_MPI VW_ALL])
# Tools
-AX_APP(ALIGNDEM, [src/asp/Tools], no, [VW_MOSAIC VW_CARTOGRAPHY VW_INTEREST_POINT CORE])
+AX_APP(ALIGNDEM, [src/asp/Tools], no, [VW_MOSAIC CORE])
AX_APP(BUNDLEADJUST, [src/asp/Tools], no, [VW_BUNDLEADJUSTMENT SESSIONS])
AX_APP(BUNDLEVIS, [src/asp/Tools], no, [OPENSCENEGRAPH VW_BUNDLEADJUSTMENT CORE])
-AX_APP(DEMPROFILE, [src/asp/Tools], no, [VW VW_CARTOGRAPHY CORE])
-AX_APP(DISPARITYDEBUG, [src/asp/Tools], yes, [VW_STEREO CORE])
-AX_APP(GEODIFF, [src/asp/Tools], no, [BOOST VW VW_CARTOGRAPHY CORE])
-AX_APP(HSVMERGE, [src/asp/Tools], yes, [VW VW_CARTOGRAPHY CORE])
+AX_APP(DEMPROFILE, [src/asp/Tools], no, [CORE])
+AX_APP(DISPARITYDEBUG, [src/asp/Tools], yes, [CORE])
+AX_APP(GEODIFF, [src/asp/Tools], no, [CORE])
+AX_APP(HSVMERGE, [src/asp/Tools], yes, [CORE])
AX_APP(ISISADJUST, [src/asp/Tools], yes, [VW_BUNDLEADJUSTMENT ISISIO CORE])
AX_APP(ISISADJUSTCAMERAERR, [src/asp/Tools], no, [VW_BUNDLEADJUSTMENT CORE ISISIO])
AX_APP(ISISADJUSTCNETCLIP, [src/asp/Tools], no,[VW_BUNDLEADJUSTMENT CORE ISISIO])
-AX_APP(MER2CAMERA, [src/asp/Tools], yes, [VW VW_CAMERA CORE])
+AX_APP(MER2CAMERA, [src/asp/Tools], yes, [CORE])
AX_APP(ORBITVIZ, [src/asp/Tools], yes, [SESSIONS])
AX_APP(ORTHOPROJECT, [src/asp/Tools], yes, [SESSIONS])
AX_APP(PLATEORTHOPROJECT,[src/asp/Tools], no, [VW_PLATE CORE SESSIONS ISISIO])
-AX_APP(POINT2DEM, [src/asp/Tools], yes, [CORE])
-AX_APP(POINT2MESH, [src/asp/Tools], yes, [OPENSCENEGRAPH VW CORE])
-AX_APP(POINT2LAS, [src/asp/Tools], no, [BOOST LASZIP LIBLAS VW VW_CARTOGRAPHY CORE])
+AX_APP(POINT2DEM, [src/asp/Tools], yes, [CORE GDAL])
+AX_APP(POINT2MESH, [src/asp/Tools], yes, [OPENSCENEGRAPH CORE])
+AX_APP(POINT2LAS, [src/asp/Tools], no, [BOOST LASZIP LIBLAS CORE])
AX_APP(RESULTS, [src/asp/Tools], no, [CORE ISISIO])
AX_APP(RMAX2CAHVOR, [src/asp/Tools], no, [SESSIONS])
AX_APP(RMAXADJUST, [src/asp/Tools], no, [VW_BUNDLEADJUSTMENT SESSIONS])
-AX_APP(RPCMAPPROJECT, [src/asp/Tools], yes, [VW VW_CAMERA VW_CARTOGRAPHY CORE SESSIONS])
+AX_APP(RPCMAPPROJECT, [src/asp/Tools], yes, [CORE SESSIONS GDAL])
AX_APP(STEREO, [src/asp/Tools], yes, [SESSIONS])
# Toolkits (like module, but doesn't build a library)

0 comments on commit da50fab

Please sign in to comment.