Skip to content

Commit

Permalink
autotools: recast STAR_INITIALISE_FORTRAN as STAR_INITIALISE_FORTRAN_RTL
Browse files Browse the repository at this point in the history
Naming C macros the same as m4 ones is really tough sometimes so choose not to
do that

Other related changes with regenerated files and autoupdate suggested fixes
  • Loading branch information
pwdraper committed Feb 26, 2014
1 parent 919873e commit 5d0546b
Show file tree
Hide file tree
Showing 12 changed files with 16,756 additions and 26,884 deletions.
13 changes: 7 additions & 6 deletions applications/gaia/configure.ac
Expand Up @@ -7,12 +7,13 @@ dnl run and gaia/configure, gaia3d/configure and gaiavo/configure
dnl scripts have been updated (this normally requires a bootstrap,
dnl configure, bootstrap, the configure updates the local directories
dnl which then require regenerating again).
AC_INIT(gaia, 4.4-4, starlink@jiscmail.ac.uk)
AC_INIT([gaia],[4.4-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)
AM_INIT_AUTOMAKE([1.8.2-starlink])
AC_CONFIG_MACRO_DIR([m4])

dnl Sanity-check: name a file in the source directory -- if this
dnl isn't found then configure will complain
Expand All @@ -21,7 +22,7 @@ AC_CONFIG_SRCDIR([gaia.news])
dnl Include defaults for Starlink configurations
dnl Option `per-package-dirs' means that executables and help files
dnl are installed in package-specific directories.
STAR_DEFAULTS(per-package-dirs)
STAR_DEFAULTS([per-package-dirs])

dnl Need to build an atask, depends on much the same as a full monolith.
STAR_MONOLITHS
Expand All @@ -30,12 +31,12 @@ dnl Find required versions of the programs we need for configuration
AC_PROG_CC
AC_PROG_CXX
AC_PROG_FC
AC_PROG_LIBTOOL
LT_INIT

dnl We have a C++ main function, but we call Fortran. This defines
dnl the cpp macro of the same name, which will do any
dnl initialisation which is necessary with this platform/compiler.
STAR_INITIALISE_FORTRAN
STAR_INITIALISE_FORTRAN_RTL

dnl Sometimes also need to know the name of the Fortran MAIN.
AC_FC_MAIN
Expand Down
2 changes: 1 addition & 1 deletion applications/gaia/gaia/aclocal.m4
Expand Up @@ -169,7 +169,7 @@ STAR_PRM_COMPATIBLE_SYMBOLS
AC_PROG_FC
AC_CHECK_PROGS(LIBTOOL,libtool)
STAR_CHECK_PROGS([fgeneric])
STAR_INITIALISE_FORTRAN
STAR_INITIALISE_FORTRAN_RTL
dnl Pre-C99 compilers do not support inline, check for that.
AC_C_INLINE
Expand Down
29 changes: 24 additions & 5 deletions applications/gaia/gaia/config.h.in
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.in by autoheader. */

/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD

/* Build windows export dll */
#undef BUILD_gaia

Expand Down Expand Up @@ -113,13 +116,16 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME

/* Define to the home page for this package. */
#undef PACKAGE_URL

/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* The size of a `long', as computed by sizeof. */
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG

/* The size of a `long long', as computed by sizeof. */
/* The size of `long long', as computed by sizeof. */
#undef SIZEOF_LONG_LONG

/* Define to a function call which will initialise the Fortran RTL */
Expand Down Expand Up @@ -164,9 +170,22 @@
/* Do we want to use the threaded memory allocator? */
#undef USE_THREAD_ALLOC

/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
# endif
#else
# ifndef WORDS_BIGENDIAN
# undef WORDS_BIGENDIAN
# endif
#endif

/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif

/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
Expand Down

0 comments on commit 5d0546b

Please sign in to comment.