Rename datatype availability macros from CCTK_HAVE_<datatype> into

HAVE_CCTK_<datatype> to be consistent with other configure macros.


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

5 files changed, 48 insertions, 39 deletions

diff --git a/lib/make/aclocal.m4 b/lib/make/aclocal.m4
index 2c73f094..b2b42819 100644
--- a/lib/make/aclocal.m4
+++ b/lib/make/aclocal.m4
@@ -2,10 +2,10 @@ dnl /*@@
 dnl   @file      aclocal.m4
 dnl   @date      Thu Oct 21 00:05:58 1999
 dnl   @author    Tom Goodale
-dnl   @desc 
+dnl   @desc
 dnl   Local Cactus macros
 dnl   @enddesc
-dnl   @version $Header$ 
+dnl   @version $Header$
 dnl @@*/
 
 
@@ -37,7 +37,7 @@ dnl CCTK_CHECK_HEADERS(HEADER-FILE... [, ADDITIONAL_CODE [, ACTION-IF-FOUND [, A
 AC_DEFUN(CCTK_CHECK_HEADERS,
 [for cctk_hdr in $1
 do
-CCTK_CHECK_HEADER($cctk_hdr, 
+CCTK_CHECK_HEADER($cctk_hdr,
 [$2 ],
 [changequote(, )dnl
   cctk_tr_hdr=HAVE_`echo $cctk_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
@@ -49,7 +49,7 @@ done
 
 dnl CCTK_FIND_NULLDEVICE
 dnl Have to do it in this rather bizarre way
-dnl as cygwin emulates /dev/null 
+dnl as cygwin emulates /dev/null
 AC_DEFUN(CCTK_FIND_NULLDEVICE,
 [AC_MSG_CHECKING([for the null device])
 AC_CACHE_VAL(cctk_cv_nulldevice,
@@ -79,7 +79,7 @@ AC_CACHE_VAL(cctk_cv_time_ftime,
 [AC_TRY_LINK([#include <stdio.h>
 #include <time.h>
 #include <sys/types.h>
-#include <sys/timeb.h>], 
+#include <sys/timeb.h>],
 [  struct _timeb timebs;
   _ftime(&timebs);
   printf("%f\n",(double)(timebs.time + timebs.millitm/1000.0));
@@ -99,7 +99,7 @@ AC_CACHE_VAL(cctk_cv_time_getrusage,
 [AC_TRY_LINK([#include <stdio.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <unistd.h>], 
+#include <unistd.h>],
 [struct rusage ru;
  getrusage(RUSAGE_SELF, &ru);
  printf("%f\n",(double)(ru.ru_utime.tv_sec + (double)ru.ru_utime.tv_usec/1000000.0));
@@ -116,7 +116,7 @@ fi
 AC_DEFUN(CCTK_TIME_GETTIMEOFDAY,
 [AC_MSG_CHECKING([for availability of gettimeofday timing])
 AC_CACHE_VAL(cctk_cv_time_gettimeofday,
-[AC_TRY_LINK([], 
+[AC_TRY_LINK([],
 [gettimeofday();
  return 0;], eval "cctk_cv_time_gettimeofday=yes",
   eval "cctk_cv_time_gettimeofday=no")])dnl
@@ -132,7 +132,7 @@ if eval "test \"`echo '$cctk_cv_time_gettimeofday'`\" = yes"; then
 AC_CACHE_VAL(cctk_cv_time_gettimeofday_timezone,
 [AC_TRY_LINK([#include <stdio.h>
 #include <sys/time.h>
-#include <unistd.h>], 
+#include <unistd.h>],
 [struct timeval tp;
  struct timezone tzp;
  gettimeofday(&tp, &tzp);
@@ -314,7 +314,7 @@ AC_DEFUN(CCTK_C_BOOL,
 AC_TRY_COMPILE(, bool foo;, cctk_cv_have_c_bool=yes, cctk_cv_have_c_bool=no)
 ])
 if test "$cctk_cv_have_c_bool" = "yes" ; then
-   AC_DEFINE(CCTK_HAVE_C_BOOL)
+   AC_DEFINE(HAVE_CCTK_C_BOOL)
 fi
 ])
 
@@ -327,6 +327,6 @@ AC_TRY_COMPILE(, bool foo;, cctk_cv_have_cxx_bool=yes, cctk_cv_have_cxx_bool=no)
 AC_LANG_RESTORE
 ])
 if test "$cctk_cv_have_cxx_bool" = "yes" ; then
-   AC_DEFINE(CCTK_HAVE_CXX_BOOL)
+   AC_DEFINE(HAVE_CCTK_CXX_BOOL)
 fi
 ])
diff --git a/lib/make/cctk_Config.h.in b/lib/make/cctk_Config.h.in
index 723bf694..f5998ce6 100644
--- a/lib/make/cctk_Config.h.in
+++ b/lib/make/cctk_Config.h.in
@@ -108,15 +108,15 @@
 #undef CCTK_INTEGER_PRECISION_1
 
 /* Integer sizes */
-#undef CCTK_HAVE_INT8
-#undef CCTK_HAVE_INT4
-#undef CCTK_HAVE_INT2
-#undef CCTK_HAVE_INT1
+#undef HAVE_CCTK_INT8
+#undef HAVE_CCTK_INT4
+#undef HAVE_CCTK_INT2
+#undef HAVE_CCTK_INT1
 
 /* Float sizes */
-#undef CCTK_HAVE_REAL16
-#undef CCTK_HAVE_REAL8
-#undef CCTK_HAVE_REAL4
+#undef HAVE_CCTK_REAL16
+#undef HAVE_CCTK_REAL8
+#undef HAVE_CCTK_REAL4
 
 /******************************************************************************/
 
@@ -151,13 +151,18 @@
 #endif
 
 /* Some C compilers (e.g. c99 ones) define bool */
-#undef CCTK_HAVE_C_BOOL
+#undef HAVE_CCTK_C_BOOL
+
+/* deprecated in beta15 */
+#ifdef HAVE_CCTK_C_BOOL
+#define CCTK_HAVE_C_BOOL
+#endif
 
 /* Since this is non-standard leave commented out for the moment */
 #if 0
-#ifndef CCTK_HAVE_C_BOOL
+#ifndef HAVE_CCTK_C_BOOL
 typedef enum {false, true} bool;
-#endif /* CCTK_HAVE_CXX_BOOL */
+#endif /* HAVE_CCTK_CXX_BOOL */
 #endif
 
 #endif /* ! defined __cplusplus */
@@ -169,10 +174,13 @@ typedef enum {false, true} bool;
 #ifdef __cplusplus
 
 /* Some C++ compilers don't have bool ! */
-#undef CCTK_HAVE_CXX_BOOL
+#undef HAVE_CCTK_CXX_BOOL
 
-#ifndef CCTK_HAVE_CXX_BOOL
+#ifndef HAVE_CCTK_CXX_BOOL
 typedef enum {false, true} bool;
+#else
+/* deprecated in beta15 */
+#define CCTK_HAVE_CXX_BOOL
 #endif
 
 /* Some C++ compilers recognise the restrict keyword */
diff --git a/lib/make/configure b/lib/make/configure
index 3a62288a..12f4136c 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -3946,7 +3946,7 @@ fi
 echo "$ac_t""$cctk_cv_have_c_bool" 1>&6
 if test "$cctk_cv_have_c_bool" = "yes" ; then
    cat >> confdefs.h <<\EOF
-#define CCTK_HAVE_C_BOOL 1
+#define HAVE_CCTK_C_BOOL 1
 EOF
 
 fi
@@ -3996,7 +3996,7 @@ fi
 echo "$ac_t""$cctk_cv_have_cxx_bool" 1>&6
 if test "$cctk_cv_have_cxx_bool" = "yes" ; then
    cat >> confdefs.h <<\EOF
-#define CCTK_HAVE_CXX_BOOL 1
+#define HAVE_CCTK_CXX_BOOL 1
 EOF
 
 fi
@@ -4620,7 +4620,7 @@ if test -n "$CCTK_INT8" ; then
 EOF
 
   cat >> confdefs.h <<\EOF
-#define CCTK_HAVE_INT8 1
+#define HAVE_CCTK_INT8 1
 EOF
 
 fi
@@ -4631,7 +4631,7 @@ if test -n "$CCTK_INT4" ; then
 EOF
 
   cat >> confdefs.h <<\EOF
-#define CCTK_HAVE_INT4 1
+#define HAVE_CCTK_INT4 1
 EOF
 
 fi
@@ -4642,7 +4642,7 @@ if test -n "$CCTK_INT2" ; then
 EOF
 
   cat >> confdefs.h <<\EOF
-#define CCTK_HAVE_INT2 1
+#define HAVE_CCTK_INT2 1
 EOF
 
 fi
@@ -4653,7 +4653,7 @@ if test -n "$CCTK_INT1" ; then
 EOF
 
   cat >> confdefs.h <<\EOF
-#define CCTK_HAVE_INT1 1
+#define HAVE_CCTK_INT1 1
 EOF
 
 fi
@@ -4693,7 +4693,7 @@ if test -n "$CCTK_REAL16" ; then
 EOF
 
   cat >> confdefs.h <<\EOF
-#define CCTK_HAVE_REAL16 1
+#define HAVE_CCTK_REAL16 1
 EOF
 
 fi
@@ -4704,7 +4704,7 @@ if test -n "$CCTK_REAL8" ; then
 EOF
 
   cat >> confdefs.h <<\EOF
-#define CCTK_HAVE_REAL8 1
+#define HAVE_CCTK_REAL8 1
 EOF
 
 fi
@@ -4715,7 +4715,7 @@ if test -n "$CCTK_REAL4" ; then
 EOF
 
   cat >> confdefs.h <<\EOF
-#define CCTK_HAVE_REAL4 1
+#define HAVE_CCTK_REAL4 1
 EOF
 
 fi
diff --git a/lib/make/configure.in b/lib/make/configure.in
index dfda8959..c8f572a1 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -621,22 +621,22 @@ CCTK_INT1='signed char'
 
 if test -n "$CCTK_INT8" ; then
   AC_DEFINE_UNQUOTED(CCTK_INT8, $CCTK_INT8)
-  AC_DEFINE(CCTK_HAVE_INT8)
+  AC_DEFINE(HAVE_CCTK_INT8)
 fi
 
 if test -n "$CCTK_INT4" ; then
   AC_DEFINE_UNQUOTED(CCTK_INT4, $CCTK_INT4)
-  AC_DEFINE(CCTK_HAVE_INT4)
+  AC_DEFINE(HAVE_CCTK_INT4)
 fi
 
 if test -n "$CCTK_INT2" ; then
   AC_DEFINE_UNQUOTED(CCTK_INT2, $CCTK_INT2)
-  AC_DEFINE(CCTK_HAVE_INT2)
+  AC_DEFINE(HAVE_CCTK_INT2)
 fi
 
 if test -n "$CCTK_INT1" ; then
   AC_DEFINE_UNQUOTED(CCTK_INT1, $CCTK_INT1)
-  AC_DEFINE(CCTK_HAVE_INT1)
+  AC_DEFINE(HAVE_CCTK_INT1)
 fi
 
 # Float types
@@ -670,17 +670,17 @@ esac
 
 if test -n "$CCTK_REAL16" ; then
   AC_DEFINE_UNQUOTED(CCTK_REAL16, $CCTK_REAL16)
-  AC_DEFINE(CCTK_HAVE_REAL16)
+  AC_DEFINE(HAVE_CCTK_REAL16)
 fi
 
 if test -n "$CCTK_REAL8" ; then
   AC_DEFINE_UNQUOTED(CCTK_REAL8, $CCTK_REAL8)
-  AC_DEFINE(CCTK_HAVE_REAL8)
+  AC_DEFINE(HAVE_CCTK_REAL8)
 fi
 
 if test -n "$CCTK_REAL4" ; then
   AC_DEFINE_UNQUOTED(CCTK_REAL4, $CCTK_REAL4)
-  AC_DEFINE(CCTK_HAVE_REAL4)
+  AC_DEFINE(HAVE_CCTK_REAL4)
 fi
 
 
diff --git a/lib/make/force-reconfigure b/lib/make/force-reconfigure
index 26ff13d5..0fd9eee6 100644
--- a/lib/make/force-reconfigure
+++ b/lib/make/force-reconfigure
@@ -5,9 +5,10 @@
 #   @desc
 #            Timestamp file for forcing reconfiguring configurations
 #   @enddesc
-#   @version $Id: force-reconfigure,v 1.2 2004-06-20 12:53:30 tradke Exp $
+#   @version $Id: force-reconfigure,v 1.3 2004-06-26 17:37:04 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
+26 Jun 2004: renamed CCTK_HAVE_* macros into CCTK_HAVE_*