Skip to content

Commit

Permalink
Change configure.ac so that gcc is used to determine object file suffix
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
dsberry committed Sep 17, 2020
1 parent 2d580e2 commit 29913f3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 9 additions & 10 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand All @@ -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

Expand Down Expand Up @@ -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],
Expand All @@ -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)

Expand Down

0 comments on commit 29913f3

Please sign in to comment.