])
+dnl -------------------------------------------------------------
+dnl Check for boost option and find pre-installed boost
+dnl -------------------------------------------------------------
+
+AC_DEFUN(DEAL_II_CHECK_BOOST, dnl
+[ AC_ARG_WITH(boost,
+ [ --with-boost=/path/to/boost use an installed boost library instead of the
+ contributed one. The optional argument points to the directory containing
+ the boost subdirectory for header files.],
+ DEAL_II_WITH_BOOST($withval))
+
+ AC_MSG_NOTICE("Checking for boost include files in $BOOST_INCLUDE_DIR")
+ CPPFLAGS="$BOOST_INCLUDE_DIR $CPPFLAGS"
+ AC_CHECK_HEADER(boost/shared_ptr.hpp,,
+ [AC_MSG_ERROR([Your boost installation is incomplete!])])
+ AC_CHECK_HEADER(boost/type_traits.hpp,,
+ [AC_MSG_ERROR([Your boost installation is incomplete!])])
+ AC_CHECK_HEADER(boost/tuple/tuple.hpp,,
+ [AC_MSG_ERROR([Your boost installation is incomplete!])])
+ DEAL_II_CHECK_BOOST_SHARED_PTR_ASSIGNMENT
+])
dnl -------------------------------------------------------------
dnl The boost::shared_ptr class has a templated assignment operator
#! /bin/sh
-# From configure.in Revision: 1.225 .
+# From configure.in Revision: 1.226 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for deal.II 5.3.pre.
#
BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost/include"
-
-# Check whether --with-boost or --without-boost was given.
-if test "${with_boost+set}" = set; then
- withval="$with_boost"
-
- if test "x$withval" != "xyes" ; then
- BOOST_INCLUDE_DIR="-I$withval"
- else
- BOOST_INCLUDE_DIR=''
- fi
-
-fi;
-
-{ echo "$as_me:$LINENO: \"Checking for boost include files in $BOOST_INCLUDE_DIR\"" >&5
-echo "$as_me: \"Checking for boost include files in $BOOST_INCLUDE_DIR\"" >&6;}
-CPPFLAGS="$BOOST_INCLUDE_DIR $CPPFLAGS"
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
done
-if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
+
+# Check whether --with-boost or --without-boost was given.
+if test "${with_boost+set}" = set; then
+ withval="$with_boost"
+
+ if test "x$withval" != "xyes" ; then
+ BOOST_INCLUDE_DIR="-I$withval"
+ else
+ BOOST_INCLUDE_DIR=''
+ fi
+
+fi;
+
+ { echo "$as_me:$LINENO: \"Checking for boost include files in $BOOST_INCLUDE_DIR\"" >&5
+echo "$as_me: \"Checking for boost include files in $BOOST_INCLUDE_DIR\"" >&6;}
+ CPPFLAGS="$BOOST_INCLUDE_DIR $CPPFLAGS"
+ if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6
if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
fi
-if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then
+ if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then
echo "$as_me:$LINENO: checking for boost/type_traits.hpp" >&5
echo $ECHO_N "checking for boost/type_traits.hpp... $ECHO_C" >&6
if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then
fi
-if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then
+ if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then
echo "$as_me:$LINENO: checking for boost/tuple/tuple.hpp" >&5
echo $ECHO_N "checking for boost/tuple/tuple.hpp... $ECHO_C" >&6
if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then
+
echo "$as_me:$LINENO: result: " >&5
echo "${ECHO_T}" >&6
echo "$as_me:$LINENO: result: ----------------- configuring F77 compilers -----------------" >&5
dnl is stored.
dnl
dnl
-dnl authors: Wolfgang Bangerth, Guido Kanschat, Ralf Hartmann and others
-dnl 1999, 2000, 2001, 2002, 2003, 2004, 2005
+dnl Copyright: The deal.II authors
+dnl 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
dnl
dnl Check for boost option and make sure we get all files
BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost/include"
-AC_ARG_WITH(boost,
- [ --with-boost=/path/to/boost use an installed boost library instead of the
- contributed one. The optional argument points to the directory containing
- the boost subdirectory for header files.],
- DEAL_II_WITH_BOOST($withval))
-
-AC_MSG_NOTICE("Checking for boost include files in $BOOST_INCLUDE_DIR")
-CPPFLAGS="$BOOST_INCLUDE_DIR $CPPFLAGS"
-AC_CHECK_HEADER(boost/shared_ptr.hpp,,
- [AC_MSG_ERROR([Your boost installation is incomplete!])])
-AC_CHECK_HEADER(boost/type_traits.hpp,,
- [AC_MSG_ERROR([Your boost installation is incomplete!])])
-AC_CHECK_HEADER(boost/tuple/tuple.hpp,,
- [AC_MSG_ERROR([Your boost installation is incomplete!])])
-DEAL_II_CHECK_BOOST_SHARED_PTR_ASSIGNMENT
+DEAL_II_CHECK_BOOST
AC_SUBST(BOOST_INCLUDE_DIR)