From 38db40aa07998d20e22cfdcbab1f9902b169d078 Mon Sep 17 00:00:00 2001
From: "Peter W. Draper"
Date: Wed, 29 Jan 2014 17:40:02 +0000
Subject: [PATCH] autotools: update applications/ and libraries/ so that all
the subcomponents can be bootstrapped after being git cleaned.
The issue is that without an auxdir autoconf looks for the install-sh script
in . ../ and ../../ which usually succeeds in ../, sadly that directory will
never contain ltmain.sh for instance, so we need to make sure that all links
to install-sh etc. are local to the sub-component.
---
applications/astrom/configure.ac | 1 +
applications/atools/configure.ac | 1 +
applications/ccdpack/configure.ac | 1 +
applications/coco/configure.ac | 3 ++-
applications/convert/configure.ac | 1 +
applications/convert/idl/configure.ac | 1 +
applications/cupid/configure.ac | 1 +
applications/cursa/configure.ac | 1 +
applications/daophot/configure.ac | 1 +
applications/datacube/configure.ac | 1 +
applications/dipso/configure.ac | 1 +
applications/docfind/configure.ac | 1 +
applications/echomop/configure.ac | 1 +
applications/echwind/configure.ac | 1 +
applications/esp/configure.ac | 3 +++
applications/extractor/configure.ac | 1 +
applications/extreme/configure.ac | 1 +
applications/figaro/Makefile.am | 2 ++
applications/figaro/configure.ac | 3 ++-
applications/findcoords/configure.ac | 1 +
applications/fluxes/configure.ac | 1 +
applications/gaia/configure.ac | 2 +-
applications/generic/configure.ac | 1 +
applications/hdstools/configure.ac | 1 +
applications/hdstrace/configure.ac | 1 +
applications/htx/configure.ac | 1 +
applications/icl/configure.ac | 1 +
applications/ifd/configure.ac | 1 +
applications/kappa/configure.ac | 1 +
applications/kaprh/configure.ac | 1 +
applications/messgen/configure.ac | 1 +
applications/news/configure.ac | 1 +
applications/observe/configure.ac | 1 +
applications/pamela/configure.ac | 1 +
applications/period/configure.ac | 1 +
applications/photom/configure.ac | 1 +
applications/pisa/configure.ac | 1 +
applications/polpack/configure.ac | 1 +
applications/pongo/configure.ac | 1 +
applications/psmerge/configure.ac | 1 +
applications/rv/configure.ac | 1 +
applications/sgmlkit/configure.ac | 1 +
applications/smurf/configure.ac | 1 +
applications/specx/configure.ac | 1 +
applications/spt/configure.ac | 1 +
applications/sst/configure.ac | 1 +
applications/star2html/configure.ac | 1 +
applications/startcl/configure.ac | 1 +
applications/starx/configure.ac | 1 +
applications/surf/configure.ac | 1 +
applications/tsp/configure.ac | 1 +
applications/xdisplay/configure.ac | 1 +
libraries/agi/configure.ac | 1 +
libraries/ard/configure.ac | 1 +
libraries/ary/configure.ac | 1 +
libraries/ast/configure.ac | 1 +
libraries/atl/configure.ac | 1 +
libraries/cat/configure.ac | 1 +
libraries/chr/configure.ac | 1 +
libraries/cnf/configure.ac | 2 +-
libraries/ctg/configure.ac | 1 +
libraries/cvg/configure.ac | 1 +
libraries/ems/configure.ac | 1 +
libraries/fio/configure.ac | 4 ++++
libraries/gks/configure.ac | 1 +
libraries/gns/configure.ac | 1 +
libraries/graphpar/configure.ac | 1 +
libraries/grp/configure.ac | 1 +
libraries/gsd/configure.ac | 1 +
libraries/gwm/configure.ac | 1 +
libraries/hds/configure.ac | 1 +
libraries/hlp/configure.ac | 1 +
libraries/idi/configure.ac | 1 +
libraries/img/configure.ac | 1 +
libraries/irq/configure.ac | 1 +
libraries/kaplibs/configure.ac | 1 +
libraries/lpg/configure.ac | 1 +
libraries/mers/configure.ac | 1 +
libraries/nbs/configure.ac | 1 +
libraries/ndf/configure.ac | 1 +
libraries/ndg/configure.ac | 1 +
libraries/one/configure.ac | 1 +
libraries/par/configure.ac | 1 +
libraries/pcs/configure.ac | 1 +
libraries/pda/configure.ac | 1 +
libraries/pgp/configure.ac | 1 +
libraries/prm/configure.ac | 1 +
libraries/psx/configure.ac | 1 +
libraries/ref/configure.ac | 1 +
libraries/sae/configure.ac | 1 +
libraries/sgs/configure.ac | 1 +
libraries/shl/configure.ac | 1 +
libraries/sla/configure.ac | 1 +
libraries/snx/configure.ac | 1 +
libraries/starmem/configure.ac | 1 +
libraries/starutil/configure.ac | 1 +
libraries/thr/configure.ac | 1 +
libraries/trn/configure.ac | 1 +
thirdparty/heasarc/cfitsio/configure.ac | 1 +
99 files changed, 107 insertions(+), 4 deletions(-)
diff --git a/applications/astrom/configure.ac b/applications/astrom/configure.ac
index c910ad92b00..e12a6479c3c 100644
--- a/applications/astrom/configure.ac
+++ b/applications/astrom/configure.ac
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script
AC_REVISION($Revision$)
AC_INIT([astrom],[3.8],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
AC_PREREQ([2.69])
AM_INIT_AUTOMAKE(1.8.2-starlink)
diff --git a/applications/atools/configure.ac b/applications/atools/configure.ac
index 21913a2763b..d5999579c17 100644
--- a/applications/atools/configure.ac
+++ b/applications/atools/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(atools, 1.9-14, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
diff --git a/applications/ccdpack/configure.ac b/applications/ccdpack/configure.ac
index a44e0f922f6..58316242331 100644
--- a/applications/ccdpack/configure.ac
+++ b/applications/ccdpack/configure.ac
@@ -1,4 +1,5 @@
AC_INIT([ccdpack],[4.1-1],[ccdpack@starlink.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
AC_PREREQ([2.69])
AM_INIT_AUTOMAKE(1.8.2-starlink)
AC_CONFIG_SRCDIR(ccdexercise)
diff --git a/applications/coco/configure.ac b/applications/coco/configure.ac
index bfbba5dd1b6..cc4af817ded 100644
--- a/applications/coco/configure.ac
+++ b/applications/coco/configure.ac
@@ -3,7 +3,8 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([coco],[2.2-8],[starlink@jiscmail.ac.uk])
-
+AC_CONFIG_AUX_DIR([build-aux])
+
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
AM_INIT_AUTOMAKE(1.8.2-starlink)
diff --git a/applications/convert/configure.ac b/applications/convert/configure.ac
index 5c6c0bad77d..0b3b52fa614 100644
--- a/applications/convert/configure.ac
+++ b/applications/convert/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([convert],[1.7-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/convert/idl/configure.ac b/applications/convert/idl/configure.ac
index eb68a515c97..7f2f59015af 100644
--- a/applications/convert/idl/configure.ac
+++ b/applications/convert/idl/configure.ac
@@ -5,6 +5,7 @@ dnl Initialisation: package name and version number
dnl Note we use the name "convert" not convert-idl, this is a slight of
dnl hand to use the same per-package-dirs as convert.
AC_INIT([convert],[1.5-4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/cupid/configure.ac b/applications/cupid/configure.ac
index 78ccffacc45..4d2223587f7 100644
--- a/applications/cupid/configure.ac
+++ b/applications/cupid/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([cupid],[2.0],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
PACKAGE_UPCASE='CUPID'
AC_DEFINE( [PACKAGE_UPCASE], "CUPID", [Upper cased package name] )
AC_SUBST(PACKAGE_UPCASE)
diff --git a/applications/cursa/configure.ac b/applications/cursa/configure.ac
index ad98daa06e0..fbad3e34476 100644
--- a/applications/cursa/configure.ac
+++ b/applications/cursa/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([cursa],[6.5],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/daophot/configure.ac b/applications/daophot/configure.ac
index 495491bb6df..c789762a0db 100644
--- a/applications/daophot/configure.ac
+++ b/applications/daophot/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([daophot],[1.3-6],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/datacube/configure.ac b/applications/datacube/configure.ac
index aab3fbc5789..abf71d22a9a 100644
--- a/applications/datacube/configure.ac
+++ b/applications/datacube/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([datacube],[1.3],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/dipso/configure.ac b/applications/dipso/configure.ac
index 3d27430e58b..12b3c592904 100644
--- a/applications/dipso/configure.ac
+++ b/applications/dipso/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number.
AC_INIT([dipso],[3.6-5],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/docfind/configure.ac b/applications/docfind/configure.ac
index 7dd66736215..e13c582e68d 100644
--- a/applications/docfind/configure.ac
+++ b/applications/docfind/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(docfind, 1.3-2, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
diff --git a/applications/echomop/configure.ac b/applications/echomop/configure.ac
index 1b8c7f35212..715ed53917c 100644
--- a/applications/echomop/configure.ac
+++ b/applications/echomop/configure.ac
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script
AC_REVISION($Revision$)
AC_INIT([echomop],[3.3-7],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
AC_PREREQ([2.69])
AM_INIT_AUTOMAKE(1.8.2-starlink)
diff --git a/applications/echwind/configure.ac b/applications/echwind/configure.ac
index 7710eba3a62..d5f43044bc8 100644
--- a/applications/echwind/configure.ac
+++ b/applications/echwind/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([echwind],[3.1-4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/esp/configure.ac b/applications/esp/configure.ac
index 64625e82c62..dced612b03a 100644
--- a/applications/esp/configure.ac
+++ b/applications/esp/configure.ac
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script
AC_REVISION($Revision$)
AC_INIT([esp],[0.11-4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
AC_PREREQ([2.69])
AM_INIT_AUTOMAKE(1.8.2-starlink)
@@ -15,6 +16,8 @@ AC_PROG_FC
dnl AC_PROG_LIBTOOL
STAR_MONOLITHS
+LT_INIT
+
dnl Other options here, such as
STAR_CNF_COMPATIBLE_SYMBOLS
STAR_CHECK_PROGS( hlib )
diff --git a/applications/extractor/configure.ac b/applications/extractor/configure.ac
index d9ff9cb9ffe..a3bfb96e5f3 100644
--- a/applications/extractor/configure.ac
+++ b/applications/extractor/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([extractor],[2.5-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/extreme/configure.ac b/applications/extreme/configure.ac
index ea634a795f0..6accdc27529 100644
--- a/applications/extreme/configure.ac
+++ b/applications/extreme/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(extreme, 0.1-1, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
diff --git a/applications/figaro/Makefile.am b/applications/figaro/Makefile.am
index 91dd7037469..f610370ee78 100644
--- a/applications/figaro/Makefile.am
+++ b/applications/figaro/Makefile.am
@@ -1,5 +1,7 @@
## Process this file with automake to produce Makefile.in
+ACLOCAL_AMFLAGS = -I build-aux
+
bin_SCRIPTS = figaro.csh figaro.icl figaro.sh
dist_bin_SCRIPTS = specdre.csh specdre.icl twodspec.csh twodspec.icl \
diff --git a/applications/figaro/configure.ac b/applications/figaro/configure.ac
index 2cabcdb8821..1a76ba0de1d 100644
--- a/applications/figaro/configure.ac
+++ b/applications/figaro/configure.ac
@@ -3,7 +3,8 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([figaro],[5.6-6],[starlink@jiscmail.ac.uk])
-
+AC_CONFIG_AUX_DIR([build-aux])
+
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/findcoords/configure.ac b/applications/findcoords/configure.ac
index 2ce35ffaf39..22323164c9a 100644
--- a/applications/findcoords/configure.ac
+++ b/applications/findcoords/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(findcoords, 1.0-2, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
diff --git a/applications/fluxes/configure.ac b/applications/fluxes/configure.ac
index 1d102612205..fd406757928 100644
--- a/applications/fluxes/configure.ac
+++ b/applications/fluxes/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([fluxes],[1.4-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/gaia/configure.ac b/applications/gaia/configure.ac
index 2209cf2443c..ce97c8fee0f 100644
--- a/applications/gaia/configure.ac
+++ b/applications/gaia/configure.ac
@@ -8,12 +8,12 @@ dnl scripts have been updated (this normally requires a bootstrap,
dnl configure, bootstrap, the configure updates the local directories
dnl which then require regenerating again).
AC_INIT([gaia],[4.4-5],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
dnl Require Starlink automake
AM_INIT_AUTOMAKE([1.8.2-starlink])
-AC_CONFIG_MACRO_DIR([m4])
dnl Sanity-check: name a file in the source directory -- if this
dnl isn't found then configure will complain
diff --git a/applications/generic/configure.ac b/applications/generic/configure.ac
index 6a812725512..082dc598f4a 100644
--- a/applications/generic/configure.ac
+++ b/applications/generic/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(generic, 1.3, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
diff --git a/applications/hdstools/configure.ac b/applications/hdstools/configure.ac
index 3fff325f615..f903f25bcf9 100644
--- a/applications/hdstools/configure.ac
+++ b/applications/hdstools/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(hdstools, 1.0-2, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
diff --git a/applications/hdstrace/configure.ac b/applications/hdstrace/configure.ac
index 3d1ba332ee0..7e9998f60e9 100644
--- a/applications/hdstrace/configure.ac
+++ b/applications/hdstrace/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([hdstrace],[1.2-3],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/htx/configure.ac b/applications/htx/configure.ac
index 83390b56c5d..3755867a6f4 100644
--- a/applications/htx/configure.ac
+++ b/applications/htx/configure.ac
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script
AC_REVISION($Revision$)
AC_INIT(htx, 1.3-2, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
AC_PREREQ(2.50)
AM_INIT_AUTOMAKE(1.8.2-starlink)
AC_CONFIG_SRCDIR([showme])
diff --git a/applications/icl/configure.ac b/applications/icl/configure.ac
index 81f2ea1862a..8d70da50bea 100644
--- a/applications/icl/configure.ac
+++ b/applications/icl/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([icl],[3.1-11],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/ifd/configure.ac b/applications/ifd/configure.ac
index b999de15e8d..1de4d137787 100644
--- a/applications/ifd/configure.ac
+++ b/applications/ifd/configure.ac
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script
AC_REVISION($Revision$)
AC_INIT(ifd, 1.2-8, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
AC_PREREQ(2.50)
AM_INIT_AUTOMAKE(1.8.2-starlink)
AC_CONFIG_SRCDIR([ifd2star.in])
diff --git a/applications/kappa/configure.ac b/applications/kappa/configure.ac
index 3b49b536d0a..4b45f9f335e 100644
--- a/applications/kappa/configure.ac
+++ b/applications/kappa/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(kappa, 2.1-9, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/kaprh/configure.ac b/applications/kaprh/configure.ac
index db5399af5c1..3b043dd0d51 100644
--- a/applications/kaprh/configure.ac
+++ b/applications/kaprh/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([kaprh],[2.0],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/messgen/configure.ac b/applications/messgen/configure.ac
index 37765e1b44a..c0693adf7b8 100644
--- a/applications/messgen/configure.ac
+++ b/applications/messgen/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([messgen],[1.2],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/news/configure.ac b/applications/news/configure.ac
index 60d433fe848..8b5e7859958 100644
--- a/applications/news/configure.ac
+++ b/applications/news/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(news, 2.1-2, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
diff --git a/applications/observe/configure.ac b/applications/observe/configure.ac
index a2889d911b2..65b2a68639d 100644
--- a/applications/observe/configure.ac
+++ b/applications/observe/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([observe],[2.3-2],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/pamela/configure.ac b/applications/pamela/configure.ac
index 444cba89932..5d46024af89 100644
--- a/applications/pamela/configure.ac
+++ b/applications/pamela/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([pamela],[1.0.6],[t.r.marsh@warwick.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/period/configure.ac b/applications/period/configure.ac
index d0add914612..46c213277ab 100644
--- a/applications/period/configure.ac
+++ b/applications/period/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([period],[5.0-4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/photom/configure.ac b/applications/photom/configure.ac
index 1335d0926ac..3888b14c891 100644
--- a/applications/photom/configure.ac
+++ b/applications/photom/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([photom],[1.12-2],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/pisa/configure.ac b/applications/pisa/configure.ac
index 1cf74a311ab..6b5659c108c 100644
--- a/applications/pisa/configure.ac
+++ b/applications/pisa/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([pisa],[2.4-8],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/polpack/configure.ac b/applications/polpack/configure.ac
index 3a1b74d1bf0..76c97af244f 100644
--- a/applications/polpack/configure.ac
+++ b/applications/polpack/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([polpack],[3.2-0],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/pongo/configure.ac b/applications/pongo/configure.ac
index 7752e496feb..8b7809d4419 100644
--- a/applications/pongo/configure.ac
+++ b/applications/pongo/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([pongo],[2.0-3],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/psmerge/configure.ac b/applications/psmerge/configure.ac
index cd87fba3aa1..a8dd101c7f6 100644
--- a/applications/psmerge/configure.ac
+++ b/applications/psmerge/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([psmerge],[1.0-7],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/rv/configure.ac b/applications/rv/configure.ac
index 16d118afe47..8d00620d44f 100644
--- a/applications/rv/configure.ac
+++ b/applications/rv/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([rv],[2.4-5],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/sgmlkit/configure.ac b/applications/sgmlkit/configure.ac
index a638fc221b0..ff97d21eac8 100644
--- a/applications/sgmlkit/configure.ac
+++ b/applications/sgmlkit/configure.ac
@@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script
AC_INIT(sgmlkit, 0.7-13, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
AC_PREREQ(2.50)
AM_INIT_AUTOMAKE(1.8.2-starlink)
diff --git a/applications/smurf/configure.ac b/applications/smurf/configure.ac
index b54889b6db3..4c624be1eef 100644
--- a/applications/smurf/configure.ac
+++ b/applications/smurf/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([smurf],[1.5.0],[scuba2dr@phas.ubc.ca])
+AC_CONFIG_AUX_DIR([build-aux])
PACKAGE_UPCASE='SMURF'
AC_DEFINE( [PACKAGE_UPCASE], "SMURF", [Upper cased package name] )
AC_SUBST(PACKAGE_UPCASE)
diff --git a/applications/specx/configure.ac b/applications/specx/configure.ac
index 3064204f1c8..4177e0eb88f 100644
--- a/applications/specx/configure.ac
+++ b/applications/specx/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([specx],[6.8-5],[t.jenness@jach.hawaii.edu])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/spt/configure.ac b/applications/spt/configure.ac
index 9648a9b17c0..03e04a2c565 100644
--- a/applications/spt/configure.ac
+++ b/applications/spt/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([spt],[1.3-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/sst/configure.ac b/applications/sst/configure.ac
index 2829818a956..b83275b8dc1 100644
--- a/applications/sst/configure.ac
+++ b/applications/sst/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([sst],[1.1-2],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/star2html/configure.ac b/applications/star2html/configure.ac
index 1da1b5160dc..42ecb9156bc 100644
--- a/applications/star2html/configure.ac
+++ b/applications/star2html/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(star2html, 1.7-1, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
diff --git a/applications/startcl/configure.ac b/applications/startcl/configure.ac
index 2a6846f56c7..db823ec6a2f 100644
--- a/applications/startcl/configure.ac
+++ b/applications/startcl/configure.ac
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script
AC_REVISION($Revision$)
AC_INIT([startcl],[1.5-7],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
AC_PREREQ([2.69])
AM_INIT_AUTOMAKE(1.8.2-starlink)
diff --git a/applications/starx/configure.ac b/applications/starx/configure.ac
index e97c4921dda..d6778269e26 100644
--- a/applications/starx/configure.ac
+++ b/applications/starx/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([starx],[1.2-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/surf/configure.ac b/applications/surf/configure.ac
index 0b3f48f1b09..05b8941275f 100644
--- a/applications/surf/configure.ac
+++ b/applications/surf/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([surf],[1.8-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/tsp/configure.ac b/applications/tsp/configure.ac
index beb0b22adde..ce8a3f6dd05 100644
--- a/applications/tsp/configure.ac
+++ b/applications/tsp/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([tsp],[2.3-4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/applications/xdisplay/configure.ac b/applications/xdisplay/configure.ac
index 5877750588e..0caaff0b847 100644
--- a/applications/xdisplay/configure.ac
+++ b/applications/xdisplay/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(xdisplay, 2.2, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
diff --git a/libraries/agi/configure.ac b/libraries/agi/configure.ac
index 8b73a4056d8..a9bc92ef372 100644
--- a/libraries/agi/configure.ac
+++ b/libraries/agi/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([agi],[2.2-0],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/ard/configure.ac b/libraries/ard/configure.ac
index 14ad8d4282c..47f3d870db9 100644
--- a/libraries/ard/configure.ac
+++ b/libraries/ard/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([ard],[2.3],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/ary/configure.ac b/libraries/ary/configure.ac
index 33374f6c250..62854a7a80c 100644
--- a/libraries/ary/configure.ac
+++ b/libraries/ary/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([ary],[1.4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/ast/configure.ac b/libraries/ast/configure.ac
index d1e070ac693..fed6e5b1b91 100644
--- a/libraries/ast/configure.ac
+++ b/libraries/ast/configure.ac
@@ -8,6 +8,7 @@ dnl automake 1.6 or better.
dnl Initialisation: package name and version number
AC_INIT([ast],[7.3.4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/atl/configure.ac b/libraries/atl/configure.ac
index 1946f47c106..418cdd5553d 100644
--- a/libraries/atl/configure.ac
+++ b/libraries/atl/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([atl],[1.6],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/cat/configure.ac b/libraries/cat/configure.ac
index 2743dabedec..ef61fb14092 100644
--- a/libraries/cat/configure.ac
+++ b/libraries/cat/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([cat],[8.3],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/chr/configure.ac b/libraries/chr/configure.ac
index 0be046297b1..54c47973f86 100644
--- a/libraries/chr/configure.ac
+++ b/libraries/chr/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([chr],[2.4-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/cnf/configure.ac b/libraries/cnf/configure.ac
index a8d8187eb75..54fb7cf8dfd 100644
--- a/libraries/cnf/configure.ac
+++ b/libraries/cnf/configure.ac
@@ -3,7 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([cnf],[5.1-0],[starlink@jiscmail.ac.uk])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/ctg/configure.ac b/libraries/ctg/configure.ac
index d6bd7aac68d..7befe0e1946 100644
--- a/libraries/ctg/configure.ac
+++ b/libraries/ctg/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([ctg],[3.0-2],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/cvg/configure.ac b/libraries/cvg/configure.ac
index c4e219a35f0..7172e0ae197 100644
--- a/libraries/cvg/configure.ac
+++ b/libraries/cvg/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([cvg],[1.0],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/ems/configure.ac b/libraries/ems/configure.ac
index 12a857add3f..deb99e30a74 100644
--- a/libraries/ems/configure.ac
+++ b/libraries/ems/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([ems],[2.4-0],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/fio/configure.ac b/libraries/fio/configure.ac
index c02cba122bd..50ace0c3a33 100644
--- a/libraries/fio/configure.ac
+++ b/libraries/fio/configure.ac
@@ -3,6 +3,10 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([fio],[1.5-4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
+
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/gks/configure.ac b/libraries/gks/configure.ac
index 4e6c90bfd76..b0eae0eaccf 100644
--- a/libraries/gks/configure.ac
+++ b/libraries/gks/configure.ac
@@ -6,6 +6,7 @@ dnl Note that for GKS the RAL version number is 1.37 but
dnl Starlink does not increment that version. Rather than use
dnl non-standard nomenclature use the patch level for starlink patching.
AC_INIT([gks],[1.37-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/gns/configure.ac b/libraries/gns/configure.ac
index 7d0e280c214..a4016215f52 100644
--- a/libraries/gns/configure.ac
+++ b/libraries/gns/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([gns],[1.1-4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/graphpar/configure.ac b/libraries/graphpar/configure.ac
index 0eca9c741ff..787b47d19e7 100644
--- a/libraries/graphpar/configure.ac
+++ b/libraries/graphpar/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([graphpar],[1.1-6],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/grp/configure.ac b/libraries/grp/configure.ac
index d9364ce6865..69d520bd707 100644
--- a/libraries/grp/configure.ac
+++ b/libraries/grp/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([grp],[3.7],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/gsd/configure.ac b/libraries/gsd/configure.ac
index f5dd92e3056..2e4f676b6d7 100644
--- a/libraries/gsd/configure.ac
+++ b/libraries/gsd/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([gsd],[1.0-2],[t.jenness@jach.hawaii.edu])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/gwm/configure.ac b/libraries/gwm/configure.ac
index 534d8d6fbd6..3a5a561aa11 100644
--- a/libraries/gwm/configure.ac
+++ b/libraries/gwm/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([gwm],[1.5-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/hds/configure.ac b/libraries/hds/configure.ac
index e6c078910a1..fab01ac7283 100644
--- a/libraries/hds/configure.ac
+++ b/libraries/hds/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([hds],[5.1-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/hlp/configure.ac b/libraries/hlp/configure.ac
index 5ee1df98154..1287d3daf29 100644
--- a/libraries/hlp/configure.ac
+++ b/libraries/hlp/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([hlp],[4.0-3],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/idi/configure.ac b/libraries/idi/configure.ac
index e17837c4310..0d23717bf76 100644
--- a/libraries/idi/configure.ac
+++ b/libraries/idi/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([idi],[1.4-5],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/img/configure.ac b/libraries/img/configure.ac
index a1b22a1b648..4565a9b4c76 100644
--- a/libraries/img/configure.ac
+++ b/libraries/img/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([img],[1.3-2],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/irq/configure.ac b/libraries/irq/configure.ac
index f82ed2fa2fd..a5d1d9bbc26 100644
--- a/libraries/irq/configure.ac
+++ b/libraries/irq/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([irq],[4.0],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/kaplibs/configure.ac b/libraries/kaplibs/configure.ac
index 8f595fec1f6..2b8ef294178 100644
--- a/libraries/kaplibs/configure.ac
+++ b/libraries/kaplibs/configure.ac
@@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script
AC_REVISION($Revision$)
AC_INIT([kaplibs],[3.5],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
AC_PREREQ([2.69])
AM_INIT_AUTOMAKE(1.8.2-starlink)
diff --git a/libraries/lpg/configure.ac b/libraries/lpg/configure.ac
index 18e4ef4329f..bd0e349d8b3 100644
--- a/libraries/lpg/configure.ac
+++ b/libraries/lpg/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([lpg],[3.0],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/mers/configure.ac b/libraries/mers/configure.ac
index a412d6dcfe9..0064b7510b9 100644
--- a/libraries/mers/configure.ac
+++ b/libraries/mers/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([mers],[2.2-0],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/nbs/configure.ac b/libraries/nbs/configure.ac
index 1f1e0f81089..5fcc653b3f0 100644
--- a/libraries/nbs/configure.ac
+++ b/libraries/nbs/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([nbs],[2.5-10],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/ndf/configure.ac b/libraries/ndf/configure.ac
index 80f4f870cce..59d621516c1 100644
--- a/libraries/ndf/configure.ac
+++ b/libraries/ndf/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([ndf],[1.12-2],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/ndg/configure.ac b/libraries/ndg/configure.ac
index 3c67293c5ca..d1357b3aef7 100644
--- a/libraries/ndg/configure.ac
+++ b/libraries/ndg/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([ndg],[7.1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/one/configure.ac b/libraries/one/configure.ac
index b38b8da5ef8..6b48659a86b 100644
--- a/libraries/one/configure.ac
+++ b/libraries/one/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([one],[1.5-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/par/configure.ac b/libraries/par/configure.ac
index f4a6d0dfa91..ea142747b91 100644
--- a/libraries/par/configure.ac
+++ b/libraries/par/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([par],[2.3-2],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/pcs/configure.ac b/libraries/pcs/configure.ac
index 4f6f39dec17..76f0a63bf2d 100644
--- a/libraries/pcs/configure.ac
+++ b/libraries/pcs/configure.ac
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script
AC_REVISION($Revision$)
AC_INIT([pcs],[4.1-4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
AC_PREREQ([2.69])
AM_INIT_AUTOMAKE(1.8.2-starlink)
diff --git a/libraries/pda/configure.ac b/libraries/pda/configure.ac
index 01a10051e50..ec12a013831 100644
--- a/libraries/pda/configure.ac
+++ b/libraries/pda/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([pda],[0.5-4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/pgp/configure.ac b/libraries/pgp/configure.ac
index c99a9f3bd42..81ee082dab7 100644
--- a/libraries/pgp/configure.ac
+++ b/libraries/pgp/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([pgp],[5.1.1-9],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/prm/configure.ac b/libraries/prm/configure.ac
index f68332bb16c..c4514d14073 100644
--- a/libraries/prm/configure.ac
+++ b/libraries/prm/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([prm],[1.6-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/psx/configure.ac b/libraries/psx/configure.ac
index 14aa44d5b5c..62e97af41f9 100644
--- a/libraries/psx/configure.ac
+++ b/libraries/psx/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([psx],[0.5-6],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/ref/configure.ac b/libraries/ref/configure.ac
index 09864d83a8a..3ad4c1011a2 100644
--- a/libraries/ref/configure.ac
+++ b/libraries/ref/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([ref],[1.1-4],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/sae/configure.ac b/libraries/sae/configure.ac
index c510b8d8691..e9c7e286a55 100644
--- a/libraries/sae/configure.ac
+++ b/libraries/sae/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT(sae, 1.1, starlink@jiscmail.ac.uk)
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
diff --git a/libraries/sgs/configure.ac b/libraries/sgs/configure.ac
index 7e98e566b80..39132bc81da 100644
--- a/libraries/sgs/configure.ac
+++ b/libraries/sgs/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([sgs],[1.1-2],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/shl/configure.ac b/libraries/shl/configure.ac
index e5a66402280..28a45288db3 100644
--- a/libraries/shl/configure.ac
+++ b/libraries/shl/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([shl],[1.0-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/sla/configure.ac b/libraries/sla/configure.ac
index 4196601ea9a..44c2cafdede 100644
--- a/libraries/sla/configure.ac
+++ b/libraries/sla/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([sla],[2.5-7],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
# Version-info specifications. See SSN/78 for guidelines, and update the table
# below for ANY change of version number.
#
diff --git a/libraries/snx/configure.ac b/libraries/snx/configure.ac
index 6278106621b..a3dc8b0caf1 100644
--- a/libraries/snx/configure.ac
+++ b/libraries/snx/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([snx],[1.1-3],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/starmem/configure.ac b/libraries/starmem/configure.ac
index fb090f0b82a..fead0f63d57 100644
--- a/libraries/starmem/configure.ac
+++ b/libraries/starmem/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([starmem],[0.2-1],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/starutil/configure.ac b/libraries/starutil/configure.ac
index 0f892fd3c30..00e4a081746 100644
--- a/libraries/starutil/configure.ac
+++ b/libraries/starutil/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision: 27534 $)
dnl Initialisation: package name and version number
AC_INIT([starutil],[0.1-1],[t.jenness@jach.hawaii.edu])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/thr/configure.ac b/libraries/thr/configure.ac
index e339c1f854b..29d58d79d75 100644
--- a/libraries/thr/configure.ac
+++ b/libraries/thr/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([thr],[1.0],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/libraries/trn/configure.ac b/libraries/trn/configure.ac
index fd0fd8c3f77..3872b0bdc08 100644
--- a/libraries/trn/configure.ac
+++ b/libraries/trn/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([trn],[0.9-6],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
diff --git a/thirdparty/heasarc/cfitsio/configure.ac b/thirdparty/heasarc/cfitsio/configure.ac
index c5f4615c670..329d8ba115e 100644
--- a/thirdparty/heasarc/cfitsio/configure.ac
+++ b/thirdparty/heasarc/cfitsio/configure.ac
@@ -3,6 +3,7 @@ AC_REVISION($Revision$)
dnl Initialisation: package name and version number
AC_INIT([cfitsio],[3.36],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])