Add autoconf macro and better variable handling for Boost.

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f3a612539a2e3bd9d08a5d1e4d9d5916817bf4e3..d0e9ac3f18fca756a22255895f2673fccff8b21a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,11 @@ AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
+AX_BOOST_BASE([1.34.0])
+
+if test "x$BOOST_CPPFLAGS" != "x-I/usr/include" ; then
+   CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+fi
 
 # specify the simgear location
 AC_ARG_WITH(simgear, [  --with-simgear=PREFIX   Specify the prefix path to SimGear])
@@ -713,6 +718,7 @@ AC_CONFIG_FILES([ \
        utils/fgadmin/src/Makefile \
        utils/js_server/Makefile \
        utils/Modeller/Makefile \
+       utils/propmerge/Makefile \
        utils/TerraSync/Makefile \
        utils/xmlgrep/Makefile \
 ])