From: maier Date: Sat, 22 Sep 2012 09:35:08 +0000 (+0000) Subject: Update X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88cc5ef667e769c4e24e1c818397d540006a905b;p=dealii-svn.git Update git-svn-id: https://svn.dealii.org/branches/branch_cmake@26630 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/features.m4 b/deal.II/cmake/features.m4 index dc0048acac..cd37735968 100644 --- a/deal.II/cmake/features.m4 +++ b/deal.II/cmake/features.m4 @@ -1,76 +1,3 @@ -dnl ------------------------------------------------------------- -dnl Check for Doxygen. -dnl -dnl Usage: DEAL_II_CHECK_DOXYGEN -dnl -dnl ------------------------------------------------------------- -AC_DEFUN(DEAL_II_CHECK_DOXYGEN, dnl -[ - AC_ARG_WITH(doxygen, - [AS_HELP_STRING([--with-doxygen=filename], - [Use 'filename' for doxygen.])], - DOXYGEN="$withval", - DOXYGEN=) - - dnl lets see whether the file exists - if test "x$DOXYGEN" != "x" ; then - AC_MSG_CHECKING(for specified doxygen path) - if test -r $DOXYGEN ; then - AC_MSG_RESULT($DOXYGEN) - else - AC_MSG_RESULT(not found) - AC_MSG_ERROR(Invalid doxygen path $DOXYGEN) - fi - else - dnl Check doxygen from the regular path. If we can't find it, then - dnl set a flag and come back to that at the end of the ./configure - dnl call. - AC_PATH_PROG(DOXYGEN,doxygen) - if test "x$DOXYGEN" = "x" ; then - doxygen_not_found=yes; - fi - fi - - if test "x$doxygen_not_found" != "xyes" ; then - AC_MSG_CHECKING(doxygen version) - - DOXYGEN_VERSION_STRING=`($DOXYGEN -v 2>&1) | grep "oxygen version"` - case "$DOXYGEN_VERSION_STRING" in - *1.3.* | *1.4.*) - DOXYGEN_OPTIONS="options.136" - AC_MSG_RESULT(pre 1.5) - ;; - *) - DOXYGEN_OPTIONS="options.dox" - AC_MSG_RESULT(1.5.x or later) - ;; - esac - fi - - dnl Doxygen needs 'dot' for inheritance graph generation - DEAL_II_CHECK_DOT -]) - - - -dnl ------------------------------------------------------------- -dnl Check for DOT. -dnl -dnl Usage: DEAL_II_CHECK_DOT -dnl -dnl ------------------------------------------------------------- -AC_DEFUN(DEAL_II_CHECK_DOT, dnl -[ - AC_CHECK_PROG(DOT,dot,dot) - if test "x$DOT" = "x" ; then - DEAL_II_HAVE_DOT=NO; - else - DEAL_II_HAVE_DOT=YES; - fi -]) - - - dnl ------------------------------------------------------------ dnl Check whether some of the HSL functions have been dropped dnl into their respective place in the contrib subdir.