summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>2005-09-26 01:06:44 +0000
committerschnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>2005-09-26 01:06:44 +0000
commit6088cd914c9e75fa2a2e88a463528594c50d710d (patch)
tree4d55788379fb89ff3bc4870330afb8de997104bb
parent373e49fdeac6a0e592269464acd6bef1f6405858 (diff)
Introduce a new configuration flag DISABLE_REAL16 which disables
support for the datatype CCTK_REAL16. This is necessary because Cactus only detects whether C supports this datatype, and then assumes that Fortran behaves the same. git-svn-id: http://svn.cactuscode.org/flesh/trunk@4149 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r--doc/UsersGuide/RunningCactus.tex8
-rwxr-xr-xlib/make/configure6
-rw-r--r--lib/make/configure.in6
3 files changed, 18 insertions, 2 deletions
diff --git a/doc/UsersGuide/RunningCactus.tex b/doc/UsersGuide/RunningCactus.tex
index ccedb79d..d1c36752 100644
--- a/doc/UsersGuide/RunningCactus.tex
+++ b/doc/UsersGuide/RunningCactus.tex
@@ -447,6 +447,14 @@ created by Cactus. The only options available are {\tt yes} and {\tt
no}, the default is {\tt yes}. Set this to {\tt no} if your compiler
reports error messages about unrecognised \verb|#| directives.
+\item [{\tt DISABLE\_REAL16}] Disable support for the data type {\tt
+ CCTK\_REAL16}. The only options available are {\tt yes} and {\tt
+ no}, the default is {\tt no}. Cactus autodetects this data type
+ only for C. If the C compiler supports it, but the Fortran compiler
+ does not, it may be necessary to disable {\tt CCTK\_REAL16}
+ altogether, since Cactus assumes that data types are fully supported
+ if they exist.
+
\item [{\tt DEBUG}]
* Specifies what type of debug mode should be used,
the default is no debugging.
diff --git a/lib/make/configure b/lib/make/configure
index c18c5920..22237c4e 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -4815,7 +4815,11 @@ case "x$ac_cv_sizeof_float" in
CCTK_REAL4='float' ;;
esac
-if test -n "$CCTK_REAL16" ; then
+if test "x$DISABLE_REAL16" != 'xyes' -a "x$DISABLE_REAL16" != 'xno' -a "x$DISABLE_REAL16" != 'x'; then
+ { echo "configure: error: Didn't recognise setting of DISABLE_REAL16=\"$DISABLE_REAL16\"; should be either \"yes\" or \"no\" or \"\" (empty)" 1>&2; exit 1; }
+fi
+
+if test -n "$CCTK_REAL16" -a "x$DISABLE_REAL16" != 'xyes' ; then
cat >> confdefs.h <<EOF
#define CCTK_REAL16 $CCTK_REAL16
EOF
diff --git a/lib/make/configure.in b/lib/make/configure.in
index 4eedc758..1e60a2f4 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -686,7 +686,11 @@ case "x$ac_cv_sizeof_float" in
CCTK_REAL4='float' ;;
esac
-if test -n "$CCTK_REAL16" ; then
+if test "x$DISABLE_REAL16" != 'xyes' -a "x$DISABLE_REAL16" != 'xno' -a "x$DISABLE_REAL16" != 'x'; then
+ AC_ERROR([Didn't recognise setting of DISABLE_REAL16=\"$DISABLE_REAL16\"; should be either \"yes\" or \"no\" or \"\" (empty)])
+fi
+
+if test -n "$CCTK_REAL16" -a "x$DISABLE_REAL16" != 'xyes' ; then
AC_DEFINE_UNQUOTED(CCTK_REAL16, $CCTK_REAL16)
AC_DEFINE(HAVE_CCTK_REAL16)
fi