Permalink
Browse files

clean up configure deps a bit

  • Loading branch information...
1 parent c806fb3 commit c3e0cadd88ab74a8dc44d51358570e7dccc612c2 @novas0x2a novas0x2a committed Jan 17, 2009
Showing with 22 additions and 17 deletions.
  1. +22 −17 configure.ac
View
@@ -192,29 +192,34 @@ AX_PKG(ISIS, [QT ISIS3RDPARTY], [-lisis3], [SpecialPixel.h])
# These are here (instead of inside the PKG macro where they belong)
# for backwards compatability with older versions of automake.
+AM_CONDITIONAL(HAVE_PKG_SPICE, [test "$HAVE_PKG_SPICE" = "yes"])
AM_CONDITIONAL(HAVE_PKG_ISIS, [test "$HAVE_PKG_ISIS" = "yes"])
##################################################
# module definitions
##################################################
-AX_APP(STEREO, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT LAPACK MBA SPICE], [ISIS ISIS3RDPARTY QT])
-AX_APP(STEREOGUI, [src], no, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT LAPACK MBA SPICE], [ISIS ISIS3RDPARTY])
-AX_APP(ORTHOPROJECT, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT LAPACK MBA SPICE], [ISIS ISIS3RDPARTY QT])
-AX_APP(BUNDLEADJUST, [src], no, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT LAPACK MBA SPICE], [ISIS ISIS3RDPARTY QT])
-AX_APP(ORBITVIZ, [src], no, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT LAPACK MBA SPICE], [ISIS ISIS3RDPARTY QT])
-AX_APP(DISPARITYDEBUG, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS VW VW_STEREO])
-AX_APP(POINT2MESH, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS VW OPENSCENEGRAPH])
-AX_APP(POINT2MESH2, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS OPENSCENEGRAPH VW])
-AX_APP(POINT2DEM, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS VW VW_CARTOGRAPHY])
-AX_APP(NURBS, [src], no, [BOOST BOOST_PROGRAM_OPTIONS VW MBA])
-AX_APP(CTXIMAGE, [src], no, [BOOST BOOST_PROGRAM_OPTIONS VW VW_CARTOGRAPHY])
-AX_APP(RMAX2CAHVOR, [src], no, [BOOST VW VW_CAMERA BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM])
-AX_APP(RMAXADJUST, [src], no, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_STEREO VW_INTEREST_POINT LAPACK])
-AX_APP(BUNDLEVIS, [src], no, [BOOST BOOST_PROGRAM_OPTIONS OPENSCENEGRAPH VW VW_CAMERA])
-AX_APP(ISISADJUST, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_STEREO VW_CARTOGRAPHY VW_INTEREST_POINT LAPACK ISIS])
-AX_APP(RESULTS, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_STEREO VW_CARTOGRAPHY VW_INTEREST_POINT LAPACK ISIS])
-AX_APP(CUDATEST, [src], no, [VW CUDA])
+AX_GROUP_PKG(BOOST_COMMON, [BOOST BOOST_PROGRAM_OPTIONS])
+AX_GROUP_PKG(BOOST_ALL, [BOOST_COMMON BOOST_FILESYSTEM])
+AX_GROUP_PKG(VW_ALL, [VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT])
+
+AX_APP(STEREO, [src], yes, [BOOST_ALL VW_ALL LAPACK MBA SPICE], [ISIS])
+AX_APP(STEREOGUI, [src], no, [BOOST_ALL VW_ALL LAPACK MBA SPICE QT], [ISIS])
+AX_APP(ORTHOPROJECT, [src], yes, [BOOST_ALL VW_ALL LAPACK MBA SPICE], [ISIS])
+AX_APP(BUNDLEADJUST, [src], no, [BOOST_ALL VW_ALL LAPACK MBA SPICE], [ISIS])
+AX_APP(ORBITVIZ, [src], no, [BOOST_ALL VW_ALL LAPACK MBA SPICE], [ISIS])
+AX_APP(DISPARITYDEBUG, [src], yes, [BOOST_COMMON VW VW_STEREO])
+AX_APP(POINT2MESH, [src], yes, [BOOST_COMMON VW OPENSCENEGRAPH])
+AX_APP(POINT2MESH2, [src], yes, [BOOST_COMMON VW OPENSCENEGRAPH])
+AX_APP(POINT2DEM, [src], yes, [BOOST_COMMON VW VW_CARTOGRAPHY])
+AX_APP(NURBS, [src], no, [BOOST_COMMON VW MBA])
+AX_APP(CTXIMAGE, [src], no, [BOOST_COMMON VW VW_CARTOGRAPHY])
+AX_APP(RMAX2CAHVOR, [src], no, [BOOST_COMMON VW VW_CAMERA BOOST_FILESYSTEM])
+AX_APP(RMAXADJUST, [src], no, [BOOST_ALL VW VW_CAMERA VW_STEREO VW_INTEREST_POINT LAPACK])
+AX_APP(BUNDLEVIS, [src], no, [BOOST_COMMON OPENSCENEGRAPH VW VW_CAMERA])
+AX_APP(ISISADJUST, [src], yes, [BOOST_ALL VW_ALL ISIS])
+AX_APP(RESULTS, [src], yes, [BOOST_ALL VW_ALL ISIS])
+AX_APP(CUDATEST, [src], no, [VW CUDA])
# These are here (instead of inside the APP macro where they belong)
# for backwards compatability with older versions of automake.

0 comments on commit c3e0cad

Please sign in to comment.