Skip to content

Commit

Permalink
Use better environment variable
Browse files Browse the repository at this point in the history
STARLINK_DIR does not have to be set at build time in a Starlink
build but STARCONF_DEFAULT_PREFIX must be set.
  • Loading branch information
timj committed Feb 4, 2015
1 parent e0b5bb3 commit c24ed31
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- component.xml. Generated from component.xml.in by configure. -->

<component id="pal" support="S">
<version>0.9.0</version>
<version>0.9.1</version>
<path>libext/pal</path>
<description>Positional Astronomy Library</description>
<abstract><p>
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script
AC_REVISION($Revision: 27534 $)

dnl Initialisation: package name and version number
AC_INIT([pal],[0.9.0],[starlink@jiscmail.ac.uk])
AC_INIT([pal],[0.9.1],[starlink@jiscmail.ac.uk])
AC_CONFIG_AUX_DIR([build-aux])

dnl Require autoconf-2.50 at least
Expand Down Expand Up @@ -42,10 +42,10 @@ AC_CHECK_LIB([m],[sin])
dnl We can not simply test for Starlink starutil because
dnl when configure runs in a Starlink build starutil will not
dnl have been built yet. If --without-starlink has been used
dnl $STARLINK will be unset but to play safe we check STARLINK_DIR
dnl $STARLINK will be unset but to play safe we check STARCONF_DEFAULT_PREFIX
dnl If we do not have Starlink we can do the test anyhow just in case

if test -n "$STARLINK_DIR"
if test -n "$STARCONF_DEFAULT_PREFIX"
then
AC_SUBST( STARUTIL_LIBADD, "${libdir}/libstarutil.la" )
AC_SUBST( ERFA_LIBADD, "${libdir}/liberfa.la" )
Expand Down

0 comments on commit c24ed31

Please sign in to comment.