Minor consistency update

diff --git a/deal.II-toolchain/packages/adolc.package b/deal.II-toolchain/packages/adolc.package
index bb9e2f2634241acb8ceeb55d94c3f281bef098b7..29f0cb31052e5b756aebac04f857c39eb42d4b3e 100644 (file)
--- a/deal.II-toolchain/packages/adolc.package
+++ b/deal.II-toolchain/packages/adolc.package
@@ -2,8 +2,11 @@
 ## ADOLC                                                                      ##
 ################################################################################
 
-# Option {ON|OFF}: Choose whether to load the tarball or the git repository.
-CANDI_ADOLC_LOAD_TARBALL=ON
+# By default load the tarball.
+# To load the git repository define a variable CANDI_ADOLC_LOAD_TARBALL=OFF.
+if [ -z ${CANDI_ADOLC_LOAD_TARBALL} ]; then
+    CANDI_ADOLC_LOAD_TARBALL=ON
+fi
 
 if [ ${CANDI_ADOLC_LOAD_TARBALL} = ON ]; then
     # download release tarball

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 008660b32b24d4f10862cc5a23a735738ac4fa5b..566a42a28f4d5cd25e0e53dd9051bba0360d9b9e 100644 (file)
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -222,7 +222,8 @@ fi
 if [ ! -z "${OPENCASCADE_DIR}" ]; then
     cecho ${INFO} "deal.II: configuration with OPENCASCADE"
     CONFOPTS="${CONFOPTS} \
-      -D DEAL_II_WITH_OPENCASCADE:BOOL=ON"
+      -D DEAL_II_WITH_OPENCASCADE:BOOL=ON \
+      -D OPENCASCADE_DIR=${OPENCASCADE_DIR}"
 fi
 
 ########################################
@@ -253,7 +254,8 @@ fi
 if [ ! -z "${SYMENGINE_DIR}" ]; then
     cecho ${INFO} "deal.II: configuration with SYMENGINE"
     CONFOPTS="${CONFOPTS} \
-      -D DEAL_II_WITH_SYMENGINE:BOOL=ON"
+      -D DEAL_II_WITH_SYMENGINE:BOOL=ON \
+      -D SYMENGINE_DIR=${SYMENGINE_DIR}"
 fi
 
 ########################################
@@ -284,7 +286,8 @@ fi
 if [ ! -z "${ADOLC_DIR}" ]; then
     cecho ${INFO} "deal.II: configuration with ADOLC"
     CONFOPTS="${CONFOPTS} \
-      -D DEAL_II_WITH_ADOLC:BOOL=ON"
+      -D DEAL_II_WITH_ADOLC:BOOL=ON \
+      -D ADOLC_DIR=${ADOLC_DIR}"
 fi
 
 ################################################################################

diff --git a/deal.II-toolchain/packages/gmsh.package b/deal.II-toolchain/packages/gmsh.package
index b4a816b7fb9263377573d20273ca13cc956dccdb..fdc052110abefb4476f50f3b07ebdf6e402a3281 100644 (file)
--- a/deal.II-toolchain/packages/gmsh.package
+++ b/deal.II-toolchain/packages/gmsh.package
@@ -2,8 +2,11 @@
 ## GMSH                                                                       ##
 ################################################################################
 
-# Option {ON|OFF}: Choose whether to load the tarball or the git repository.
-CANDI_GMSH_LOAD_TARBALL=ON
+# By default load the tarball.
+# To load the git repository define a variable CANDI_GMSH_LOAD_TARBALL=OFF.
+if [ -z ${CANDI_GMSH_LOAD_TARBALL} ]; then
+    CANDI_GMSH_LOAD_TARBALL=ON
+fi
 
 if [ ${CANDI_GMSH_LOAD_TARBALL} = ON ]; then
     # see http://gmsh.info/src/

diff --git a/deal.II-toolchain/packages/opencascade.package b/deal.II-toolchain/packages/opencascade.package
index 9a6ea9c3a87337f6dde0c011713c0d5a958e6e24..4922303ae4f3b01cecbf2893b86f26183d2d84f9 100644 (file)
--- a/deal.II-toolchain/packages/opencascade.package
+++ b/deal.II-toolchain/packages/opencascade.package
@@ -2,8 +2,11 @@
 ## OPENCASCADE                                                                ##
 ################################################################################
 
-# Option {ON|OFF}: Choose whether to load the tarball or the git repository.
-CANDI_OPENCASCADE_LOAD_TARBALL=ON
+# By default load the tarball.
+# To load the git repository define a variable CANDI_OPENCASCADE_LOAD_TARBALL=OFF.
+if [ -z ${CANDI_OPENCASCADE_LOAD_TARBALL} ]; then
+    CANDI_OPENCASCADE_LOAD_TARBALL=ON
+fi
 
 if [ ${CANDI_OPENCASCADE_LOAD_TARBALL} = ON ]; then
     # download release tarball

diff --git a/deal.II-toolchain/packages/symengine.package b/deal.II-toolchain/packages/symengine.package
index 066168ac18494c3b4c3bbe448d554d7d6e3eec20..9be8309f0b0bb147f90eb513477a4e251a674d1b 100644 (file)
--- a/deal.II-toolchain/packages/symengine.package
+++ b/deal.II-toolchain/packages/symengine.package
@@ -2,8 +2,11 @@
 ## SYMENGINE                                                                  ##
 ################################################################################
 
-# Option {ON|OFF}: Choose whether to load the tarball or the git repository.
-CANDI_SYMENGINE_LOAD_TARBALL=OFF
+# By default load the tarball.
+# To load the git repository define a variable CANDI_SYMENGINE_LOAD_TARBALL=OFF.
+if [ -z ${CANDI_SYMENGINE_LOAD_TARBALL} ]; then
+    CANDI_SYMENGINE_LOAD_TARBALL=ON
+fi
 
 if [ ${CANDI_SYMENGINE_LOAD_TARBALL} = ON ]; then
     # download release tarball