Cleanup of camera code in preperation for shadows

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f3a612539a2e3bd9d08a5d1e4d9d5916817bf4e3..377725771a735e2f222e77d953c5c3b322e8bb02 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,14 @@ if test "x$with_osg" != "x" ; then
     EXTRA_DIRS="${EXTRA_DIRS} $with_osg"
 fi
 
+# specify Boost location
+AC_ARG_WITH(osg, [  --with-boost=PREFIX       Specify the prefix path to Boost])
+
+if test "x$with_boost" != "x" ; then
+    echo "Boost prefix is $with_boost"
+    EXTRA_DIRS="${EXTRA_DIRS} $with_boost"
+fi
+
 dnl Determine an extra directories to add to include/lib search paths
 case "${host}" in
 *-apple-darwin* | *-*-mingw32*)
@@ -505,6 +513,15 @@ if test "x$ac_cv_header_osg_Version" != "xyes"; then
     exit
 fi
 
+AC_CHECK_HEADER(boost/foreach.hpp)
+if test "x$ac_cv_header_boost_foreach_hpp" != "xyes"; then
+   echo
+   echo "You *must* have the Boost libraries installed."
+   echo
+   echo "configure aborted."
+   exit
+fi
+
 # Find the OSG libraries.  Note special handling for OS X frameworks
 case "${host}" in
 *-apple-darwin*)
@@ -713,6 +730,7 @@ AC_CONFIG_FILES([ \
        utils/fgadmin/src/Makefile \
        utils/js_server/Makefile \
        utils/Modeller/Makefile \
+       utils/propmerge/Makefile \
        utils/TerraSync/Makefile \
        utils/xmlgrep/Makefile \
 ])