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 3ee23a240783913274f602f7c0b466d05662c476..54ab9bbd1ef9b908c71791c34791e1460d013444 100644 (file)
--- 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 85a148f391da85ef8e7bf116eeea8877d9b71b52..4898df7b169cbd4a18fec0485700bdb12d11e3b4 100644 (file)
--- 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}"
 
 ################################################################################