Skip to content

Commit

Permalink
configure.ac: update for MAXPNT
Browse files Browse the repository at this point in the history
We also need to temporarily disable ATNF's mfboot since it requires
functions that aren't currently available in our uvgn.for.
  • Loading branch information
pkgw committed May 28, 2014
1 parent b131112 commit c18d72f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
20 changes: 13 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
dnl Autoconf 2.59 was required before, but Automake 1.11 requires
dnl Autoconf 2.62 -- see discussion below.
AC_PREREQ(2.62)
AC_INIT([MIRIAD],[4.3.7],[miriad-dev-bugs@astro.berkeley.edu])
AC_INIT([MIRIAD],[4.3.8],[miriad-dev-bugs@astro.berkeley.edu])
AC_REVISION([$Revision$])
AC_CONFIG_SRCDIR([src/subs/uvio.c])
AC_CONFIG_MACRO_DIR([src/sys/auto])
AC_CONFIG_AUX_DIR([src/sys/auto])

dnl FIXME! Require Automake 1.11 for now, since we currently need
dnl FIXME! Require Automake 1.11 for now, since we currently need
dnl AM_DEFAULT_SOURCE_EXT to build all of the tasks. A lot
dnl of people don't have Automake this recent. We need to settle
dnl on a policy, but given the current Makefile.am code, 1.11 is
dnl what's required. If the requirement is downgraded, the
dnl silent-rules option must be removed.
AM_INIT_AUTOMAKE([1.11 -Wobsolete -Wgnu -Wunsupported -Wno-syntax
AM_INIT_AUTOMAKE([1.11 -Wobsolete -Wgnu -Wunsupported -Wno-syntax
-Wno-portability foreign silent-rules])

dnl Libtool. Required version number is made-up.
Expand Down Expand Up @@ -49,8 +49,8 @@ AC_PROG_SED dnl $(SED) used in cat/Makefile.am
AC_PROG_LEX

dnl Some basic compiler flags.
dnl
dnl -fno-globals keeps g77 from returning an error code when
dnl
dnl -fno-globals keeps g77 from returning an error code when
dnl there are disagreements between subroutine parameter types and the
dnl subroutine call. Warnings are still printed.

Expand Down Expand Up @@ -84,7 +84,7 @@ AC_LANG_POP([Fortran 77])
dnl OS X XCode >= 3.1 needs a special linker flag for dynamic libraries
dnl and main programs to share common blocks. This is a required feature
dnl for the MIRIAD 'mem' routines and possibly other parts of MIRIAD as well.
dnl We'll just blindly supply the flag if the linker accepts it.
dnl We'll just blindly supply the flag if the linker accepts it.
dnl
dnl OS X XCode = 3.0 has the default behavior of XCode 3.1, which breaks
dnl MIRIAD, but it doesn't have the flag that allows it to be overridden.
Expand Down Expand Up @@ -180,7 +180,7 @@ AM_CONDITIONAL(HAVE_XAW,$have_xaw)
dnl Miscellaneous library functions, headers, etc
dnl
dnl Fortran linking means that we automatically get -lm, but
dnl it seems smart to set it up for C programs as well, and
dnl it seems smart to set it up for C programs as well, and
dnl this allows the wcslib check for sincos to succeed later.

AC_CHECK_LIB(m, cos)
Expand Down Expand Up @@ -267,6 +267,7 @@ def_maxbase2=1058
def_maxchan=4096
def_maxwin=16
def_maxwide=18
def_maxpnt=100000
def_maxnax=7
def_maxbuf=10000000

Expand Down Expand Up @@ -316,6 +317,7 @@ AC_SUBST(MAXBASE2)
AC_SUBST(MAXCHAN)
AC_SUBST(MAXWIN)
AC_SUBST(MAXWIDE)
AC_SUBST(MAXPNT)
AC_SUBST(MAXNAX)
AC_SUBST(MAXBUF)

Expand Down Expand Up @@ -356,6 +358,10 @@ AC_ARG_WITH(maxwide,
[AS_HELP_STRING([--with-maxwide=MAXWIDE],[Maximum number of wideband channels])],
MAXWIDE=$withval, MAXWIDE="$def_maxwide")

AC_ARG_WITH(maxpnt,
[AS_HELP_STRING([--with-maxpnt=MAXPNT],[Maximum number of pointings])],
MAXPNT=$withval, MAXPNT="$def_maxpnt")

AC_ARG_WITH(maxnax,
[AS_HELP_STRING([--with-maxnax=MAXNAX],[Maximum number of axis in images])],
MAXNAX=$withval, MAXNAX="$def_maxnax")
Expand Down
5 changes: 4 additions & 1 deletion src/prog/atnf/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
include $(top_srcdir)/mircommon.mak

# A few of these programs need the RPFITS library from borrow/rpfits.
#
# mfboot is temporarily disabled since it requires functions from the
# ATNF version of uvgn.for that have not yet been ported.

LDADD = $(prog_libs)
rpfits_libs = $(top_builddir)/borrow/rpfits/libmir_rpfits.la

ftasks = \
at_mfcal at_moment at_uvlist at_uvplt atfix atlod atmos atrtfix atscfix \
attsys atwvr elevcor fakeotf lagflg mbspect mfboot mopfix plboot plplt \
attsys atwvr elevcor fakeotf lagflg mbspect mopfix plboot plplt \
wblod wbplt
bin_PROGRAMS = $(ftasks)
CLEANFILES = $(ftasks:=.f)
Expand Down

0 comments on commit c18d72f

Please sign in to comment.