Merge branch 'autotools-dev'

Developments from the autotools-dev branch. These support the updates of the
autotools components to the most recent releases (after a number of
years). Note that the autotools submodules have been moved so that the
Starlink encroachments are kept to a minimum.

.gitignore

@@ -46,6 +46,7 @@ lib*.so
 *.class
 \#*\#
 .\#*
+.dirstamp
 
 # Autoconf/automake build dirs
 
@@ -80,6 +81,7 @@ Makefile.in
 missing
 stamp-h1
 stamp-h2
+test-driver
 ylwrap
 *-stamp
 

.gitmodules

@@ -7,21 +7,12 @@
 [submodule "thirdparty/kitware/vtk/cmake"]
 	path = thirdparty/kitware/vtk/cmake
 	url = ../cmake.git
-[submodule "thirdparty/fsf/autoconf"]
-	path = thirdparty/fsf/autoconf
-	url = ../autoconf.git
 [submodule "thirdparty/norman/dvi2bitmap/dvi2bitmap"]
 	path = thirdparty/norman/dvi2bitmap/dvi2bitmap
 	url = ../dvi2bitmap.git
-[submodule "thirdparty/fsf/automake"]
-	path = thirdparty/fsf/automake
-	url = ../automake.git
 [submodule "thirdparty/eso/skycat/skycat"]
 	path = thirdparty/eso/skycat/skycat
 	url = ../skycat.git
-[submodule "thirdparty/fsf/libtool"]
-	path = thirdparty/fsf/libtool
-	url = ../libtool.git
 [submodule "thirdparty/perlsys/perl/perl"]
 	path = thirdparty/perlsys/perl/perl
 	url = git://github.com/Perl/perl5.git
@@ -40,9 +31,6 @@
 [submodule "thirdparty/latex2html/latex2html/latex2html"]
 	path = thirdparty/latex2html/latex2html/latex2html
 	url = ../latex2html.git
-[submodule "thirdparty/fsf/m4"]
-	path = thirdparty/fsf/m4
-	url = ../m4.git
 [submodule "thirdparty/mesa3d/mesa/mesa"]
 	path = thirdparty/mesa3d/mesa/mesa
 	url = ../mesa.git
@@ -160,3 +148,15 @@
 [submodule "thirdparty/perlsys/perlmods/perl-UKIRT-Archive"]
 	path = thirdparty/perlsys/perlmods/perl-UKIRT-Archive
 	url = git://github.com/jac-h/perl-UKIRT-Archive.git
+[submodule "thirdparty/fsf/autotools/autoconf/autoconf"]
+	path = thirdparty/fsf/autotools/autoconf/autoconf
+	url = git@github.com:Starlink/autoconf.git
+[submodule "thirdparty/fsf/autotools/automake/automake"]
+	path = thirdparty/fsf/autotools/automake/automake
+	url = git@github.com:Starlink/automake.git
+[submodule "thirdparty/fsf/autotools/libtool/libtool"]
+	path = thirdparty/fsf/autotools/libtool/libtool
+	url = git@github.com:Starlink/libtool.git
+[submodule "thirdparty/fsf/autotools/m4/m4"]
+	path = thirdparty/fsf/autotools/m4/m4
+	url = git@github.com:Starlink/m4.git

Makefile.dependencies

@@ -199,7 +199,7 @@ $(MANIFESTS)/atools: \
 
 # Component autoconf is a buildsupport component
 $(MANIFESTS)/autoconf:
-	cd thirdparty/fsf/autoconf \
+	cd thirdparty/fsf/autotools/autoconf \
 	    && if test -f bootstrap; then \
 	       ./bootstrap > bootstrap.log; \
 	    fi \
@@ -219,7 +219,7 @@ $(MANIFESTS)/autoconf:
 $(MANIFESTS)/automake: \
 		$(MANIFESTS)/autoconf \
 		$(MANIFESTS)/libtool
-	cd thirdparty/fsf/automake \
+	cd thirdparty/fsf/autotools/automake \
 	    && if test -f bootstrap; then \
 	       ./bootstrap > bootstrap.log; \
 	    fi \
@@ -1634,7 +1634,7 @@ $(MANIFESTS)/latex2html:
 
 # Component libtool is a buildsupport component
 $(MANIFESTS)/libtool:
-	cd thirdparty/fsf/libtool \
+	cd thirdparty/fsf/autotools/libtool \
 	    && if test -f bootstrap; then \
 	       ./bootstrap > bootstrap.log; \
 	    fi \
@@ -1678,7 +1678,7 @@ $(MANIFESTS)/lpg: \
 
 # Component m4 is a buildsupport component
 $(MANIFESTS)/m4:
-	cd thirdparty/fsf/m4 \
+	cd thirdparty/fsf/autotools/m4 \
 	    && if test -f bootstrap; then \
 	       ./bootstrap > bootstrap.log; \
 	    fi \

applications/astrom/configure.ac

@@ -1,9 +1,10 @@
 dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision$)
 
-AC_INIT(astrom, 3.8, starlink@jiscmail.ac.uk)
+AC_INIT([astrom],[3.8],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
 
-AC_PREREQ(2.50)
+AC_PREREQ([2.69])
 AM_INIT_AUTOMAKE(1.8.2-starlink)
 
 AC_CONFIG_SRCDIR([astrom.f])
@@ -16,7 +17,7 @@ AC_FC_OPEN_SPECIFIERS(readonly)
 AC_FC_OPEN_SPECIFIERS(action='read')
 
 dnl    Use libtool for linking since it will try to use the -rpath option
-AC_PROG_LIBTOOL
+LT_INIT
 
 dnl  Specify the fortran unit numbers for standard input and output.
 dnl  We should test for this, but (a) I'm not sure how I'd write such

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)

applications/ccdpack/configure.ac

@@ -1,12 +1,13 @@
-AC_INIT(ccdpack, 4.1-1, ccdpack@starlink.ac.uk)
-AC_PREREQ(2.50)
+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)
 STAR_DEFAULTS(per-package-dirs)
 STAR_MONOLITHS
 AC_PROG_CC
 AC_PROG_FC
-AC_PROG_LIBTOOL
+LT_INIT
 STAR_CNF_COMPATIBLE_SYMBOLS
 
 STAR_CHECK_PROGS([hlib ifd2star fgeneric])

applications/coco/configure.ac

@@ -2,10 +2,11 @@ dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision$)
 
 dnl    Initialisation: package name and version number
-AC_INIT(coco, 2.2-8, starlink@jiscmail.ac.uk)
-
+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.50)
+AC_PREREQ([2.69])
 AM_INIT_AUTOMAKE(1.8.2-starlink)
 
 dnl    Sanity-check: name a file in the source directory -- if this
@@ -20,7 +21,7 @@ AC_PROG_FC
 AC_PROG_FPP
 
 dnl    Use libtool for linking since it will try to use the -rpath option
-AC_PROG_LIBTOOL
+LT_INIT
 
 AC_FC_OPEN_SPECIFIERS(readonly)
 AC_FC_OPEN_SPECIFIERS(action='read')

applications/convert/configure.ac

@@ -2,10 +2,11 @@ dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision$)
 
 dnl    Initialisation: package name and version number
-AC_INIT(convert, 1.7-1, starlink@jiscmail.ac.uk)
+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.50)
+AC_PREREQ([2.69])
 AM_INIT_AUTOMAKE(1.8.2-starlink)
 
 dnl    Sanity-check: name a file in the source directory -- if this
@@ -19,7 +20,7 @@ dnl    Find required versions of the programs we need for configuration
 AC_PROG_CC
 AC_PROG_FC
 AC_PROG_FPP
-AC_PROG_LIBTOOL
+LT_INIT
 
 dnl    Setup for building monoliths.
 STAR_MONOLITHS
@@ -47,7 +48,7 @@ dnl    Ranlib is needed on OS X so that we can update the static libraries
 dnl    (the archive index is considered out of date if it doesn't match the
 dnl    date of the archive file, so a simple copying invalidates this, this
 dnl    is noted in the OS X ranlib man page as a bug, so may not always be
-dnl    true). Note AC_PROG_LIBTOOL claims to obsolete:
+dnl    true). Note LT_INIT claims to obsolete this:
 dnl AC_PROG_RANLIB
 dnl    so commented out.   
 

applications/convert/idl/configure.ac

@@ -4,10 +4,11 @@ AC_REVISION($Revision$)
 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_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.50)
+AC_PREREQ([2.69])
 dnl    Require Starlink automake
 AM_INIT_AUTOMAKE(1.8.2-starlink)
 
@@ -18,8 +19,7 @@ AC_CONFIG_SRCDIR(IDL_Load.c)
 dnl    IDL uses a dlopened shareable library.
 AC_DISABLE_STATIC
 AC_ENABLE_SHARED
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
+LT_INIT([dlopen])
 
 AC_CHECK_HEADERS([limits.h])
 AC_CHECK_DECLS([PATH_MAX],,,[#include <limits.h>
@@ -37,6 +37,7 @@ STAR_CNF_COMPATIBLE_SYMBOLS
 dnl Link against fortran libraries. Don't want the Fortran main
 dnl in this, so remove the known libraries that contain it 
 dnl (g77/frtbegin and gfortran/gfortranbegin).
+AC_PROG_FC
 AC_FC_LIBRARY_LDFLAGS
 FCLIBS=`echo $FCLIBS | sed 's:\ \-l.*begin\ : :g'`
 

applications/cupid/configure.ac

@@ -2,14 +2,15 @@ dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision$)
 
 dnl    Initialisation: package name and version number
-AC_INIT(cupid, 2.0, starlink@jiscmail.ac.uk)
+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)
 
 
 dnl    Require autoconf-2.50 at least
-AC_PREREQ(2.50)
+AC_PREREQ([2.69])
 AM_INIT_AUTOMAKE(1.8.2-starlink)
 
 dnl    Sanity-check: name a file in the source directory -- if this
@@ -24,7 +25,8 @@ STAR_DEFAULTS(per-package-dirs)
 dnl    Find required versions of the programs we need for configuration
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_LIBTOOL
+AC_PROG_FC
+LT_INIT
 
 dnl    Setup for creating a monolith.
 STAR_MONOLITHS

applications/cursa/configure.ac

@@ -2,10 +2,11 @@ dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision$)
 
 dnl    Initialisation: package name and version number
-AC_INIT(cursa, 6.5, starlink@jiscmail.ac.uk)
+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.50)
+AC_PREREQ([2.69])
 AM_INIT_AUTOMAKE(1.8.2-starlink)
 
 dnl    Sanity-check: name a file in the source directory -- if this
@@ -17,7 +18,7 @@ STAR_DEFAULTS(per-package-dirs)
 dnl    Find required versions of the programs we need for configuration
 AC_PROG_CC
 AC_PROG_FC
-AC_PROG_LIBTOOL
+LT_INIT
 
 STAR_MONOLITHS
 STAR_CHECK_PROGS([starperl])

applications/daophot/configure.ac

@@ -2,10 +2,11 @@ dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision$)
 
 dnl    Initialisation: package name and version number
-AC_INIT(daophot, 1.3-6, starlink@jiscmail.ac.uk)
+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.50)
+AC_PREREQ([2.69])
 dnl    Require Starlink automake
 AM_INIT_AUTOMAKE(1.8.2-starlink)
 
@@ -20,7 +21,7 @@ STAR_MONOLITHS
 dnl    Find required versions of the programs we need for configuration
 AC_PROG_CC
 AC_PROG_FC
-AC_PROG_LIBTOOL
+LT_INIT
 
 dnl    Some code requires the G95 flag -fsloppy-char, see if the current
 dnl    compiler supports this (could improve this check by including

applications/datacube/configure.ac

@@ -2,10 +2,11 @@ dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision$)
 
 dnl    Initialisation: package name and version number
-AC_INIT(datacube, 1.3, starlink@jiscmail.ac.uk)
+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.50)
+AC_PREREQ([2.69])
 
 dnl    Require Starlink automake
 AM_INIT_AUTOMAKE(1.8.2-starlink)
@@ -20,7 +21,7 @@ STAR_DEFAULTS(per-package-dirs)
 
 dnl    Find required versions of the programs we need for configuration
 AC_PROG_FC
-AC_PROG_LIBTOOL
+LT_INIT
 STAR_MONOLITHS
 
 STAR_CHECK_PROGS([hlib])

applications/dipso/configure.ac

@@ -2,10 +2,11 @@ dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision$)
 
 dnl    Initialisation: package name and version number.
-AC_INIT(dipso, 3.6-5, starlink@jiscmail.ac.uk)
+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.50)
+AC_PREREQ([2.69])
 
 dnl    Require Starlink automake
 AM_INIT_AUTOMAKE(1.8.2-starlink)
@@ -25,7 +26,7 @@ dnl    Find required versions of the programs we need for configuration
 AC_PROG_CC
 AC_PROG_FC
 AC_PROG_FPP
-AC_PROG_LIBTOOL
+LT_INIT
 
 dnl  Need a main and typeless Hex constants
 AC_FC_MAIN

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)

applications/echomop/configure.ac

@@ -1,9 +1,10 @@
 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_INIT([echomop],[3.3-7],[starlink@jiscmail.ac.uk])
+AC_CONFIG_AUX_DIR([build-aux])
 
-AC_PREREQ(2.50)
+AC_PREREQ([2.69])
 AM_INIT_AUTOMAKE(1.8.2-starlink)
 
 AC_CONFIG_SRCDIR([echomop.f])
@@ -14,14 +15,14 @@ dnl    Find required versions of the programs we need for configuration
 AC_PROG_CC
 AC_PROG_FC
 AC_PROG_FPP
-AC_PROG_LIBTOOL
+LT_INIT
 
 AC_FC_LIBRARY_LDFLAGS
 AC_FC_MAIN
 STAR_CNF_COMPATIBLE_SYMBOLS
 
 AC_PROG_LN_S
-AC_SET_MAKE
+AC_PROG_MAKE_SET
 
 AC_FC_HAVE_PERCENTLOC
 AC_FC_CHECK_INTRINSICS(loc)