From 73012ec4c875a3f8aa7a0a244d7e3b73466a723e Mon Sep 17 00:00:00 2001
From: Glenn Johnson <glennpj@gmail.com>
Date: Wed, 21 Sep 2016 03:56:20 -0500
Subject: Rework libgd package (#1679)

* Added missing libtiff dependency
* added dependency on fontconfig
* Added version 2.2.3
* use autotools rather than cmake

The cmake build was not producing a complete install.
* There was no versioning of the installed libraries.
* gdlib-config was missing
* pkgconfig directory was missing

These problems do not happen when built with autotools.
---
 var/spack/repos/builtin/packages/libgd/package.py | 35 ++++++++++++++++-------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/var/spack/repos/builtin/packages/libgd/package.py b/var/spack/repos/builtin/packages/libgd/package.py
index acfdebb972..6329adf8f3 100644
--- a/var/spack/repos/builtin/packages/libgd/package.py
+++ b/var/spack/repos/builtin/packages/libgd/package.py
@@ -40,18 +40,33 @@ class Libgd(Package):
     homepage = "https://github.com/libgd/libgd"
     url      = "https://github.com/libgd/libgd/archive/gd-2.1.1.tar.gz"
 
+    version('2.2.3', 'a67bd15fa33d4aac0a1c7904aed19f49')
     version('2.1.1', 'e91a1a99903e460e7ba00a794e72cc1e')
 
+    # Build dependencies
+    depends_on('autoconf', type='build')
+    depends_on('automake', type='build')
+    depends_on('libtool', type='build')
+    depends_on('m4', type='build')
+    depends_on('gettext', type='build')
+    depends_on('pkg-config', type='build')
+
     depends_on('libpng')
-    depends_on('cmake', type='build')
+    depends_on('libtiff')
+    depends_on('fontconfig')
 
     def install(self, spec, prefix):
-
-        with working_dir('spack-build', create=True):
-            cmake('..',
-                  '-DENABLE_JPEG:BOOL=ON',
-                  '-DENABLE_PNG:BOOL=ON',
-                  '-DENABLE_TIFF:BOOL=ON',
-                  *std_cmake_args)
-            make()
-            make("install")
+        autoreconf("--install", "--force",
+                   "-I", "m4",
+                   "-I", join_path(spec['gettext'].prefix,
+                                   "share", "aclocal"),
+                   "-I", join_path(spec['pkg-config'].prefix,
+                                   "share", "aclocal"),
+                   "-I", join_path(spec['automake'].prefix,
+                                   "share", "aclocal"),
+                   "-I", join_path(spec['libtool'].prefix,
+                                   "share", "aclocal")
+                   )
+        configure('--prefix={0}'.format(prefix))
+        make()
+        make("install")
-- 
cgit v1.2.3-60-g2f50