From 81ccba202c601edacaf483eacc7373d1947e4875 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Tue, 26 Jan 2016 15:38:22 -0600
Subject: [PATCH] Make szip a variant

---
 .../repos/builtin/packages/hdf/package.py     | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/var/spack/repos/builtin/packages/hdf/package.py b/var/spack/repos/builtin/packages/hdf/package.py
index 43b59802301..1ecb1671836 100644
--- a/var/spack/repos/builtin/packages/hdf/package.py
+++ b/var/spack/repos/builtin/packages/hdf/package.py
@@ -11,8 +11,10 @@ class Hdf(Package):
 
     version('4.2.11', '063f9928f3a19cc21367b71c3b8bbf19')
 
+    variant('szip', default=False, description="Enable szip support")
+
     depends_on("jpeg")
-    depends_on("szip")
+    depends_on("szip", when='+szip')
     depends_on("zlib")
 
 
@@ -21,15 +23,22 @@ def url_for_version(self, version):
 
 
     def install(self, spec, prefix):
-        configure('--prefix=%s' % prefix,
-                  '--with-jpeg=%s'  % spec['jpeg'].prefix,
-                  '--with-szlib=%s' % spec['szip'].prefix,
-                  '--with-zlib=%s'  % spec['zlib'].prefix,
-                  '--disable-netcdf',
-                  '--enable-fortran',
-                  '--disable-shared',
-                  '--enable-static',
-                  '--enable-production')
+        config_args = [
+            '--prefix=%s' % prefix,
+            '--with-jpeg=%s'  % spec['jpeg'].prefix,
+            '--with-zlib=%s'  % spec['zlib'].prefix,
+            '--disable-netcdf',
+            '--enable-fortran',
+            '--disable-shared',
+            '--enable-static',
+            '--enable-production'
+        ]
+
+        # SZip support
+        if '+szip' in spec:
+            config_args.append('--with-szlib=%s' % spec['szip'].prefix)
+
+        configure(*config_args)
 
         make()
         make("install")