From 29913f3841c8655914a18aec0eba23e720abf5a0 Mon Sep 17 00:00:00 2001
From: David Berry <d.berry@eaobservatory.org>
Date: Thu, 17 Sep 2020 14:48:34 +0100
Subject: [PATCH] Change configure.ac so that gcc is used to determine object
 file suffix

Previously, gfortran was used to determine the object file suffix unless
--without-fortran was specified, in which case the object file suffix was
not determined at all.
---
 component.xml |  2 +-
 configure.ac  | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/component.xml b/component.xml
index 1f8c30c3..b22def00 100644
--- a/component.xml
+++ b/component.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE component SYSTEM "componentinfo.dtd">
 
 <component id="ast" support="S">
-  <version>9.2.0</version>
+  <version>9.2.1</version>
   <path>libext/ast</path>
   <description>WCS library</description>
   <abstract>
diff --git a/configure.ac b/configure.ac
index 8391920f..2b403c15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl   automake 1.6 or better.
 dnl   Initialisation: package name and version number
 m4_define([v_maj], [9])
 m4_define([v_min], [2])
-m4_define([v_mic], [0])
+m4_define([v_mic], [1])
 m4_define([project_version], [v_maj.v_min.v_mic])
 AC_INIT([ast],[project_version],[starlink@jiscmail.ac.uk])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -29,6 +29,12 @@ AM_INIT_AUTOMAKE([1.8.2-starlink subdir-objects])
 dnl   Sanity-check: name a file in the source directory
 AC_CONFIG_SRCDIR([ast_link.in])
 
+#   Checks for programs
+AC_PROG_CC
+AC_PROG_CPP
+LT_INIT
+AC_PROG_LN_S
+
 #   Include defaults for Starlink configurations
 STAR_DEFAULTS
 
@@ -88,8 +94,8 @@ AM_CONDITIONAL(EXTERNAL_PAL, test x$external_pal = x1)
 
 #  Conditional defining whether we want to support Fortran libraries
 #  (e.g. pgplot) and applications. It seems that this must come before
-#  any uses of AC_CHECK_LIB as otherwise the library checked using 
-#  AC_CHECK_LIB is automatically added to the list of linker options 
+#  any uses of AC_CHECK_LIB as otherwise the library checked using
+#  AC_CHECK_LIB is automatically added to the list of linker options
 #  created by AC_FC_LIBRARY_LDFLAGS
 AC_ARG_WITH([fortran],
             [ --without-fortran   Build package without Fortran support],
@@ -109,13 +115,6 @@ AC_PROG_FC
 AC_FC_LIBRARY_LDFLAGS
 fi
 
-
-#   Checks for programs
-AC_PROG_CC
-AC_PROG_CPP
-LT_INIT
-AC_PROG_LN_S
-
 #   If --with-pic=no is set we should honour that.
 AM_CONDITIONAL(NOPIC, test x$pic_mode = xno)