From: Wolfgang Bangerth Date: Tue, 17 May 2011 01:33:43 +0000 (+0000) Subject: Set the boost path to a directory that has its own version number. This has the advan... X-Git-Tag: v8.0.0~4060 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=099f7cf3482c671e17df5dce6798e52afe0ab5b8;p=dealii.git Set the boost path to a directory that has its own version number. This has the advantage that we can now atomically add a new version of boost and delete the previous one, rather than doing the three-step we previously had (add new, delete old, move over new; or delete old and add new) that typically also confuses svn and leads to directories that are a mess. git-svn-id: https://svn.dealii.org/trunk@23705 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/configure b/deal.II/configure index 50c52d08f5..2da741e27b 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 23358 . +# From configure.in Revision: 23704 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for deal.II 7.1.pre. # @@ -9767,7 +9767,7 @@ $as_echo "" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: ---------------- configuring additional libs ----------------" >&5 $as_echo "---------------- configuring additional libs ----------------" >&6; } -BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost/include" +BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost-1.46.1/include" # Check whether --with-boost was given. diff --git a/deal.II/configure.in b/deal.II/configure.in index 629f86ee38..9907e151d1 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -448,7 +448,7 @@ dnl Check for boost option and make sure we get all files. dnl Since we may want to use an external boost installation dnl this test needs to run after we determine whether -rpath dnl works -BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost/include" +BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost-1.46.1/include" DEAL_II_CHECK_BOOST DEAL_II_CHECK_BOOST_BIND_COMPILER_BUG DEAL_II_CHECK_BOOST_GRAPH_COMPILER_BUG