* tests/f77demo/configure.ac [--with-dist]: New option. Skip most

Fortran checks when given.
* tests/fcdemo/configure.ac [--with-dist]: Likewise.
* Makefile.am (@DIST_MAKEFILE_LIST@): Pass --with-dist.
Reported by Benoit Sigoure <tsuna@lrde.epita.fr>.
This commit is contained in:
Noah Misch 2007-06-21 19:02:36 +00:00
parent 91a80d8bb3
commit 27c76a8994
4 changed files with 36 additions and 14 deletions

View File

@ -1,3 +1,11 @@
2007-06-21 Noah Misch <noah@cs.caltech.edu>
* tests/f77demo/configure.ac [--with-dist]: New option. Skip most
Fortran checks when given.
* tests/fcdemo/configure.ac [--with-dist]: Likewise.
* Makefile.am (@DIST_MAKEFILE_LIST@): Pass --with-dist.
Reported by Benoit Sigoure <tsuna@lrde.epita.fr>.
2007-06-19 Charles Wilson <libtool@cwilson.fastmail.fm>
* AUTHORS: Add myself.

View File

@ -109,7 +109,7 @@ configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
test -d $$dir || mkdir $$dir || exit 1; \
abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; \
(cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1
(cd $$dir && $$abs_srcdir/$$dir/configure --with-dist) || exit 1
# ---------- #

View File

@ -31,6 +31,9 @@ AC_CONFIG_HEADERS([config.h:config-h.in])
AC_CONFIG_SRCDIR([foof.f])
AC_CONFIG_AUX_DIR([../../libltdl/config])
AC_ARG_WITH([dist], AS_HELP_STRING([--with-dist],
[ignore errors not affecting `make dist']))
## ------------------------ ##
## Automake Initialisation. ##
## ------------------------ ##
@ -46,10 +49,14 @@ AC_PROG_CC
## Fortran compiler checks. ##
## ------------------------ ##
AC_PROG_F77
dnl Check the flags needed to link f77 programs with ld (i.e. cc)
AC_F77_LIBRARY_LDFLAGS
dnl Check for underscoring of external names
AC_F77_WRAPPERS
dnl When configuring for `make dist' purposes, skip checks that may yield fatal
dnl errors when there is no working F77 compiler.
if test -z "$with_dist"; then
dnl Check the flags needed to link f77 programs with ld (i.e. cc)
AC_F77_LIBRARY_LDFLAGS
dnl Check for underscoring of external names
AC_F77_WRAPPERS
fi
## ----------------------- ##
## Libtool initialisation. ##

View File

@ -31,6 +31,9 @@ AC_CONFIG_HEADERS([config.h:config-h.in])
AC_CONFIG_SRCDIR([foof.f90])
AC_CONFIG_AUX_DIR([../../libltdl/config])
AC_ARG_WITH([dist], AS_HELP_STRING([--with-dist],
[ignore errors not affecting `make dist']))
## ------------------------ ##
## Automake Initialisation. ##
## ------------------------ ##
@ -47,15 +50,19 @@ AC_PROG_CC
## ------------------------ ##
AC_LANG_PUSH([Fortran])
AC_PROG_FC
dnl Check the flags needed to link fc programs with ld (i.e. cc)
AC_FC_LIBRARY_LDFLAGS
dnl Check for underscoring of external names
AC_FC_WRAPPERS
dnl We need to use .f90 and not .f to enable Automake FC support
dnl Some Intel ifc/ifort do not understand .f95. :-/
AC_FC_SRCEXT([f90])
dnl Yes, we want free form Fortran!
AC_FC_FREEFORM
dnl When configuring for `make dist' purposes, skip checks that may yield fatal
dnl errors when there is no working F90 compiler.
if test -z "$with_dist"; then
dnl Check the flags needed to link fc programs with ld (i.e. cc)
AC_FC_LIBRARY_LDFLAGS
dnl Check for underscoring of external names
AC_FC_WRAPPERS
dnl We need to use .f90 and not .f to enable Automake FC support
dnl Some Intel ifc/ifort do not understand .f95. :-/
AC_FC_SRCEXT([f90])
dnl Yes, we want free form Fortran!
AC_FC_FREEFORM
fi
AC_LANG_POP
## ----------------------- ##