Introduce CCTK_HAVE_INT* and CCTK_HAVE_REAL* macros.

git-svn-id: http://svn.cactuscode.org/flesh/trunk@3774 17b73243-c579-4c4c-a9d2-2d5706c11dac

4 files changed, 58 insertions, 9 deletions

diff --git a/lib/make/cctk_Config.h.in b/lib/make/cctk_Config.h.in
index 22902190..f2f7b07e 100644
--- a/lib/make/cctk_Config.h.in
+++ b/lib/make/cctk_Config.h.in
@@ -135,6 +135,19 @@
 
 /******************************************************************************/
 
+/* Integer sizes */
+#undef CCTK_HAVE_INT8
+#undef CCTK_HAVE_INT4
+#undef CCTK_HAVE_INT2
+#undef CCTK_HAVE_INT1
+
+/* Float sizes */
+#undef CCTK_HAVE_REAL16
+#undef CCTK_HAVE_REAL8
+#undef CCTK_HAVE_REAL4
+
+/******************************************************************************/
+
 #ifdef CCODE
 
 /* Integer sizes */
diff --git a/lib/make/configure b/lib/make/configure
index 7247da95..ebc6ef3f 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -590,7 +590,7 @@ fi
 
 #######################################################################
 # determine OPTIMISE_MODE from the OPTIMISE/OPTIMIZE option
-# if this option isn't set OPTIMISE_MODE will default to 'yes' 
+# if this option isn't set OPTIMISE_MODE will default to 'yes'
 
 OPTIMISE_MODE='yes'
 if test -n "$OPTIMISE" ; then
@@ -4619,6 +4619,10 @@ if test -n "$CCTK_INT8" ; then
 #define CCTK_INT8 $CCTK_INT8
 EOF
 
+  cat >> confdefs.h <<\EOF
+#define CCTK_HAVE_INT8 1
+EOF
+
 fi
 
 if test -n "$CCTK_INT4" ; then
@@ -4626,6 +4630,10 @@ if test -n "$CCTK_INT4" ; then
 #define CCTK_INT4 $CCTK_INT4
 EOF
 
+  cat >> confdefs.h <<\EOF
+#define CCTK_HAVE_INT4 1
+EOF
+
 fi
 
 if test -n "$CCTK_INT2" ; then
@@ -4633,6 +4641,10 @@ if test -n "$CCTK_INT2" ; then
 #define CCTK_INT2 $CCTK_INT2
 EOF
 
+  cat >> confdefs.h <<\EOF
+#define CCTK_HAVE_INT2 1
+EOF
+
 fi
 
 if test -n "$CCTK_INT1" ; then
@@ -4640,6 +4652,10 @@ if test -n "$CCTK_INT1" ; then
 #define CCTK_INT1 $CCTK_INT1
 EOF
 
+  cat >> confdefs.h <<\EOF
+#define CCTK_HAVE_INT1 1
+EOF
+
 fi
 
 # Float types
@@ -4676,6 +4692,10 @@ if test -n "$CCTK_REAL16" ; then
 #define CCTK_REAL16 $CCTK_REAL16
 EOF
 
+  cat >> confdefs.h <<\EOF
+#define CCTK_HAVE_REAL16 1
+EOF
+
 fi
 
 if test -n "$CCTK_REAL8" ; then
@@ -4683,6 +4703,10 @@ if test -n "$CCTK_REAL8" ; then
 #define CCTK_REAL8 $CCTK_REAL8
 EOF
 
+  cat >> confdefs.h <<\EOF
+#define CCTK_HAVE_REAL8 1
+EOF
+
 fi
 
 if test -n "$CCTK_REAL4" ; then
@@ -4690,6 +4714,10 @@ if test -n "$CCTK_REAL4" ; then
 #define CCTK_REAL4 $CCTK_REAL4
 EOF
 
+  cat >> confdefs.h <<\EOF
+#define CCTK_HAVE_REAL4 1
+EOF
+
 fi
 
 
diff --git a/lib/make/configure.in b/lib/make/configure.in
index d1801e2a..7663a96a 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -37,7 +37,7 @@ fi
 
 #######################################################################
 # determine OPTIMISE_MODE from the OPTIMISE/OPTIMIZE option
-# if this option isn't set OPTIMISE_MODE will default to 'yes' 
+# if this option isn't set OPTIMISE_MODE will default to 'yes'
 
 OPTIMISE_MODE='yes'
 if test -n "$OPTIMISE" ; then
@@ -621,18 +621,22 @@ CCTK_INT1="signed char"
 
 if test -n "$CCTK_INT8" ; then
   AC_DEFINE_UNQUOTED(CCTK_INT8, $CCTK_INT8)
+  AC_DEFINE(CCTK_HAVE_INT8)
 fi
 
 if test -n "$CCTK_INT4" ; then
   AC_DEFINE_UNQUOTED(CCTK_INT4, $CCTK_INT4)
+  AC_DEFINE(CCTK_HAVE_INT4)
 fi
 
 if test -n "$CCTK_INT2" ; then
   AC_DEFINE_UNQUOTED(CCTK_INT2, $CCTK_INT2)
+  AC_DEFINE(CCTK_HAVE_INT2)
 fi
 
 if test -n "$CCTK_INT1" ; then
   AC_DEFINE_UNQUOTED(CCTK_INT1, $CCTK_INT1)
+  AC_DEFINE(CCTK_HAVE_INT1)
 fi
 
 # Float types
@@ -666,14 +670,17 @@ esac
 
 if test -n "$CCTK_REAL16" ; then
   AC_DEFINE_UNQUOTED(CCTK_REAL16, $CCTK_REAL16)
+  AC_DEFINE(CCTK_HAVE_REAL16)
 fi
 
 if test -n "$CCTK_REAL8" ; then
   AC_DEFINE_UNQUOTED(CCTK_REAL8, $CCTK_REAL8)
+  AC_DEFINE(CCTK_HAVE_REAL8)
 fi
 
 if test -n "$CCTK_REAL4" ; then
   AC_DEFINE_UNQUOTED(CCTK_REAL4, $CCTK_REAL4)
+  AC_DEFINE(CCTK_HAVE_REAL4)
 fi
 
 
diff --git a/lib/make/force-reconfigure b/lib/make/force-reconfigure
index 1f7bd068..26ff13d5 100644
--- a/lib/make/force-reconfigure
+++ b/lib/make/force-reconfigure
@@ -1,12 +1,13 @@
 # /*@@
-#   @file      force-reconfigure
-#   @date      Wed Mar 31 2004
-#   @author    Erik Schnetter
-#   @desc 
-#   Timestamp file for forcing reconfiguring configurations
-#   @enddesc 
-#   @version $Id: force-reconfigure,v 1.1 2004-04-10 19:57:02 schnetter Exp $
+#   @file    force-reconfigure
+#   @date    Wed Mar 31 2004
+#   @author  Erik Schnetter
+#   @desc
+#            Timestamp file for forcing reconfiguring configurations
+#   @enddesc
+#   @version $Id: force-reconfigure,v 1.2 2004-06-20 12:53:30 tradke Exp $
 # @@*/
 
 31 Mar 2004: created
 10 Apr 2004: thorns now check for FFTW, MPI, and PETSc in a more reliable way
+20 Jun 2004: introduce CCTK_HAVE_INT* and CCTK_HAVE_REAL* macros