[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Fix `make dist' on systems with no F9x compiler
From: |
Noah Misch |
Subject: |
Fix `make dist' on systems with no F9x compiler |
Date: |
Thu, 3 May 2007 18:52:24 -0700 |
User-agent: |
Mutt/1.5.9i |
`make dist' needs every test demo directory configured. If the system has no
F90 compiler, tests/fcdemo/configure always fails. This patch adds an option to
that configure script that suppresses the potentially fatal check. We then use
the option when configuring a test demo directory for the sake of `make dist'.
2007-05-03 Noah Misch <address@hidden>
* tests/fcdemo/configure.ac <dist>: New option. Skip call to
AC_FC_SRCEXT when specified.
* Makefile.am (@DIST_MAKEFILE_LIST@): Pass --with-dist.
diff -urpX dontdiff lt-bootstrap/Makefile.am lt-fcdist/Makefile.am
--- lt-bootstrap/Makefile.am 2007-04-24 16:46:17.000000000 -0400
+++ lt-fcdist/Makefile.am 2007-05-03 21:12:29.000000000 -0400
@@ -106,7 +106,7 @@ configure-subdirs distdir: $(DIST_MAKEFI
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
# ---------- #
diff -urpX dontdiff lt-bootstrap/tests/fcdemo/configure.ac
lt-fcdist/tests/fcdemo/configure.ac
--- lt-bootstrap/tests/fcdemo/configure.ac 2007-03-25 07:12:43.000000000
-0500
+++ lt-fcdist/tests/fcdemo/configure.ac 2007-05-03 21:14:10.000000000 -0400
@@ -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. ##
## ------------------------ ##
@@ -53,7 +56,11 @@ dnl Check for underscoring of external n
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 When configuring for `make dist' purposes, skip this check, as it yields a
+dnl fatal error when there is no working F90 compiler.
+if test -z "$with_dist"; then
+ AC_FC_SRCEXT([f90])
+fi
dnl Yes, we want free form Fortran!
AC_FC_FREEFORM
AC_LANG_POP
- Fix `make dist' on systems with no F9x compiler,
Noah Misch <=