diff --git a/applications/astrom/configure.ac b/applications/astrom/configure.ac index 525c582d0fd..c910ad92b00 100644 --- a/applications/astrom/configure.ac +++ b/applications/astrom/configure.ac @@ -1,9 +1,9 @@ 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_PREREQ(2.50) +AC_PREREQ([2.69]) AM_INIT_AUTOMAKE(1.8.2-starlink) AC_CONFIG_SRCDIR([astrom.f]) @@ -16,7 +16,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 diff --git a/applications/ccdpack/configure.ac b/applications/ccdpack/configure.ac index 3dca05f593c..a44e0f922f6 100644 --- a/applications/ccdpack/configure.ac +++ b/applications/ccdpack/configure.ac @@ -1,12 +1,12 @@ -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_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]) diff --git a/applications/coco/configure.ac b/applications/coco/configure.ac index 89d17b2553f..bfbba5dd1b6 100644 --- a/applications/coco/configure.ac +++ b/applications/coco/configure.ac @@ -2,10 +2,10 @@ 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]) 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 +20,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') diff --git a/applications/convert/configure.ac b/applications/convert/configure.ac index deda408ac69..5c6c0bad77d 100644 --- a/applications/convert/configure.ac +++ b/applications/convert/configure.ac @@ -2,10 +2,10 @@ 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]) 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 +19,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 +47,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. diff --git a/applications/convert/idl/configure.ac b/applications/convert/idl/configure.ac index dd5683f16d0..eb68a515c97 100644 --- a/applications/convert/idl/configure.ac +++ b/applications/convert/idl/configure.ac @@ -4,10 +4,10 @@ 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]) 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 +18,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 diff --git a/applications/cupid/configure.ac b/applications/cupid/configure.ac index 99784c07f27..78ccffacc45 100644 --- a/applications/cupid/configure.ac +++ b/applications/cupid/configure.ac @@ -2,14 +2,14 @@ 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]) 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 @@ -25,7 +25,7 @@ dnl Find required versions of the programs we need for configuration AC_PROG_CC AC_PROG_CPP AC_PROG_FC -AC_PROG_LIBTOOL +LT_INIT dnl Setup for creating a monolith. STAR_MONOLITHS diff --git a/applications/cursa/configure.ac b/applications/cursa/configure.ac index 47f7d77e472..ad98daa06e0 100644 --- a/applications/cursa/configure.ac +++ b/applications/cursa/configure.ac @@ -2,10 +2,10 @@ 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]) 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 +17,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]) diff --git a/applications/daophot/configure.ac b/applications/daophot/configure.ac index cfbfffecd95..495491bb6df 100644 --- a/applications/daophot/configure.ac +++ b/applications/daophot/configure.ac @@ -2,10 +2,10 @@ 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]) 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 +20,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 diff --git a/applications/datacube/configure.ac b/applications/datacube/configure.ac index 3ac77e84cec..aab3fbc5789 100644 --- a/applications/datacube/configure.ac +++ b/applications/datacube/configure.ac @@ -2,10 +2,10 @@ 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]) 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 +20,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]) diff --git a/applications/dipso/configure.ac b/applications/dipso/configure.ac index 958f5d1743a..3d27430e58b 100644 --- a/applications/dipso/configure.ac +++ b/applications/dipso/configure.ac @@ -2,10 +2,10 @@ 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]) 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 +25,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 diff --git a/applications/echomop/configure.ac b/applications/echomop/configure.ac index 728e8944de2..1b8c7f35212 100644 --- a/applications/echomop/configure.ac +++ b/applications/echomop/configure.ac @@ -1,9 +1,9 @@ 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_PREREQ(2.50) +AC_PREREQ([2.69]) AM_INIT_AUTOMAKE(1.8.2-starlink) AC_CONFIG_SRCDIR([echomop.f]) @@ -14,14 +14,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) diff --git a/applications/echwind/configure.ac b/applications/echwind/configure.ac index 4912914a42a..7710eba3a62 100644 --- a/applications/echwind/configure.ac +++ b/applications/echwind/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(echwind, 3.1-4, starlink@jiscmail.ac.uk) +AC_INIT([echwind],[3.1-4],[starlink@jiscmail.ac.uk]) 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 +17,7 @@ STAR_DEFAULTS(per-package-dirs) dnl Find required versions of the programs we need for configuration AC_PROG_FC AC_PROG_FPP -AC_PROG_LIBTOOL +LT_INIT dnl Need to check for ACCESS mode AC_FC_OPEN_SPECIFIERS(access='append') diff --git a/applications/esp/configure.ac b/applications/esp/configure.ac index 5eaf528d466..64625e82c62 100644 --- a/applications/esp/configure.ac +++ b/applications/esp/configure.ac @@ -1,9 +1,9 @@ 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_INIT([esp],[0.11-4],[starlink@jiscmail.ac.uk]) -AC_PREREQ(2.50) +AC_PREREQ([2.69]) AM_INIT_AUTOMAKE(1.8.2-starlink) AC_CONFIG_SRCDIR([ELP_PAR]) diff --git a/applications/extractor/configure.ac b/applications/extractor/configure.ac index 115d01d99d4..d9ff9cb9ffe 100644 --- a/applications/extractor/configure.ac +++ b/applications/extractor/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(extractor, 2.5-1, starlink@jiscmail.ac.uk) +AC_INIT([extractor],[2.5-1],[starlink@jiscmail.ac.uk]) 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 subdir-objects]) @@ -36,7 +36,7 @@ dnl automake to assume it's allowed to play there, too. dnl Find required versions of the programs we need for configuration AC_PROG_CC AC_PROG_FC -AC_PROG_LIBTOOL +LT_INIT dnl Declare the build and use dependencies for this package STAR_DECLARE_DEPENDENCIES(build, [ast ndg sae], [link]) diff --git a/applications/figaro/configure.ac b/applications/figaro/configure.ac index 0379f750bb7..2cabcdb8821 100644 --- a/applications/figaro/configure.ac +++ b/applications/figaro/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(figaro, 5.6-6, starlink@jiscmail.ac.uk) +AC_INIT([figaro],[5.6-6],[starlink@jiscmail.ac.uk]) 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) @@ -28,7 +28,7 @@ AC_DISABLE_SHARED dnl Find required versions of the programs we need for configuration AC_PROG_FC AC_PROG_FPP -AC_PROG_LIBTOOL +LT_INIT AC_PROG_MAKE_SET STAR_MONOLITHS diff --git a/applications/fluxes/configure.ac b/applications/fluxes/configure.ac index 72b5f795ee6..1d102612205 100644 --- a/applications/fluxes/configure.ac +++ b/applications/fluxes/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(fluxes, 1.4-1, starlink@jiscmail.ac.uk) +AC_INIT([fluxes],[1.4-1],[starlink@jiscmail.ac.uk]) 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 @@ -16,7 +16,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(csh) diff --git a/applications/hdstrace/configure.ac b/applications/hdstrace/configure.ac index b73cf20c6f1..3d1ba332ee0 100644 --- a/applications/hdstrace/configure.ac +++ b/applications/hdstrace/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(hdstrace, 1.2-3, starlink@jiscmail.ac.uk) +AC_INIT([hdstrace],[1.2-3],[starlink@jiscmail.ac.uk]) 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 @@ -16,7 +16,7 @@ STAR_DEFAULTS dnl Find required versions of the programs we need for configuration AC_PROG_FC -AC_PROG_LIBTOOL +LT_INIT STAR_MONOLITHS STAR_CNF_COMPATIBLE_SYMBOLS diff --git a/applications/icl/configure.ac b/applications/icl/configure.ac index 8214671cfd8..81f2ea1862a 100644 --- a/applications/icl/configure.ac +++ b/applications/icl/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(icl, 3.1-11, starlink@jiscmail.ac.uk) +AC_INIT([icl],[3.1-11],[starlink@jiscmail.ac.uk]) dnl Require autoconf-2.50 at least -AC_PREREQ(2.50) +AC_PREREQ([2.69]) dnl Require Starlink automake at least AM_INIT_AUTOMAKE(1.8.2-starlink) @@ -50,7 +50,7 @@ if test "$LEX" != flex; then fi AC_HEADER_STDC -AC_PROG_LIBTOOL +LT_INIT # icl_io.c AC_CHECK_FUNCS([atexit on_exit]) diff --git a/applications/kappa/configure.ac b/applications/kappa/configure.ac index 8a47a1ca880..3b49b536d0a 100644 --- a/applications/kappa/configure.ac +++ b/applications/kappa/configure.ac @@ -5,7 +5,7 @@ dnl Initialisation: package name and version number AC_INIT(kappa, 2.1-9, starlink@jiscmail.ac.uk) 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 +17,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_CNF_COMPATIBLE_SYMBOLS diff --git a/applications/kaprh/configure.ac b/applications/kaprh/configure.ac index 430ad9f4a02..db5399af5c1 100644 --- a/applications/kaprh/configure.ac +++ b/applications/kaprh/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(kaprh, 2.0, starlink@jiscmail.ac.uk) +AC_INIT([kaprh],[2.0],[starlink@jiscmail.ac.uk]) 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 @@ -16,7 +16,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 diff --git a/applications/messgen/configure.ac b/applications/messgen/configure.ac index 5073d431a2c..37765e1b44a 100644 --- a/applications/messgen/configure.ac +++ b/applications/messgen/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(messgen, 1.2, starlink@jiscmail.ac.uk) +AC_INIT([messgen],[1.2],[starlink@jiscmail.ac.uk]) dnl Require autoconf-2.50 at least -AC_PREREQ(2.50) +AC_PREREQ([2.69]) dnl Require automake-1.6 at least AM_INIT_AUTOMAKE(1.8.2-starlink) @@ -17,7 +17,7 @@ STAR_DEFAULTS dnl Checks for programs AC_PROG_CC -AC_PROG_LIBTOOL +LT_INIT dnl Documentation is uncomplicated STAR_LATEX_DOCUMENTATION(sun185) diff --git a/applications/observe/configure.ac b/applications/observe/configure.ac index cb0eff4d386..a2889d911b2 100644 --- a/applications/observe/configure.ac +++ b/applications/observe/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(observe, 2.3-2, starlink@jiscmail.ac.uk) +AC_INIT([observe],[2.3-2],[starlink@jiscmail.ac.uk]) 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 @@ -16,7 +16,7 @@ STAR_DEFAULTS dnl Find required versions of the programs we need for configuration AC_PROG_FC -AC_PROG_LIBTOOL +LT_INIT STAR_MONOLITHS dnl Build dependencies for this package. diff --git a/applications/pamela/configure.ac b/applications/pamela/configure.ac index d4afd153abd..444cba89932 100644 --- a/applications/pamela/configure.ac +++ b/applications/pamela/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(pamela, 1.0.6, t.r.marsh@warwick.ac.uk) +AC_INIT([pamela],[1.0.6],[t.r.marsh@warwick.ac.uk]) 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 @@ -16,7 +16,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 diff --git a/applications/period/configure.ac b/applications/period/configure.ac index 07590d0643c..d0add914612 100644 --- a/applications/period/configure.ac +++ b/applications/period/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(period, 5.0-4, starlink@jiscmail.ac.uk) +AC_INIT([period],[5.0-4],[starlink@jiscmail.ac.uk]) 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 +20,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_CNF_COMPATIBLE_SYMBOLS dnl Build dependencies for this package. diff --git a/applications/photom/configure.ac b/applications/photom/configure.ac index 1c5e075e02f..1335d0926ac 100644 --- a/applications/photom/configure.ac +++ b/applications/photom/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(photom, 1.12-2, starlink@jiscmail.ac.uk) +AC_INIT([photom],[1.12-2],[starlink@jiscmail.ac.uk]) 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 +20,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]) diff --git a/applications/pisa/configure.ac b/applications/pisa/configure.ac index bef5eb98123..1cf74a311ab 100644 --- a/applications/pisa/configure.ac +++ b/applications/pisa/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(pisa, 2.4-8, starlink@jiscmail.ac.uk) +AC_INIT([pisa],[2.4-8],[starlink@jiscmail.ac.uk]) 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 +19,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 dnl PISA is a couple of monoliths. STAR_MONOLITHS diff --git a/applications/polpack/configure.ac b/applications/polpack/configure.ac index 6db87629cd8..3a1b74d1bf0 100644 --- a/applications/polpack/configure.ac +++ b/applications/polpack/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(polpack, 3.2-0, starlink@jiscmail.ac.uk) +AC_INIT([polpack],[3.2-0],[starlink@jiscmail.ac.uk]) 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 +17,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([ifd2star awish atclsh hlib]) diff --git a/applications/pongo/configure.ac b/applications/pongo/configure.ac index 1e1c6317f1f..7752e496feb 100644 --- a/applications/pongo/configure.ac +++ b/applications/pongo/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(pongo, 2.0-3, starlink@jiscmail.ac.uk) +AC_INIT([pongo],[2.0-3],[starlink@jiscmail.ac.uk]) 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 +20,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 dnl Check for library symbols diff --git a/applications/psmerge/configure.ac b/applications/psmerge/configure.ac index d8c0b1310fc..cd87fba3aa1 100644 --- a/applications/psmerge/configure.ac +++ b/applications/psmerge/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(psmerge, 1.0-7, starlink@jiscmail.ac.uk) +AC_INIT([psmerge],[1.0-7],[starlink@jiscmail.ac.uk]) dnl Require autoconf-2.50 at least -AC_PREREQ(2.50) +AC_PREREQ([2.69]) dnl Require Starlink automake at least AM_INIT_AUTOMAKE(1.8.2-starlink) @@ -18,7 +18,7 @@ STAR_DEFAULTS dnl Find required versions of the programs we need for configuration AC_PROG_CC -AC_PROG_LIBTOOL +LT_INIT AC_CHECK_LIB([m],[cos]) AC_CHECK_LIB([m],[sin]) diff --git a/applications/rv/configure.ac b/applications/rv/configure.ac index 384bc91e5b9..16d118afe47 100644 --- a/applications/rv/configure.ac +++ b/applications/rv/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(rv, 2.4-5, starlink@jiscmail.ac.uk) +AC_INIT([rv],[2.4-5],[starlink@jiscmail.ac.uk]) 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 +20,7 @@ AC_PROG_FC AC_PROG_FPP dnl Use libtool so that we get to use -rpath without pain -AC_PROG_LIBTOOL +LT_INIT AC_FC_OPEN_SPECIFIERS(readonly) AC_FC_OPEN_SPECIFIERS(action='read') diff --git a/applications/specx/configure.ac b/applications/specx/configure.ac index 985d5313dd8..3064204f1c8 100644 --- a/applications/specx/configure.ac +++ b/applications/specx/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(specx, 6.8-5, t.jenness@jach.hawaii.edu) +AC_INIT([specx],[6.8-5],[t.jenness@jach.hawaii.edu]) dnl Require autoconf-2.50 at least -AC_PREREQ(2.50) +AC_PREREQ([2.69]) dnl Require Starlink automake at least AM_INIT_AUTOMAKE(1.8.2-starlink) @@ -22,7 +22,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 AC_FC_LIBRARY_LDFLAGS dnl Push Fortran for Fortran tests. diff --git a/applications/spt/configure.ac b/applications/spt/configure.ac index 97611901e6e..9648a9b17c0 100644 --- a/applications/spt/configure.ac +++ b/applications/spt/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(spt, 1.3-1, starlink@jiscmail.ac.uk) +AC_INIT([spt],[1.3-1],[starlink@jiscmail.ac.uk]) dnl Require autoconf-2.50 at least -AC_PREREQ(2.50) +AC_PREREQ([2.69]) dnl Require Starlink automake at least AM_INIT_AUTOMAKE(1.8.2-starlink) @@ -18,7 +18,7 @@ STAR_DEFAULTS dnl Find required versions of the programs we need for configuration AC_PROG_CC -AC_PROG_LIBTOOL +LT_INIT dnl Documentation is in the parent directory STAR_LATEX_DOCUMENTATION(sun111) diff --git a/applications/sst/configure.ac b/applications/sst/configure.ac index ea74f8bf131..2829818a956 100644 --- a/applications/sst/configure.ac +++ b/applications/sst/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(sst, 1.1-2, starlink@jiscmail.ac.uk) +AC_INIT([sst],[1.1-2],[starlink@jiscmail.ac.uk]) 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 @@ -21,7 +21,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 AC_PROG_LN_S dnl Check if sys/wait.h exists and is POSIX compatible diff --git a/applications/startcl/configure.ac b/applications/startcl/configure.ac index b0eae6e302f..2a6846f56c7 100644 --- a/applications/startcl/configure.ac +++ b/applications/startcl/configure.ac @@ -1,17 +1,17 @@ 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_INIT([startcl],[1.5-7],[starlink@jiscmail.ac.uk]) -AC_PREREQ(2.50) +AC_PREREQ([2.69]) AM_INIT_AUTOMAKE(1.8.2-starlink) AC_CONFIG_SRCDIR([tclAdam.c]) STAR_DEFAULTS AC_PROG_CC AC_PROG_FC -AC_PROG_LIBTOOL -AC_STDC_HEADERS +LT_INIT +AC_HEADER_STDC AC_CHECK_HEADERS(malloc.h) dnl Uses C compiler to link against Fortran libraries, so we need diff --git a/applications/starx/configure.ac b/applications/starx/configure.ac index fd60a6b5895..e97c4921dda 100644 --- a/applications/starx/configure.ac +++ b/applications/starx/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(starx, 1.2-1, starlink@jiscmail.ac.uk) +AC_INIT([starx],[1.2-1],[starlink@jiscmail.ac.uk]) dnl Require autoconf-2.50 at least -AC_PREREQ(2.50) +AC_PREREQ([2.69]) dnl Require Starlink automake at least AM_INIT_AUTOMAKE(1.8.2-starlink) @@ -20,7 +20,7 @@ dnl Find required versions of the programs we need for configuration AC_PROG_FC AC_HEADER_STDC AC_PATH_XTRA -AC_PROG_LIBTOOL +LT_INIT STAR_CNF_COMPATIBLE_SYMBOLS diff --git a/applications/surf/configure.ac b/applications/surf/configure.ac index 1e9f5fc3724..0b3f48f1b09 100644 --- a/applications/surf/configure.ac +++ b/applications/surf/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(surf, 1.8-1, starlink@jiscmail.ac.uk) +AC_INIT([surf],[1.8-1],[starlink@jiscmail.ac.uk]) 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 +17,7 @@ STAR_DEFAULTS(per-package-dirs) dnl Find required versions of the programs we need for configuration AC_PROG_FC AC_PROG_FPP -AC_PROG_LIBTOOL +LT_INIT AC_PROG_LN_S AC_FC_CHECK_INTRINSICS([IEEE_FLAGS]) diff --git a/applications/tsp/configure.ac b/applications/tsp/configure.ac index 621fca6de06..beb0b22adde 100644 --- a/applications/tsp/configure.ac +++ b/applications/tsp/configure.ac @@ -2,10 +2,10 @@ dnl Process this file with autoconf to produce a configure script AC_REVISION($Revision$) dnl Initialisation: package name and version number -AC_INIT(tsp, 2.3-4, starlink@jiscmail.ac.uk) +AC_INIT([tsp],[2.3-4],[starlink@jiscmail.ac.uk]) 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 @@ -22,7 +22,7 @@ AC_PROG_FPP STAR_CHECK_PROGS([ifd2star]) dnl Use libtool for linking since it will try to use the -rpath option -AC_PROG_LIBTOOL +LT_INIT STAR_CNF_COMPATIBLE_SYMBOLS