From 1c23f88cfb28259319cf7f1d28788544cfe8fb99 Mon Sep 17 00:00:00 2001
From: Graham Bell <g.bell@eaobservatory.org>
Date: Thu, 10 Dec 2015 16:07:37 -1000
Subject: [PATCH] kaplib: Add gsl as a dependency

kaplibs appears to have required GSL as of commit
c1860c19f0ed6b6b6d28c69fcbc02e8ab7055bbb.

(cherry picked from commit 8a8068523ed3aa39388c2338701906d1bbfbe6ef)
---
 Makefile.dependencies           | 12 ++++++++++++
 componentset.xml                |  2 +-
 libraries/kaplibs/component.xml |  2 +-
 libraries/kaplibs/configure.ac  |  4 ++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Makefile.dependencies b/Makefile.dependencies
index a8d9937327d..353e7021e12 100644
--- a/Makefile.dependencies
+++ b/Makefile.dependencies
@@ -160,6 +160,7 @@ $(MANIFESTS)/atools: \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/graphpar \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -283,6 +284,7 @@ $(MANIFESTS)/ccdbig: \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/graphpar \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -467,6 +469,7 @@ $(MANIFESTS)/convert: \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/graphpar \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -544,6 +547,7 @@ $(MANIFESTS)/cupid: \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/graphpar \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -718,6 +722,7 @@ $(MANIFESTS)/dipso: \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/graphpar \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -775,6 +780,7 @@ $(MANIFESTS)/echomop: \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/graphpar \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -1434,6 +1440,7 @@ $(MANIFESTS)/irq: \
 		$(MANIFESTS)/gks \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -1488,6 +1495,7 @@ $(MANIFESTS)/jcmtdr: \
 		$(MANIFESTS)/graphpar \
 		$(MANIFESTS)/grp \
 		$(MANIFESTS)/gsd \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -1548,6 +1556,7 @@ $(MANIFESTS)/kaplibs: \
 		$(MANIFESTS)/gks \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -1593,6 +1602,7 @@ $(MANIFESTS)/kappa: \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/graphpar \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -1650,6 +1660,7 @@ $(MANIFESTS)/kaprh: \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/graphpar \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
@@ -2156,6 +2167,7 @@ $(MANIFESTS)/polpack: \
 		$(MANIFESTS)/gns \
 		$(MANIFESTS)/graphpar \
 		$(MANIFESTS)/grp \
+		$(MANIFESTS)/gsl \
 		$(MANIFESTS)/gwm \
 		$(MANIFESTS)/hds \
 		$(MANIFESTS)/hlp \
diff --git a/componentset.xml b/componentset.xml
index 5db2bace514..4b0e4f98a22 100644
--- a/componentset.xml
+++ b/componentset.xml
@@ -3873,7 +3873,7 @@ KAPLIBS provides software developers with access to many of the internal
 KAPPA routines, so that KAPPA-like applications can be written and built
 independently of KAPPA.</p></abstract>
   <dependencies >
-    <build>pcs</build><build>agi</build><build>ast</build><build>atl</build><build>cat</build><build>chr</build><build>cnf</build><build>fio</build><build>generic</build><build>gks</build><build>gns</build><build>grp</build><build>hds</build><build>idi</build><build>lpg</build><build>mers</build><build>ndf</build><build>ndg</build><build>par</build><build>pcs</build><build>prm</build><build>psx</build><build>sae</build><build>snx</build><build>trn</build><link>agi</link><link>ast</link><link>atl</link><link>cat</link><link>ctg</link><link>fio</link><link>grp</link><link>irq</link><link>lpg</link><link>mers</link><link>ndf</link><link>ndg</link><link>pcs</link><link>pda</link><link>pgplot</link><link>prm</link><link>psx</link><link>psx</link><link>snx</link><link>trn</link><sourceset>htx</sourceset><sourceset>sst</sourceset><sourceset>messgen</sourceset><sourceset>star2html</sourceset>
+    <build>pcs</build><build>agi</build><build>ast</build><build>atl</build><build>cat</build><build>chr</build><build>cnf</build><build>fio</build><build>generic</build><build>gks</build><build>gns</build><build>grp</build><build>gsl</build><build>hds</build><build>idi</build><build>lpg</build><build>mers</build><build>ndf</build><build>ndg</build><build>par</build><build>pcs</build><build>prm</build><build>psx</build><build>sae</build><build>snx</build><build>trn</build><link>agi</link><link>ast</link><link>atl</link><link>cat</link><link>ctg</link><link>fio</link><link>grp</link><link>gsl</link><link>irq</link><link>lpg</link><link>mers</link><link>ndf</link><link>ndg</link><link>pcs</link><link>pda</link><link>pgplot</link><link>prm</link><link>psx</link><link>psx</link><link>snx</link><link>trn</link><sourceset>htx</sourceset><sourceset>sst</sourceset><sourceset>messgen</sourceset><sourceset>star2html</sourceset>
   </dependencies>
   <developers>
     <person>
diff --git a/libraries/kaplibs/component.xml b/libraries/kaplibs/component.xml
index 0a30e717dbb..2687f6dfea0 100644
--- a/libraries/kaplibs/component.xml
+++ b/libraries/kaplibs/component.xml
@@ -13,7 +13,7 @@ KAPLIBS provides software developers with access to many of the internal
 KAPPA routines, so that KAPPA-like applications can be written and built
 independently of KAPPA.</p></abstract>
   <dependencies >
-    <build>pcs</build><build>agi</build><build>ast</build><build>atl</build><build>cat</build><build>chr</build><build>cnf</build><build>fio</build><build>generic</build><build>gks</build><build>gns</build><build>grp</build><build>hds</build><build>idi</build><build>lpg</build><build>mers</build><build>ndf</build><build>ndg</build><build>par</build><build>pcs</build><build>prm</build><build>psx</build><build>sae</build><build>snx</build><build>trn</build><link>agi</link><link>ast</link><link>atl</link><link>cat</link><link>ctg</link><link>fio</link><link>grp</link><link>irq</link><link>lpg</link><link>mers</link><link>ndf</link><link>ndg</link><link>pcs</link><link>pda</link><link>pgplot</link><link>prm</link><link>psx</link><link>psx</link><link>snx</link><link>trn</link><sourceset>htx</sourceset><sourceset>sst</sourceset><sourceset>messgen</sourceset><sourceset>star2html</sourceset>
+    <build>pcs</build><build>agi</build><build>ast</build><build>atl</build><build>cat</build><build>chr</build><build>cnf</build><build>fio</build><build>generic</build><build>gks</build><build>gns</build><build>grp</build><build>gsl</build><build>hds</build><build>idi</build><build>lpg</build><build>mers</build><build>ndf</build><build>ndg</build><build>par</build><build>pcs</build><build>prm</build><build>psx</build><build>sae</build><build>snx</build><build>trn</build><link>agi</link><link>ast</link><link>atl</link><link>cat</link><link>ctg</link><link>fio</link><link>grp</link><link>gsl</link><link>irq</link><link>lpg</link><link>mers</link><link>ndf</link><link>ndg</link><link>pcs</link><link>pda</link><link>pgplot</link><link>prm</link><link>psx</link><link>psx</link><link>snx</link><link>trn</link><sourceset>htx</sourceset><sourceset>sst</sourceset><sourceset>messgen</sourceset><sourceset>star2html</sourceset>
   </dependencies>
   <developers>
     <person>
diff --git a/libraries/kaplibs/configure.ac b/libraries/kaplibs/configure.ac
index 2b8ef294178..26c360342cc 100644
--- a/libraries/kaplibs/configure.ac
+++ b/libraries/kaplibs/configure.ac
@@ -25,8 +25,8 @@ STAR_PRM_COMPATIBLE_SYMBOLS
 STAR_MONOLITHS
 
 dnl    Declare the build and use dependencies for this package
-STAR_DECLARE_DEPENDENCIES(build, [agi ast atl cat chr cnf fio generic gks gns grp hds idi lpg mers ndf ndg par pcs prm psx sae snx trn])
-STAR_DECLARE_DEPENDENCIES(link, [agi ast atl cat ctg fio grp irq lpg mers ndf ndg pcs pda pgplot prm psx psx snx trn])
+STAR_DECLARE_DEPENDENCIES(build, [agi ast atl cat chr cnf fio generic gks gns grp gsl hds idi lpg mers ndf ndg par pcs prm psx sae snx trn])
+STAR_DECLARE_DEPENDENCIES(link, [agi ast atl cat ctg fio grp gsl irq lpg mers ndf ndg pcs pda pgplot prm psx psx snx trn])
 STAR_DECLARE_DEPENDENCIES(sourceset, [htx sst])
 
 dnl    There are numerous messgen files, and all should be listed here, so