Permalink
Browse files

Checking in an identical fix to the one just commited for the VW buil…

…d system to support boost 1.35 in the stereo pipeline build system.
  • Loading branch information...
1 parent 246a46f commit 8de059fe6ac4db4ee6187baebff5f74aa7f179f9 @broxtronix broxtronix committed Jun 20, 2008
Showing with 8 additions and 1 deletion.
  1. +8 −1 configure.ac
View
@@ -227,7 +227,13 @@ AX_PKG_PTHREADS
AX_PKG_BOOST
AX_PKG_BOOST_LIB(PROGRAM_OPTIONS, [-lboost_program_options], [boost/program_options.hpp])
-AX_PKG_BOOST_LIB(FILESYSTEM, [-lboost_filesystem], [boost/filesystem/path.hpp])
+AX_PKG_BOOST_LIB(FILESYSTEM_PRE_1_35, [-lboost_filesystem], [boost/filesystem/path.hpp])
+if test "$HAVE_PKG_BOOST_FILESYSTEM_PRE_1_35" = "no"; then
+ echo "Checking for BOOST_FILESYSTEM 1.35 or later..."
+ AX_PKG_BOOST_LIB(FILESYSTEM, [-lboost_filesystem -lboost_system], [boost/filesystem/path.hpp])
+else
+ AX_PKG(BOOST_FILESYSTEM, [BOOST_FILESYSTEM_PRE_1_35], [], [])
+fi
AX_PKG_BOOST_LIB(THREAD, [-lboost_thread], [boost/thread/thread.hpp])
AX_PKG_LAPACK
@@ -269,6 +275,7 @@ AM_CONDITIONAL(HAVE_PKG_ISIS, [test "$HAVE_PKG_ISIS" = "yes"])
##################################################
AX_APP(STEREO, [src], no, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT LAPACK MBA SPICE], [ISIS ISIS3RDPARTY QT_CORE QT_GUI])
+AX_APP(ORTHOPROJECT, [src], no, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT LAPACK MBA SPICE], [ISIS ISIS3RDPARTY QT_CORE QT_GUI])
AX_APP(BUNDLEADJUST, [src], yes, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT LAPACK MBA SPICE], [ISIS ISIS3RDPARTY QT_CORE QT_GUI])
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_CORE QT_GUI])
AX_APP(DISPARITYDEBUG, [src], no, [BOOST BOOST_PROGRAM_OPTIONS VW VW_STEREO])

0 comments on commit 8de059f

Please sign in to comment.