From 94bd90462eb50d189fae3f9a61176c0206bbefab Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Tue, 25 Feb 2020 09:11:32 +0100
Subject: [PATCH] Added spack submodule

---
 .gitmodules    |  3 +++
 configure      | 21 ++-------------------
 external/spack |  1 +
 3 files changed, 6 insertions(+), 19 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 external/spack

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..abf8a90f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "external/spack"]
+	path = external/spack
+	url = https://github.com/spack/spack.git
diff --git a/configure b/configure
index 67741b27..ebd888b6 100755
--- a/configure
+++ b/configure
@@ -10,6 +10,7 @@ export QP_ROOT="$( cd "$(dirname "$0")" ; pwd -P )"
 echo "QP_ROOT="$QP_ROOT
 
 
+# Check if spack is installed. If not, donwload it in external.
 
 # /!\ When updating version, update also etc files
 
@@ -21,7 +22,6 @@ BSE_URL="https://github.com/MolSSI-BSE/basis_set_exchange/archive/v0.8.11.tar.gz
 F77ZMQ_URL="https://github.com/scemama/f77_zmq/archive/v4.2.5.tar.gz"
 GMP_URL="ftp://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.bz2"
 IRPF90_URL="https://gitlab.com/scemama/irpf90/-/archive/v1.7.6/irpf90-v1.7.6.tar.gz"
-LIBCAP_URL="https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/snapshot/libcap-2.25.tar.gz"
 NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip"
 OCAML_URL="https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh"
 RESULTS_URL="https://gitlab.com/scemama/resultsFile/-/archive/v1.0/resultsFile-v1.0.tar.gz"
@@ -207,7 +207,7 @@ if [[ "${PACKAGES}.x" != ".x" ]] ; then
 fi
 
 if [[ ${PACKAGES} = all ]] ; then
-        PACKAGES="zlib ninja irpf90 zeromq f77zmq gmp libcap bwrap opam opam_packages ezfio docopt resultsFile bats"
+        PACKAGES="zlib ninja irpf90 zeromq f77zmq gmp bwrap opam opam_packages ezfio docopt resultsFile bats"
 fi
 
 
@@ -234,17 +234,6 @@ EOF
               make install
 EOF
     
-    elif [[ ${PACKAGE} = libcap ]] ; then
-
-            download ${LIBCAP_URL} "${QP_ROOT}"/external/libcap.tar.gz
-            execute << EOF
-              cd "\${QP_ROOT}"/external
-              tar --gunzip --extract --file libcap.tar.gz
-              rm libcap.tar.gz
-              cd libcap-*/libcap
-              prefix=$QP_ROOT make install
-EOF
-
     elif [[ ${PACKAGE} = bwrap ]] ; then
 
             download ${BUBBLE_URL} "${QP_ROOT}"/external/bwrap.tar.xz
@@ -441,12 +430,6 @@ if [[ ${ZLIB} = $(not_found) ]] ; then
         fail
 fi
 
-LIBCAP=$(find_lib -lcap)
-if [[ ${LIBCAP} = $(not_found) ]] ; then
-        error "Libcap (libcap) is not installed."
-        fail
-fi
-
 BWRAP=$(find_exe bwrap)
 if [[ ${BWRAP} = $(not_found) ]] ; then
         error "Bubblewrap (bwrap) is not installed."
diff --git a/external/spack b/external/spack
new file mode 160000
index 00000000..21afb13b
--- /dev/null
+++ b/external/spack
@@ -0,0 +1 @@
+Subproject commit 21afb13be6ceb35dde871478f555eb4033abaa49