From: Timo Heister <timo.heister@gmail.com>
Date: Mon, 3 Jul 2017 09:12:47 +0000 (+0200)
Subject: remove unused deal.II options
X-Git-Tag: v0.8.5~8^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F40%2Fhead;p=candi.git

remove unused deal.II options

several options no longer exist in deal.II since 8.5, so remove them.
---

diff --git a/candi.cfg b/candi.cfg
index 3ee23a2..54ab9bb 100644
--- a/candi.cfg
+++ b/candi.cfg
@@ -26,9 +26,7 @@ MIRROR="https://www.ces.clemson.edu/dealii/mirror/"
 
 #########################################################################
 #Choose configuration and components of deal.II
-DEAL_CONFOPTS=" \
--D DEAL_II_COMPONENT_PARAMETER_GUI=OFF \
-"
+DEAL_CONFOPTS=""
 
 PACKAGES="load:dealii-prepare"
 #PACKAGES="${PACKAGES} once:arpack-ng"
diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 85a148f..4898df7 100644
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -27,8 +27,6 @@ CONFOPTS=" \
 -D DEAL_II_WITH_BOOST:BOOL=ON \
 -D DEAL_II_FORCE_BUNDLED_BOOST:BOOL=OFF \
 -D DEAL_II_WITH_ZLIB:BOOL=ON \
--D DEAL_II_WITH_FUNCTIONPARSER:BOOL=ON \
--D DEAL_II_COMPONENT_MESH_CONVERTER:BOOL=ON \
 ${DEAL_CONFOPTS}"
 
 ################################################################################