Making emacs dependent on internal packages

var/spack/repos/builtin/packages/emacs/package.py

@@ -23,6 +23,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
 from spack import *
+import llnl.util.tty as tty
 
 
 class Emacs(Package):
@@ -33,28 +34,33 @@ class Emacs(Package):
 
     version('24.5', 'd74b597503a68105e61b5b9f6d065b44')
 
-    variant('use-system-deps', default=True, description='Uses the library on the system to compile')
+    variant('X', default=True, description="Enable a X toolkit (GTK+)")
+    variant('gtkplus', default=False, description="Enable a GTK+ as X toolkit (this variant is ignored if ~X)")
 
     depends_on('ncurses')
-    # Emacs also depends on:
-    #     GTK or other widget library
-    #     libtiff, png, etc.
-    # For now, we assume the system provides all that stuff.
-    # For Ubuntu 14.04 LTS:
-    #     sudo apt-get install libgtk-3-dev libxpm-dev
-    #     libtiff5-dev libjpeg8-dev libgif-dev libpng12-dev
-    depends_on('libtiff', when='~use-system-deps')
-    depends_on('libpng', when='~use-system-deps')
+    depends_on('libtiff', when='+X')
+    depends_on('libpng', when='+X')
+    depends_on('libxpm', when='+X')
+    depends_on('giflib', when='+X')
+    depends_on('gtkplus', when='+X+gtkplus')
 
     def install(self, spec, prefix):
-        if '~use-system-deps' in self.spec:
+        args = []
+        if '+X' in spec:
+            if '+gtkplus' in spec:
+                toolkit = 'gtk{0}'.format(spec['gtkplus'].version.up_to(1))
+            else:
+                toolkit = 'no'
             args = [
-                '--with-xpm=no',
-                '--with-gif=no',
+                '--with-x',
+                '--with-x-toolkit={0}'.format(toolkit)
             ]
         else:
-            args = []
+            args = ['--without-x']
+            if '+gtkplus' in spec:
+                tty.warn('The variant +gtkplus is ignored if ~X is selected.')
+
+        configure('--prefix={0}'.format(prefix), *args)
 
-        configure('--prefix=%s' % prefix, *args)
         make()
         make("install")