summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/make/aclocal.m425
-rw-r--r--lib/make/cctk_Config.h.in6
-rwxr-xr-xlib/make/configure546
-rw-r--r--lib/make/configure.in5
-rw-r--r--lib/make/force-reconfigure3
-rw-r--r--lib/sbin/CreateParameterBindings.pl11
-rw-r--r--lib/sbin/GridFuncStuff.pl99
-rw-r--r--lib/sbin/create_c_stuff.pl11
-rw-r--r--src/include/cctk.h174
-rw-r--r--src/include/cctk_Groups.h4
-rw-r--r--src/include/cctk_Types.h56
-rw-r--r--src/main/Groups.c151
12 files changed, 701 insertions, 390 deletions
diff --git a/lib/make/aclocal.m4 b/lib/make/aclocal.m4
index a47da973..7d737582 100644
--- a/lib/make/aclocal.m4
+++ b/lib/make/aclocal.m4
@@ -330,3 +330,28 @@ if test "$cctk_cv_have_cxx_bool" = "yes" ; then
AC_DEFINE(HAVE_CCTK_CXX_BOOL)
fi
])
+
+
+
+AC_DEFUN(CCTK_C_ATTRIBUTE_UNUSED,
+[AC_CACHE_CHECK([for C __attribute__((unused))], cctk_cv_have_c_attribute_unused,
+[cctk_cv_have_c_attribute_unused=no
+AC_TRY_COMPILE(, double * foo __attribute__((unused));, cctk_cv_have_c_attribute_unused=yes, cctk_cv_have_c_attribute_unused=no)
+])
+if test "$cctk_cv_have_c_attribute_unused" = "yes" ; then
+ AC_DEFINE(HAVE_CCTK_C_ATTRIBUTE_UNUSED)
+fi
+])
+
+AC_DEFUN(CCTK_CXX_ATTRIBUTE_UNUSED,
+[AC_CACHE_CHECK([for CXX __attribute__((unused))], cctk_cv_have_cxx_attribute_unused,
+[cctk_cv_have_cxx_attribute_unused=no
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_TRY_COMPILE(, double * foo __attribute__((unused));, cctk_cv_have_cxx_attribute_unused=yes, cctk_cv_have_cxx_attribute_unused=no)
+AC_LANG_RESTORE
+])
+if test "$cctk_cv_have_cxx_attribute_unused" = "yes" ; then
+ AC_DEFINE(HAVE_CCTK_CXX_ATTRIBUTE_UNUSED)
+fi
+])
diff --git a/lib/make/cctk_Config.h.in b/lib/make/cctk_Config.h.in
index fc9cc4a5..bebfac60 100644
--- a/lib/make/cctk_Config.h.in
+++ b/lib/make/cctk_Config.h.in
@@ -173,6 +173,9 @@ typedef enum {false, true} bool;
#endif /* HAVE_CCTK_CXX_BOOL */
#endif
+/* Whether __attribute__((unused)) exists. */
+#undef HAVE_CCTK_C_ATTRIBUTE_UNUSED
+
#endif /* ! defined __cplusplus */
/****************************************************************************/
@@ -191,6 +194,9 @@ typedef enum {false, true} bool;
#define CCTK_HAVE_CXX_BOOL
#endif
+/* Whether __attribute__((unused)) exists. */
+#undef HAVE_CCTK_CXX_ATTRIBUTE_UNUSED
+
/* Some C++ compilers recognise the restrict keyword */
#undef CCTK_CXX_RESTRICT
diff --git a/lib/make/configure b/lib/make/configure
index 815e3a5a..c18c5920 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -47,6 +47,12 @@
+
+
+
+
+
+
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.13
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@@ -642,7 +648,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:646: checking host system type" >&5
+echo "configure:652: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -688,7 +694,7 @@ if test -n "$LIBS" ; then
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:692: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:698: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -721,7 +727,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:725: checking for $ac_word" >&5
+echo "configure:731: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -753,7 +759,7 @@ done
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:757: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -764,12 +770,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 768 "configure"
+#line 774 "configure"
#include "confdefs.h"
main(){return(0);} PilotMain(){return(0);}
EOF
-if { (eval echo configure:773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -795,12 +801,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:799: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:805: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:804: checking whether we are using GNU C" >&5
+echo "configure:810: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -809,7 +815,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -825,7 +831,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:829: checking for $ac_word" >&5
+echo "configure:835: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -857,7 +863,7 @@ done
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:861: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:867: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -868,12 +874,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 872 "configure"
+#line 878 "configure"
#include "confdefs.h"
int main(){return(0);} extern "C" int PilotMain(){return(0);}
EOF
-if { (eval echo configure:877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -899,12 +905,12 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:903: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:909: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:908: checking whether we are using GNU C++" >&5
+echo "configure:914: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -913,7 +919,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -927,7 +933,7 @@ if test -z "$RANLIB" ; then
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:931: checking for $ac_word" >&5
+echo "configure:937: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -963,7 +969,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:967: checking for $ac_word" >&5
+echo "configure:973: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1009,7 +1015,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1013: checking for $ac_word" >&5
+echo "configure:1019: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_FPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1053,7 +1059,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1057: checking for $ac_word" >&5
+echo "configure:1063: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1090,7 +1096,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1094: checking for $ac_word" >&5
+echo "configure:1100: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_F90'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1128,7 +1134,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1132: checking for $ac_word" >&5
+echo "configure:1138: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1165,7 +1171,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1169: checking for $ac_word" >&5
+echo "configure:1175: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1202,7 +1208,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1206: checking for $ac_word" >&5
+echo "configure:1212: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_MKDIR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1239,7 +1245,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1243: checking for $ac_word" >&5
+echo "configure:1249: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_SHELL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1356,7 +1362,7 @@ unset LDFLAGS
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1360: checking how to run the C preprocessor" >&5
+echo "configure:1366: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1371,13 +1377,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1375 "configure"
+#line 1381 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1388,13 +1394,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1392 "configure"
+#line 1398 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1405,13 +1411,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1409 "configure"
+#line 1415 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1436,12 +1442,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1440: checking for ANSI C header files" >&5
+echo "configure:1446: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1445 "configure"
+#line 1451 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1449,7 +1455,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1466,7 +1472,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1470 "configure"
+#line 1476 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1484,7 +1490,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1488 "configure"
+#line 1494 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1505,7 +1511,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1509 "configure"
+#line 1515 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1516,7 +1522,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1543,14 +1549,14 @@ fi
if test "x$cross_compiling" = 'xno' ; then
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:1547: checking whether byte ordering is bigendian" >&5
+echo "configure:1553: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 1554 "configure"
+#line 1560 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -1561,11 +1567,11 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:1565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 1569 "configure"
+#line 1575 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -1576,7 +1582,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:1580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@@ -1596,7 +1602,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1600 "configure"
+#line 1606 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@@ -1609,7 +1615,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
@@ -1652,7 +1658,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_LONG_LONG" ; then
fi
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:1656: checking size of long long" >&5
+echo "configure:1662: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1660,7 +1666,7 @@ else
ac_cv_sizeof_long_long=$SIZEOF_LONG_LONG
else
cat > conftest.$ac_ext <<EOF
-#line 1664 "configure"
+#line 1670 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1671,7 +1677,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
@@ -1696,7 +1702,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_LONG_INT" ; then
fi
echo $ac_n "checking size of long int""... $ac_c" 1>&6
-echo "configure:1700: checking size of long int" >&5
+echo "configure:1706: checking size of long int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1704,7 +1710,7 @@ else
ac_cv_sizeof_long_int=$SIZEOF_LONG_INT
else
cat > conftest.$ac_ext <<EOF
-#line 1708 "configure"
+#line 1714 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1715,7 +1721,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_int=`cat conftestval`
else
@@ -1740,7 +1746,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_INT" ; then
fi
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1744: checking size of int" >&5
+echo "configure:1750: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1748,7 +1754,7 @@ else
ac_cv_sizeof_int=$SIZEOF_INT
else
cat > conftest.$ac_ext <<EOF
-#line 1752 "configure"
+#line 1758 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1759,7 +1765,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -1784,7 +1790,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_SHORT_INT" ; then
fi
echo $ac_n "checking size of short int""... $ac_c" 1>&6
-echo "configure:1788: checking size of short int" >&5
+echo "configure:1794: checking size of short int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1792,7 +1798,7 @@ else
ac_cv_sizeof_short_int=$SIZEOF_SHORT_INT
else
cat > conftest.$ac_ext <<EOF
-#line 1796 "configure"
+#line 1802 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1803,7 +1809,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short_int=`cat conftestval`
else
@@ -1830,7 +1836,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_LONG_DOUBLE" ; then
fi
echo $ac_n "checking size of long double""... $ac_c" 1>&6
-echo "configure:1834: checking size of long double" >&5
+echo "configure:1840: checking size of long double" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1838,7 +1844,7 @@ else
ac_cv_sizeof_long_double=$SIZEOF_LONG_DOUBLE
else
cat > conftest.$ac_ext <<EOF
-#line 1842 "configure"
+#line 1848 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1849,7 +1855,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_double=`cat conftestval`
else
@@ -1874,7 +1880,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_DOUBLE" ; then
fi
echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:1878: checking size of double" >&5
+echo "configure:1884: checking size of double" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1882,7 +1888,7 @@ else
ac_cv_sizeof_double=$SIZEOF_DOUBLE
else
cat > conftest.$ac_ext <<EOF
-#line 1886 "configure"
+#line 1892 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1893,7 +1899,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_double=`cat conftestval`
else
@@ -1919,7 +1925,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_FLOAT" ; then
fi
echo $ac_n "checking size of float""... $ac_c" 1>&6
-echo "configure:1923: checking size of float" >&5
+echo "configure:1929: checking size of float" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1927,7 +1933,7 @@ else
ac_cv_sizeof_float=$SIZEOF_FLOAT
else
cat > conftest.$ac_ext <<EOF
-#line 1931 "configure"
+#line 1937 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1938,7 +1944,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_float=`cat conftestval`
else
@@ -1965,7 +1971,7 @@ if test "x$cross_compiling" = 'xyes' -a -z "$SIZEOF_POINTER" ; then
fi
echo $ac_n "checking size of char *""... $ac_c" 1>&6
-echo "configure:1969: checking size of char *" >&5
+echo "configure:1975: checking size of char *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1973,7 +1979,7 @@ else
ac_cv_sizeof_char_p=$SIZEOF_POINTER
else
cat > conftest.$ac_ext <<EOF
-#line 1977 "configure"
+#line 1983 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1984,7 +1990,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char_p=`cat conftestval`
else
@@ -2019,7 +2025,7 @@ EOF
else
echo $ac_n "checking for the null device""... $ac_c" 1>&6
-echo "configure:2023: checking for the null device" >&5
+echo "configure:2029: checking for the null device" >&5
if eval "test \"`echo '$''{'cctk_cv_nulldevice'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2056,7 +2062,7 @@ fi
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:2060: checking for X" >&5
+echo "configure:2066: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -2118,12 +2124,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 2122 "configure"
+#line 2128 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2192,14 +2198,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2196 "configure"
+#line 2202 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:2203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -2323,12 +2329,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_
for ac_func in gethostbyname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2327: checking for $ac_func" >&5
+echo "configure:2333: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2332 "configure"
+#line 2338 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2351,7 +2357,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2373,7 +2379,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in library nsl""... $ac_c" 1>&6
-echo "configure:2377: checking for gethostbyname in library nsl" >&5
+echo "configure:2383: checking for gethostbyname in library nsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2382,7 +2388,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="nsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2386 "configure"
+#line 2392 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2393,7 +2399,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:2397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2424,12 +2430,12 @@ done
# Check if we have mode_t available
echo $ac_n "checking if mode_t is defined""... $ac_c" 1>&6
-echo "configure:2428: checking if mode_t is defined" >&5
+echo "configure:2434: checking if mode_t is defined" >&5
if eval "test \"`echo '$''{'cctk_cv_have_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2433 "configure"
+#line 2439 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -2439,7 +2445,7 @@ int main() {
mode_t foo; return 0
; return 0; }
EOF
-if { (eval echo configure:2443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have_mode_t=yes"
else
@@ -2465,12 +2471,12 @@ fi
echo $ac_n "checking for availability of gettimeofday timing""... $ac_c" 1>&6
-echo "configure:2469: checking for availability of gettimeofday timing" >&5
+echo "configure:2475: checking for availability of gettimeofday timing" >&5
if eval "test \"`echo '$''{'cctk_cv_time_gettimeofday'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2474 "configure"
+#line 2480 "configure"
#include "confdefs.h"
int main() {
@@ -2478,7 +2484,7 @@ gettimeofday(0, 0);
return 0;
; return 0; }
EOF
-if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "cctk_cv_time_gettimeofday=yes"
else
@@ -2500,12 +2506,12 @@ else
fi
if eval "test \"`echo '$cctk_cv_time_gettimeofday'`\" = yes"; then
echo $ac_n "checking if gettimeofday needs timezone""... $ac_c" 1>&6
-echo "configure:2504: checking if gettimeofday needs timezone" >&5
+echo "configure:2510: checking if gettimeofday needs timezone" >&5
if eval "test \"`echo '$''{'cctk_cv_time_gettimeofday_timezone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2509 "configure"
+#line 2515 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/time.h>
@@ -2518,7 +2524,7 @@ struct timeval tp;
return 0;
; return 0; }
EOF
-if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "cctk_cv_time_gettimeofday_timezone=yes"
else
@@ -2541,12 +2547,12 @@ fi
fi
echo $ac_n "checking for availability of getrusage timing""... $ac_c" 1>&6
-echo "configure:2545: checking for availability of getrusage timing" >&5
+echo "configure:2551: checking for availability of getrusage timing" >&5
if eval "test \"`echo '$''{'cctk_cv_time_getrusage'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2550 "configure"
+#line 2556 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/time.h>
@@ -2559,7 +2565,7 @@ struct rusage ru;
return 0;
; return 0; }
EOF
-if { (eval echo configure:2563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "cctk_cv_time_getrusage=yes"
else
@@ -2581,12 +2587,12 @@ else
fi
echo $ac_n "checking for availability of _ftime timing""... $ac_c" 1>&6
-echo "configure:2585: checking for availability of _ftime timing" >&5
+echo "configure:2591: checking for availability of _ftime timing" >&5
if eval "test \"`echo '$''{'cctk_cv_time_ftime'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2590 "configure"
+#line 2596 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <time.h>
@@ -2599,7 +2605,7 @@ int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "cctk_cv_time_ftime=yes"
else
@@ -2626,12 +2632,12 @@ for cctk_hdr in time.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:2630: checking for $cctk_hdr" >&5
+echo "configure:2636: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2635 "configure"
+#line 2641 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2639,7 +2645,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2666,12 +2672,12 @@ for cctk_hdr in sys/time.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:2670: checking for $cctk_hdr" >&5
+echo "configure:2676: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2675 "configure"
+#line 2681 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2679,7 +2685,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2706,12 +2712,12 @@ for cctk_hdr in sys/types.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:2710: checking for $cctk_hdr" >&5
+echo "configure:2716: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2715 "configure"
+#line 2721 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2719,7 +2725,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2746,12 +2752,12 @@ for cctk_hdr in unistd.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:2750: checking for $cctk_hdr" >&5
+echo "configure:2756: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2755 "configure"
+#line 2761 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2759,7 +2765,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2786,12 +2792,12 @@ for cctk_hdr in string.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:2790: checking for $cctk_hdr" >&5
+echo "configure:2796: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2795 "configure"
+#line 2801 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2799,7 +2805,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2826,12 +2832,12 @@ for cctk_hdr in assert.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:2830: checking for $cctk_hdr" >&5
+echo "configure:2836: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2835 "configure"
+#line 2841 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2839,7 +2845,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2866,12 +2872,12 @@ for cctk_hdr in sys/stat.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:2870: checking for $cctk_hdr" >&5
+echo "configure:2876: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2875 "configure"
+#line 2881 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2879,7 +2885,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2906,12 +2912,12 @@ for cctk_hdr in getopt.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:2910: checking for $cctk_hdr" >&5
+echo "configure:2916: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2915 "configure"
+#line 2921 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2919,7 +2925,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2946,12 +2952,12 @@ for cctk_hdr in dirent.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:2950: checking for $cctk_hdr" >&5
+echo "configure:2956: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2955 "configure"
+#line 2961 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2959,7 +2965,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2983,12 +2989,12 @@ fi
done
echo $ac_n "checking for regex.h""... $ac_c" 1>&6
-echo "configure:2987: checking for regex.h" >&5
+echo "configure:2993: checking for regex.h" >&5
if eval "test \"`echo '$''{'cctk_cv_header_regex_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2992 "configure"
+#line 2998 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <regex.h>
@@ -2996,7 +3002,7 @@ int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:3000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_regex_h=yes"
else
@@ -3021,12 +3027,12 @@ for cctk_hdr in sys/filio.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3025: checking for $cctk_hdr" >&5
+echo "configure:3031: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3030 "configure"
+#line 3036 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3036,7 +3042,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3063,12 +3069,12 @@ for cctk_hdr in sys/ioctl.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3067: checking for $cctk_hdr" >&5
+echo "configure:3073: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3072 "configure"
+#line 3078 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3078,7 +3084,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3105,12 +3111,12 @@ for cctk_hdr in sys/socket.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3109: checking for $cctk_hdr" >&5
+echo "configure:3115: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3114 "configure"
+#line 3120 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3120,7 +3126,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3147,12 +3153,12 @@ for cctk_hdr in netinet/in.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3151: checking for $cctk_hdr" >&5
+echo "configure:3157: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3156 "configure"
+#line 3162 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3162,7 +3168,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3189,12 +3195,12 @@ for cctk_hdr in netdb.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3193: checking for $cctk_hdr" >&5
+echo "configure:3199: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3198 "configure"
+#line 3204 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3204,7 +3210,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3231,12 +3237,12 @@ for cctk_hdr in arpa/inet.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3235: checking for $cctk_hdr" >&5
+echo "configure:3241: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3240 "configure"
+#line 3246 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3246,7 +3252,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3273,12 +3279,12 @@ for cctk_hdr in winsock2.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3277: checking for $cctk_hdr" >&5
+echo "configure:3283: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3282 "configure"
+#line 3288 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3286,7 +3292,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3313,12 +3319,12 @@ for cctk_hdr in crypt.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3317: checking for $cctk_hdr" >&5
+echo "configure:3323: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3322 "configure"
+#line 3328 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -3328,7 +3334,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3355,12 +3361,12 @@ for cctk_hdr in signal.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3359: checking for $cctk_hdr" >&5
+echo "configure:3365: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3364 "configure"
+#line 3370 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3368,7 +3374,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3393,12 +3399,12 @@ done
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3397: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3403: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3402 "configure"
+#line 3408 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -3407,7 +3413,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -3432,12 +3438,12 @@ fi
# Check if we have socklen_t available
echo $ac_n "checking if socklen_t is defined""... $ac_c" 1>&6
-echo "configure:3436: checking if socklen_t is defined" >&5
+echo "configure:3442: checking if socklen_t is defined" >&5
if eval "test \"`echo '$''{'cctk_cv_have_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3441 "configure"
+#line 3447 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -3457,7 +3463,7 @@ int main() {
socklen_t foo; return 0
; return 0; }
EOF
-if { (eval echo configure:3461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have_socklen_t=yes"
else
@@ -3482,12 +3488,12 @@ fi
# Check if someone has defined SOCKET
echo $ac_n "checking if SOCKET is defined""... $ac_c" 1>&6
-echo "configure:3486: checking if SOCKET is defined" >&5
+echo "configure:3492: checking if SOCKET is defined" >&5
if eval "test \"`echo '$''{'cctk_cv_have_SOCKET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3491 "configure"
+#line 3497 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -3507,7 +3513,7 @@ int main() {
SOCKET foo; return 0
; return 0; }
EOF
-if { (eval echo configure:3511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have_SOCKET=yes"
else
@@ -3532,19 +3538,19 @@ fi
# Check if we have __int64
echo $ac_n "checking if __int64 is defined""... $ac_c" 1>&6
-echo "configure:3536: checking if __int64 is defined" >&5
+echo "configure:3542: checking if __int64 is defined" >&5
if eval "test \"`echo '$''{'cctk_cv_have___int64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3541 "configure"
+#line 3547 "configure"
#include "confdefs.h"
int main() {
__int64 foo; return 0
; return 0; }
EOF
-if { (eval echo configure:3548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have___int64=yes"
else
@@ -3579,12 +3585,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3583: checking for $cctk_hdr" >&5
+echo "configure:3589: checking for $cctk_hdr" >&5
if eval "test \"`echo '$''{'cctk_cv_header_$cctk_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3588 "configure"
+#line 3594 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3592,7 +3598,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3631,12 +3637,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_
for ac_func in getopt_long_only
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3635: checking for $ac_func" >&5
+echo "configure:3641: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3640 "configure"
+#line 3646 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3659,7 +3665,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3702,12 +3708,12 @@ else
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3706: checking for working const" >&5
+echo "configure:3712: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3711 "configure"
+#line 3717 "configure"
#include "confdefs.h"
int main() {
@@ -3756,7 +3762,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:3760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -3777,21 +3783,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3781: checking for inline" >&5
+echo "configure:3787: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 3788 "configure"
+#line 3794 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:3795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -3818,21 +3824,21 @@ esac
echo $ac_n "checking for C restrict""... $ac_c" 1>&6
-echo "configure:3822: checking for C restrict" >&5
+echo "configure:3828: checking for C restrict" >&5
if eval "test \"`echo '$''{'cctk_cv_c_restrict'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cctk_cv_c_restrict=no
for ac_kw in restrict __restrict__ __restrict; do
cat > conftest.$ac_ext <<EOF
-#line 3829 "configure"
+#line 3835 "configure"
#include "confdefs.h"
int main() {
double * $ac_kw foo;
; return 0; }
EOF
-if { (eval echo configure:3836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_c_restrict=$ac_kw; break
else
@@ -3858,7 +3864,7 @@ EOF
esac
echo $ac_n "checking for C++ restrict""... $ac_c" 1>&6
-echo "configure:3862: checking for C++ restrict" >&5
+echo "configure:3868: checking for C++ restrict" >&5
if eval "test \"`echo '$''{'cctk_cv_cxx_restrict'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3873,14 +3879,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
for ac_kw in restrict __restrict__ __restrict; do
cat > conftest.$ac_ext <<EOF
-#line 3877 "configure"
+#line 3883 "configure"
#include "confdefs.h"
int main() {
double * $ac_kw foo;
; return 0; }
EOF
-if { (eval echo configure:3884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_cxx_restrict=$ac_kw; break
else
@@ -3914,20 +3920,20 @@ esac
echo $ac_n "checking for C bool""... $ac_c" 1>&6
-echo "configure:3918: checking for C bool" >&5
+echo "configure:3924: checking for C bool" >&5
if eval "test \"`echo '$''{'cctk_cv_have_c_bool'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cctk_cv_have_c_bool=no
cat > conftest.$ac_ext <<EOF
-#line 3924 "configure"
+#line 3930 "configure"
#include "confdefs.h"
int main() {
bool foo;
; return 0; }
EOF
-if { (eval echo configure:3931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_c_bool=yes
else
@@ -3949,7 +3955,7 @@ EOF
fi
echo $ac_n "checking for CXX bool""... $ac_c" 1>&6
-echo "configure:3953: checking for CXX bool" >&5
+echo "configure:3959: checking for CXX bool" >&5
if eval "test \"`echo '$''{'cctk_cv_have_cxx_bool'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3963,14 +3969,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
-#line 3967 "configure"
+#line 3973 "configure"
#include "confdefs.h"
int main() {
bool foo;
; return 0; }
EOF
-if { (eval echo configure:3974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_cxx_bool=yes
else
@@ -3999,14 +4005,102 @@ EOF
fi
+# Find out whether the C compiler supports __attribute__((unused))
+echo $ac_n "checking for C __attribute__((unused))""... $ac_c" 1>&6
+echo "configure:4011: checking for C __attribute__((unused))" >&5
+if eval "test \"`echo '$''{'cctk_cv_have_c_attribute_unused'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cctk_cv_have_c_attribute_unused=no
+cat > conftest.$ac_ext <<EOF
+#line 4017 "configure"
+#include "confdefs.h"
+
+int main() {
+double * foo __attribute__((unused));
+; return 0; }
+EOF
+if { (eval echo configure:4024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cctk_cv_have_c_attribute_unused=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cctk_cv_have_c_attribute_unused=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cctk_cv_have_c_attribute_unused" 1>&6
+if test "$cctk_cv_have_c_attribute_unused" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_CCTK_C_ATTRIBUTE_UNUSED 1
+EOF
+
+fi
+
+echo $ac_n "checking for CXX __attribute__((unused))""... $ac_c" 1>&6
+echo "configure:4046: checking for CXX __attribute__((unused))" >&5
+if eval "test \"`echo '$''{'cctk_cv_have_cxx_attribute_unused'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cctk_cv_have_cxx_attribute_unused=no
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+cat > conftest.$ac_ext <<EOF
+#line 4060 "configure"
+#include "confdefs.h"
+
+int main() {
+double * foo __attribute__((unused));
+; return 0; }
+EOF
+if { (eval echo configure:4067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cctk_cv_have_cxx_attribute_unused=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cctk_cv_have_cxx_attribute_unused=no
+fi
+rm -f conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+fi
+
+echo "$ac_t""$cctk_cv_have_cxx_attribute_unused" 1>&6
+if test "$cctk_cv_have_cxx_attribute_unused" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_CCTK_CXX_ATTRIBUTE_UNUSED 1
+EOF
+
+fi
+
+
+
ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext `CCTK_Wrap "$LIBDIR_PREFIX" "$LIBDIR_SUFFIX" "$LIBDIRS"` `CCTK_Wrap "$LIBLINK_PREFIX" "$LIBLINK_SUFFIX" "$LIBS"` >&5'
echo $ac_n "checking for crypt""... $ac_c" 1>&6
-echo "configure:4005: checking for crypt" >&5
+echo "configure:4099: checking for crypt" >&5
if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4010 "configure"
+#line 4104 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char crypt(); below. */
@@ -4029,7 +4123,7 @@ crypt();
; return 0; }
EOF
-if { (eval echo configure:4033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_crypt=yes"
else
@@ -4047,7 +4141,7 @@ if eval "test \"`echo '$ac_cv_func_'crypt`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for crypt in library crypt""... $ac_c" 1>&6
-echo "configure:4051: checking for crypt in library crypt" >&5
+echo "configure:4145: checking for crypt in library crypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4056,7 +4150,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="crypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4060 "configure"
+#line 4154 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4067,7 +4161,7 @@ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4108,12 +4202,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_
for ac_func in finite
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4112: checking for $ac_func" >&5
+echo "configure:4206: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4117 "configure"
+#line 4211 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4136,7 +4230,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4158,7 +4252,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for finite in library m""... $ac_c" 1>&6
-echo "configure:4162: checking for finite in library m" >&5
+echo "configure:4256: checking for finite in library m" >&5
ac_lib_var=`echo m'_'finite | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4167,7 +4261,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="m $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4171 "configure"
+#line 4265 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4178,7 +4272,7 @@ int main() {
finite()
; return 0; }
EOF
-if { (eval echo configure:4182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4220,12 +4314,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_
for ac_func in isnan
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4224: checking for $ac_func" >&5
+echo "configure:4318: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4229 "configure"
+#line 4323 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4248,7 +4342,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4270,7 +4364,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for isnan in library m""... $ac_c" 1>&6
-echo "configure:4274: checking for isnan in library m" >&5
+echo "configure:4368: checking for isnan in library m" >&5
ac_lib_var=`echo m'_'isnan | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4279,7 +4373,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="m $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4283 "configure"
+#line 4377 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4290,7 +4384,7 @@ int main() {
isnan()
; return 0; }
EOF
-if { (eval echo configure:4294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4332,12 +4426,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_
for ac_func in mkstemp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4336: checking for $ac_func" >&5
+echo "configure:4430: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4341 "configure"
+#line 4435 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4360,7 +4454,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4382,7 +4476,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mkstemp in library c""... $ac_c" 1>&6
-echo "configure:4386: checking for mkstemp in library c" >&5
+echo "configure:4480: checking for mkstemp in library c" >&5
ac_lib_var=`echo c'_'mkstemp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4391,7 +4485,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="c $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4395 "configure"
+#line 4489 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4402,7 +4496,7 @@ int main() {
mkstemp()
; return 0; }
EOF
-if { (eval echo configure:4406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4441,19 +4535,19 @@ done
echo $ac_n "checking for va_copy""... $ac_c" 1>&6
-echo "configure:4445: checking for va_copy" >&5
+echo "configure:4539: checking for va_copy" >&5
if eval "test \"`echo '$''{'cctk_cv_have_va_copy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4450 "configure"
+#line 4544 "configure"
#include "confdefs.h"
#include <stdarg.h>
int main() {
va_list src, dest; va_copy(dest, src); return 0
; return 0; }
EOF
-if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "cctk_cv_have_va_copy=yes"
else
@@ -4480,7 +4574,7 @@ fi
if test "X$PTHREADS" = 'Xyes'; then
PTHREAD_LIBS=
echo $ac_n "checking for main in library c_r""... $ac_c" 1>&6
-echo "configure:4484: checking for main in library c_r" >&5
+echo "configure:4578: checking for main in library c_r" >&5
ac_lib_var=`echo c_r'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4489,14 +4583,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="c_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4493 "configure"
+#line 4587 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4517,7 +4611,7 @@ else
fi
echo $ac_n "checking for main in library pthread""... $ac_c" 1>&6
-echo "configure:4521: checking for main in library pthread" >&5
+echo "configure:4615: checking for main in library pthread" >&5
ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4526,14 +4620,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="pthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4530 "configure"
+#line 4624 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4552,7 +4646,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in library pthreads""... $ac_c" 1>&6
-echo "configure:4556: checking for main in library pthreads" >&5
+echo "configure:4650: checking for main in library pthreads" >&5
ac_lib_var=`echo pthreads'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4561,14 +4655,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="pthreads $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4565 "configure"
+#line 4659 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
diff --git a/lib/make/configure.in b/lib/make/configure.in
index 8c39c6e8..4eedc758 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -535,6 +535,11 @@ CCTK_CHECK_CXX_RESTRICT
CCTK_C_BOOL
CCTK_CXX_BOOL
+# Find out whether the C compiler supports __attribute__((unused))
+CCTK_C_ATTRIBUTE_UNUSED
+CCTK_CXX_ATTRIBUTE_UNUSED
+
+
dnl Do we have crypt(3)
CCTK_CHECK_FUNC(crypt, , CCTK_CHECK_LIB_FUNC(crypt, crypt))
diff --git a/lib/make/force-reconfigure b/lib/make/force-reconfigure
index 1eb10bfe..490e9f00 100644
--- a/lib/make/force-reconfigure
+++ b/lib/make/force-reconfigure
@@ -5,7 +5,7 @@
# @desc
# Timestamp file for forcing reconfiguring configurations
# @enddesc
-# @version $Id: force-reconfigure,v 1.6 2004-11-08 10:50:45 tradke Exp $
+# @version $Id: force-reconfigure,v 1.7 2005-09-26 00:20:59 schnetter Exp $
# @@*/
31 Mar 2004: created
@@ -15,3 +15,4 @@
02 Aug 2004: introduce HAVE_LAPACK and HAVE_BLAS make variables
07 Oct 2004: change HDF5 to CCTK_HDF5 in cctk_Config.h
08 Nov 2004: add HAVE_HDF5_STREAM_VFD and HDF5_LFS_FLAGS makefile variables
+25 Sep 2005: add HAVE_CCTK_*_ATTRIBUTE_UNUSED
diff --git a/lib/sbin/CreateParameterBindings.pl b/lib/sbin/CreateParameterBindings.pl
index b13b75fc..d794ff56 100644
--- a/lib/sbin/CreateParameterBindings.pl
+++ b/lib/sbin/CreateParameterBindings.pl
@@ -200,7 +200,6 @@ sub CreateParameterBindings
push(@data, " DECLARE_PRIVATE_\U$thorn\E_STRUCT_PARAMS \\")
if($header_files{"\U$thorn\E PRIVATE"});
- @use = ();
foreach $friend (split(' ',$rhparameter_db->{"\U$thorn\E SHARES implementations"}))
{
$rhinterface_db->{"IMPLEMENTATION \U$friend\E THORNS"} =~ m:([^ ]*):;
@@ -221,18 +220,10 @@ sub CreateParameterBindings
$varprefix = ' const *';
}
- push(@data, " $type_string$varprefix const $parameter = RESTRICTED_\U$friend\E_STRUCT.$realname; \\");
- push(@use, " RESTRICTED_FRIENDS_STRUCT_use = \&$parameter, \\");
+ push(@data, " CCTK_DECLARE_INIT ($type_string$varprefix const, $parameter, RESTRICTED_\U$friend\E_STRUCT.$realname); \\");
}
}
- if(@use)
- {
- push(@data, ' const void *RESTRICTED_FRIENDS_STRUCT_use = ( \\');
- push(@data, @use);
- push(@data, ' RESTRICTED_FRIENDS_STRUCT_use = &RESTRICTED_FRIENDS_STRUCT_use \\');
- push(@data, ' );');
- }
push(@data, '');
push(@data, "#endif /* _\U$thorn\E_PARAMETERS_H_ */");
push(@data, "\n"); # workaround for perl 5.004_04 to add a trailing newline
diff --git a/lib/sbin/GridFuncStuff.pl b/lib/sbin/GridFuncStuff.pl
index 0bf6bea3..177080f1 100644
--- a/lib/sbin/GridFuncStuff.pl
+++ b/lib/sbin/GridFuncStuff.pl
@@ -225,14 +225,13 @@ sub CreateVariableBindings
push(@data, "static int CCTKi_BindingsFortranWrapper$thorn(void *_GH, void *fpointer)");
push(@data, '{');
push(@data, ' cGH *GH = _GH;');
- push(@data, ' const int _cctk_zero = 0;');
+ push(@data, ' CCTK_DECLARE_INIT (const int, _cctk_zero, 0);');
push(@data, '#ifndef CCTK_DEBUG');
push(@data, ' CCTK_COMPLEX _cctk_dummy_var[4];');
push(@data, '#endif');
push(@data, " void (*function)(\U$thorn\E_C2F_PROTO);");
push(@data, " DECLARE_\U$thorn\E_C2F");
push(@data, " INITIALISE_\U$thorn\E_C2F");
- push(@data, ' (void) (_cctk_zero + 0);');
push(@data, '#ifndef CCTK_DEBUG');
push(@data, ' (void) (_cctk_dummy_var + 0);');
push(@data, '#endif');
@@ -497,7 +496,9 @@ sub CreateFortranArgumentDeclarations
for($level = 0; $level < $ntimelevels; $level++)
{
- push(@declarations, "CCTK_$type $argument$dimensions");
+ # This is a macro which is expanded by a traditional CPP.
+ # Do not put spaces around the arguments.
+ push(@declarations, "CCTK_DECLARE (CCTK_$type,$argument,$dimensions)");
# Modify the name for the time level
$argument .= '_p';
@@ -526,25 +527,40 @@ sub CreateFortranArgumentDeclarations
sub CreateCArgumentDeclarations
{
my(%arguments) = @_;
- my($varname, $imp, $type, $fullname, $ntimelevels);
my(@declarations) = ();
+ # Put all storage arguments first.
+ foreach my $argument (sort keys %arguments)
+ {
+ if($arguments{$argument} =~ m/STORAGESIZE/)
+ {
+ # do nothing
+ }
+ elsif($arguments{$argument} =~ m/GROUPLENGTH\(([^,]*)::([^,)]*)/)
+ {
+ my $thorn=$1;
+ my $group=$2;
+ push(@declarations, "CCTK_DECLARE_INIT (static int, S$argument, -99);");
+ push(@declarations, "CCTK_DECLARE_INIT (int const, $argument, S$argument==-99 ? S$argument = CCTKi_GroupLength(\"$thorn\::$group\") : S$argument);");
+ }
+ }
+
# Now deal with the rest of the arguments
- foreach $varname (sort keys %arguments)
+ foreach my $varname (sort keys %arguments)
{
next if ($arguments{$varname} =~ m:STORAGESIZE|GROUPLENGTH:);
- $arguments{$varname} =~ m\^([^! ]+) ?([^!]*)?!([^!]*)::([^!]*)!([^!]*)!([^!]*)\;
+ $arguments{$varname} =~ m,^([^! ]+) ?([^!]*)?!([^!]*)::([^!]*)!([^!]*)!([^!]*),;
- $type = $1;
- $implementation = "\U\"$3\"";
- $ntimelevels = $5;
- $var = "\"$varname$6\"";
+ my $type = $1;
+ my $implementation = "\U\"$3\"";
+ my $ntimelevels = $5;
+ my $var = "\"$varname$6\"";
- for($level = 0; $level < $ntimelevels; $level++)
+ for(my $level = 0; $level < $ntimelevels; $level++)
{
- push(@declarations, "CCTK_$type * CCTK_RESTRICT $varname = (cctki_dummy_int = \&$varname - \&$varname, (CCTK_$type *) CCTKi_VarDataPtr(cctkGH, $level, $implementation, $var));");
+ push(@declarations, "CCTK_DECLARE_INIT (CCTK_$type * CCTK_RESTRICT const, $varname, (CCTK_$type *) CCTKi_VarDataPtr(cctkGH, $level, $implementation, $var));");
# Modify the name for the time level
$varname .= '_p';
@@ -625,7 +641,7 @@ sub CreateCArgumentStatics
{
next if ($arguments{$argument} =~ m:STORAGESIZE|GROUPLENGTH:);
- push(@declarations, "static int CCTKARGNUM_$argument = -1;");
+ push(@declarations, "static int CCTKARGNUM_$argument = -99;");
$arguments{$argument} =~ /::([^!]+)![0-9]+/;
$group = $1;
@@ -634,7 +650,7 @@ sub CreateCArgumentStatics
if ($allgroups !~ / $group /)
{
$allgroups .= " $group ";
- push(@declarations, "static int CCTKGROUPNUM_$group = -1;");
+ push(@declarations, "static int CCTKGROUPNUM_$group = -99;");
}
}
@@ -653,26 +669,27 @@ sub CreateCArgumentStatics
sub CreateCArgumentInitialisers
{
my(%arguments) = @_;
- my($argument, $allgroups, $group, $qualifier);
my(@initialisers) = ();
- $allgroups = '';
- foreach $argument (sort keys %arguments)
+ my $allgroups = ' ';
+ foreach my $argument (sort keys %arguments)
{
next if ($arguments{$argument} =~ m:STORAGESIZE|GROUPLENGTH:);
$arguments{$argument} =~ m,^([^! ]+) ?([^!]*)?!([^!]*)\::([^!]*)!([^!]*)!([^!]*),;
- $qualifier = $3;
- $varsuffix = $6;
+ my $qualifier = $3;
+ my $varsuffix = $6;
- push(@initialisers, "if(CCTKARGNUM_$argument == -1) CCTKARGNUM_$argument = CCTK_VarIndex(\"$qualifier\::$argument$varsuffix\");");
+ my $var = $argument;
+
+ push(@initialisers, "if(CCTKARGNUM_$argument == -99) CCTKARGNUM_$argument = CCTK_VarIndex(\"$qualifier\::$var$varsuffix\");");
$arguments{$argument} =~ /\::([^!]+)/;
- $group = $1;
+ my $group = $1;
if ($allgroups !~ / $group /)
{
- $allgroups .= " $group ";
- push(@initialisers, "if(CCTKGROUPNUM_$group == -1) CCTKGROUPNUM_$group = CCTK_GroupIndex(\"$qualifier\::$group\");");
+ $allgroups .= "$group ";
+ push(@initialisers, "if(CCTKGROUPNUM_$group == -99) CCTKGROUPNUM_$group = CCTK_GroupIndex(\"$qualifier\::$group\");");
}
}
@@ -707,24 +724,19 @@ sub CreateCArgumentPrototype
{
next if ($arguments{$argument} =~ m:STORAGESIZE|GROUPLENGTH:);
- $arguments{$argument} =~ m:^([^! ]+) ?([^!]*)?!([^!]*):;
-
- if($arguments{$argument} !~ m:STORAGESIZE|GROUPLENGTH:)
- {
- $arguments{$argument} =~ m:^([^! ]+) ?([^!]*)?!([^!]*)!([^!]*):;
+ $arguments{$argument} =~ m:^([^! ]+) ?([^!]*)?!([^!]*)!([^!]*):;
- $type = $1;
- $ntimelevels = $4;
+ $type = $1;
+ $ntimelevels = $4;
- for($level = 0; $level < $ntimelevels; $level++)
- {
- push(@prototype, "CCTK_$type *");
- }
+ for($level = 0; $level < $ntimelevels; $level++)
+ {
+ push(@prototype, "CCTK_$type *");
+ }
- if($type !~ /^(CHAR|BYTE|INT|INT1|INT2|INT4|INT8|REAL|REAL4|REAL8|REAL16|COMPLEX|COMPLEX8|COMPLEX16|COMPLEX32)$/)
- {
- &CST_error(0,"Unknown argument type $type","",__LINE__,__FILE__);
- }
+ if($type !~ /^(CHAR|BYTE|INT|INT1|INT2|INT4|INT8|REAL|REAL4|REAL8|REAL16|COMPLEX|COMPLEX8|COMPLEX16|COMPLEX32)$/)
+ {
+ &CST_error(0,"Unknown argument type $type","",__LINE__,__FILE__);
}
}
@@ -775,7 +787,7 @@ sub CreateCArgumentList
for($level = 0; $level < $ntimelevels; $level++)
{
- push(@arglist, "(CCTK_$type *)(PASS_REFERENCE($argument, $level))");
+ push(@arglist, "(CCTK_$type *)PASS_REFERENCE($argument, $level)");
}
if($type =~ /^(CHAR|BYTE|INT|INT1|INT2|INT4|INT8|REAL|REAL4|REAL8|REAL16|COMPLEX|COMPLEX8|COMPLEX16|COMPLEX32)$/)
@@ -841,7 +853,7 @@ sub CreateThornArgumentHeaderFile
# Remember if there actually are any arguments here.
$hasvars{$block} = 1 if(keys %data > 0) ;
- # Do the fortran definitions
+ # Do the Fortran definitions
push(@returndata, '#ifdef FCODE');
# Create the fortran argument declarations
@@ -867,7 +879,7 @@ sub CreateThornArgumentHeaderFile
# Create the C argument declarations
push(@returndata, "#define DECLARE_${thorn}_${block}_CARGUMENTS \\");
@data = &CreateCArgumentDeclarations(%data);
- push(@returndata, join (" \\\n", @data));
+ push(@returndata, join (" \\\n", @data) . ' \\');
push(@returndata, '');
# Create the C argument variable number statics
@@ -942,7 +954,10 @@ sub CreateThornArgumentHeaderFile
push(@returndata, '');
push(@returndata, $c_initialize_statics);
push(@returndata, '');
- push(@returndata, "#define ${thorn}_CARGUMENTS cGH *cctkGH");
+ # Cannot make this a "cGH const *"
+ # because C++ aborts on const correctness errors
+ # and much user code converts between cGH * and CCTK_ARGUMENTS
+ push(@returndata, "#define ${thorn}_CARGUMENTS cGH * CCTK_RESTRICT const cctkGH");
push(@returndata, '');
push(@returndata, '#endif /* CCODE */');
diff --git a/lib/sbin/create_c_stuff.pl b/lib/sbin/create_c_stuff.pl
index 9c541bac..bbd1059e 100644
--- a/lib/sbin/create_c_stuff.pl
+++ b/lib/sbin/create_c_stuff.pl
@@ -176,7 +176,6 @@ sub CreateCStructureParameterHeader
my(%parameters);
my($type, $type_string);
my(@definition);
- my(@use);
# Create the structure
push(@data, '#ifdef __cplusplus');
@@ -187,7 +186,6 @@ sub CreateCStructureParameterHeader
push(@data, 'extern struct');
push(@data, '{');
- push(@use, " const void *${structure}_use = ( \\");
foreach $parameter (&order_params($rhparameters, $rhparameter_db))
{
my $type = $rhparameter_db->{"\U$rhparameters->{$parameter} $parameter\E type"};
@@ -207,11 +205,8 @@ sub CreateCStructureParameterHeader
my $realname = $rhparameter_db->{"\U$rhparameters->{$parameter} $parameter\E realname"};
push(@data, " $type_string $realname$suffix;");
- push(@definition, " $type_string$varprefix const $parameter = $structure.$realname; \\");
- push(@use, " ${structure}_use = \&$parameter, \\");
+ push(@definition, " CCTK_DECLARE_INIT ($type_string$varprefix const, $parameter, $structure.$realname); \\");
}
- push(@use, " &${structure}_use \\");
- push(@use, ' );');
# Some compilers don't like an empty structure.
if((keys %$rhparameters) == 0)
@@ -229,7 +224,7 @@ sub CreateCStructureParameterHeader
push(@data, "#define DECLARE_${structure}_PARAMS \\");
push(@data, @definition);
- push(@data, @use);
+## push(@data, @use);
push(@data, "\n"); # workaround for perl 5.004_04 to add a trailing newline
@@ -244,7 +239,7 @@ sub order_params
my(@int_params) = ();
my(@string_params)= ();
- foreach $parameter (sort(keys %$rhparameters))
+ foreach $parameter (sort keys %$rhparameters)
{
$type = $rhparameter_db->{"\U$rhparameters->{$parameter} $parameter\E type"};
diff --git a/src/include/cctk.h b/src/include/cctk.h
index a46ddd1d..a91e23bb 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -42,24 +42,29 @@
cctk_nghostzones, cctk_iteration, cctkGH
#define _DECLARE_CCTK_ARGUMENTS _DECLARE_CCTK_FARGUMENTS
-#define _DECLARE_CCTK_FARGUMENTS INTEGER cctk_dim&&\
- INTEGER cctk_gsh(cctk_dim),cctk_lsh(cctk_dim)&&\
- INTEGER cctk_lbnd(cctk_dim),cctk_ubnd(cctk_dim)&&\
- INTEGER cctk_lssh(CCTK_NSTAGGER*cctk_dim)&&\
- INTEGER cctk_from(cctk_dim),cctk_to(cctk_dim)&&\
- INTEGER cctk_bbox(2*cctk_dim)&&\
- CCTK_REAL cctk_delta_time, cctk_time&&\
- CCTK_REAL cctk_delta_space(cctk_dim)&&\
- CCTK_REAL cctk_origin_space(cctk_dim)&&\
- INTEGER cctk_levfac(cctk_dim)&&\
- INTEGER cctk_levoff(cctk_dim)&&\
- INTEGER cctk_levoffdenom(cctk_dim)&&\
- INTEGER cctk_timefac&&\
- INTEGER cctk_convlevel&&\
- INTEGER cctk_convfac&&\
- INTEGER cctk_nghostzones(cctk_dim)&&\
- INTEGER cctk_iteration&&\
- CCTK_POINTER cctkGH&&
+#define _DECLARE_CCTK_FARGUMENTS \
+ CCTK_DECLARE (INTEGER,cctk_dim,) && \
+ CCTK_DECLARE (INTEGER,cctk_gsh,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_lsh,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_lbnd,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_ubnd,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_lssh,(CCTK_NSTAGGER*cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_from,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_to,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_bbox,(2*cctk_dim)) && \
+ CCTK_DECLARE (CCTK_REAL,cctk_delta_time,) && \
+ CCTK_DECLARE (CCTK_REAL,cctk_time,) && \
+ CCTK_DECLARE (CCTK_REAL,cctk_delta_space,(cctk_dim)) && \
+ CCTK_DECLARE (CCTK_REAL,cctk_origin_space,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_levfac,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_levoff,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_levoffdenom,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_timefac,) && \
+ CCTK_DECLARE (INTEGER,cctk_convlevel,) && \
+ CCTK_DECLARE (INTEGER,cctk_convfac,) && \
+ CCTK_DECLARE (INTEGER,cctk_nghostzones,(cctk_dim)) && \
+ CCTK_DECLARE (INTEGER,cctk_iteration,) && \
+ CCTK_DECLARE (CCTK_POINTER,cctkGH,) &&
#define CCTK_WARN(a,b) CCTK_Warn(a,__LINE__,__FORTRANFILE__,CCTK_THORNSTRING,b)
@@ -228,88 +233,63 @@ static inline int CCTK_GFINDEX4D (const cGH *GH, int i, int j, int k, int l)
printf("--------------------------------------------------------------------------------\n");
#define _DECLARE_CCTK_ARGUMENTS _DECLARE_CCTK_CARGUMENTS
-#define _DECLARE_CCTK_CARGUMENTS \
- int cctki_dummy_int;\
- int cctk_dim = cctkGH->cctk_dim;\
- int *cctk_gsh = cctkGH->cctk_gsh;\
- int *cctk_lsh = cctkGH->cctk_lsh;\
- int *cctk_lbnd = cctkGH->cctk_lbnd;\
- int *cctk_ubnd = cctkGH->cctk_ubnd;\
- int *cctk_lssh = cctkGH->cctk_lssh;\
- int *cctk_from = cctkGH->cctk_from;\
- int *cctk_to = cctkGH->cctk_to;\
- int *cctk_bbox = cctkGH->cctk_bbox;\
- CCTK_REAL cctk_delta_time = cctkGH->cctk_delta_time;\
- CCTK_REAL cctk_time = cctkGH->cctk_time;\
- CCTK_REAL *cctk_delta_space = cctkGH->cctk_delta_space;\
- CCTK_REAL *cctk_origin_space = cctkGH->cctk_origin_space;\
- int *cctk_levfac = cctkGH->cctk_levfac;\
- int *cctk_levoff = cctkGH->cctk_levoff;\
- int *cctk_levoffdenom = cctkGH->cctk_levoffdenom;\
- int cctk_timefac = cctkGH->cctk_timefac;\
- int cctk_convlevel = cctkGH->cctk_convlevel;\
- int cctk_convfac = cctkGH->cctk_convfac;\
- int *cctk_nghostzones = cctkGH->cctk_nghostzones;\
- int cctk_iteration = cctkGH->cctk_iteration;\
- const void *cctki_use = (cctki_use = &cctki_dummy_int,\
- cctki_use = &cctk_dim,\
- cctki_use = &cctk_gsh,\
- cctki_use = &cctk_lsh,\
- cctki_use = &cctk_lbnd,\
- cctki_use = &cctk_ubnd,\
- cctki_use = &cctk_lssh,\
- cctki_use = &cctk_from,\
- cctki_use = &cctk_to,\
- cctki_use = &cctk_bbox,\
- cctki_use = &cctk_delta_time,\
- cctki_use = &cctk_time,\
- cctki_use = &cctk_delta_space,\
- cctki_use = &cctk_origin_space,\
- cctki_use = &cctk_levfac,\
- cctki_use = &cctk_levoff,\
- cctki_use = &cctk_levoffdenom,\
- cctki_use = &cctk_timefac,\
- cctki_use = &cctk_convlevel,\
- cctki_use = &cctk_convfac,\
- cctki_use = &cctk_nghostzones,\
- cctki_use = &cctk_iteration,\
- cctki_use = &cctki_use);
-
+#define _DECLARE_CCTK_CARGUMENTS \
+ CCTK_DECLARE_INIT (int , cctk_dim , cctkGH->cctk_dim ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_gsh , cctkGH->cctk_gsh ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_lsh , cctkGH->cctk_lsh ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_lbnd , cctkGH->cctk_lbnd ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_ubnd , cctkGH->cctk_ubnd ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_lssh , cctkGH->cctk_lssh ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_from , cctkGH->cctk_from ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_to , cctkGH->cctk_to ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_bbox , cctkGH->cctk_bbox ) \
+ CCTK_DECLARE_INIT (CCTK_REAL , cctk_delta_time , cctkGH->cctk_delta_time ) \
+ CCTK_DECLARE_INIT (CCTK_REAL , cctk_time , cctkGH->cctk_time ) \
+ CCTK_DECLARE_INIT (CCTK_REAL * CCTK_RESTRICT, cctk_delta_space , cctkGH->cctk_delta_space ) \
+ CCTK_DECLARE_INIT (CCTK_REAL * CCTK_RESTRICT, cctk_origin_space, cctkGH->cctk_origin_space) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_levfac , cctkGH->cctk_levfac ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_levoff , cctkGH->cctk_levoff ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_levoffdenom , cctkGH->cctk_levoffdenom ) \
+ CCTK_DECLARE_INIT (int , cctk_timefac , cctkGH->cctk_timefac ) \
+ CCTK_DECLARE_INIT (int , cctk_convlevel , cctkGH->cctk_convlevel ) \
+ CCTK_DECLARE_INIT (int , cctk_convfac , cctkGH->cctk_convfac ) \
+ CCTK_DECLARE_INIT (int * CCTK_RESTRICT, cctk_nghostzones , cctkGH->cctk_nghostzones ) \
+ CCTK_DECLARE_INIT (int , cctk_iteration , cctkGH->cctk_iteration );
#define _INITIALISE_CCTK_C2F
#define _DECLARE_CCTK_C2F
-#define _PASS_CCTK_C2F(xGH) &((xGH)->cctk_dim),\
- (xGH)->cctk_gsh,(xGH)->cctk_lsh,\
- (xGH)->cctk_lbnd,(xGH)->cctk_ubnd,\
- (xGH)->cctk_lssh,\
- (xGH)->cctk_from,(xGH)->cctk_to,\
- (xGH)->cctk_bbox,\
- &((xGH)->cctk_delta_time),\
- &((xGH)->cctk_time), (xGH)->cctk_delta_space,\
- (xGH)->cctk_origin_space,\
- (xGH)->cctk_levfac,\
- (xGH)->cctk_levoff,\
- (xGH)->cctk_levoffdenom,\
- &((xGH)->cctk_timefac),\
- &((xGH)->cctk_convlevel),\
- &((xGH)->cctk_convfac),\
- (xGH)->cctk_nghostzones,\
- &((xGH)->cctk_iteration),\
- &(xGH)
-#define _CCTK_C2F_PROTO int *,\
- int *,\
- int *,int *, int *, int *, int *,int *,int *,\
- CCTK_REAL *, CCTK_REAL *, CCTK_REAL *,\
- CCTK_REAL *,\
- int *,\
- int *,\
- int *,\
- int *,\
- int *,\
- int *,\
- int *,\
- int *,\
- cGH **
+#define _PASS_CCTK_C2F(GH) &(GH)->cctk_dim,\
+ (GH)->cctk_gsh,(GH)->cctk_lsh,\
+ (GH)->cctk_lbnd,(GH)->cctk_ubnd,\
+ (GH)->cctk_lssh,\
+ (GH)->cctk_from,(GH)->cctk_to,\
+ (GH)->cctk_bbox,\
+ &(GH)->cctk_delta_time,&(GH)->cctk_time,\
+ (GH)->cctk_delta_space,(GH)->cctk_origin_space,\
+ (GH)->cctk_levfac,\
+ (GH)->cctk_levoff,(GH)->cctk_levoffdenom,\
+ &(GH)->cctk_timefac,\
+ &(GH)->cctk_convlevel,\
+ &(GH)->cctk_convfac,\
+ (GH)->cctk_nghostzones,\
+ &(GH)->cctk_iteration,\
+ &(GH)
+#define _CCTK_C2F_PROTO int *,\
+ int *, int *,\
+ int *, int *,\
+ int *,\
+ int *, int *,\
+ int *,\
+ CCTK_REAL *, CCTK_REAL *,\
+ CCTK_REAL *, CCTK_REAL *,\
+ int *,\
+ int *, int *,\
+ int *,\
+ int *,\
+ int *,\
+ int *,\
+ int *,\
+ cGH * CCTK_RESTRICT *
#define CCTK_EQUALS(a,b) (CCTK_Equals((a),(b)))
diff --git a/src/include/cctk_Groups.h b/src/include/cctk_Groups.h
index 9b44008c..c82f48aa 100644
--- a/src/include/cctk_Groups.h
+++ b/src/include/cctk_Groups.h
@@ -92,7 +92,11 @@ const char *CCTK_VarTypeName(int vartype);
int CCTK_VarTypeSize(int vtype);
+int CCTKi_GroupLength(const char *fullgroupname);
+int CCTKi_GroupLengthI(int group);
+
const int * CCTKi_GroupLengthAsPointer(const char *fullgroupname);
+const int * CCTKi_GroupLengthAsPointerI(int group);
/* traverse a string of group and/or variable names */
int CCTK_TraverseString (const char *parsestring,
diff --git a/src/include/cctk_Types.h b/src/include/cctk_Types.h
index 8405b3f3..1b50fada 100644
--- a/src/include/cctk_Types.h
+++ b/src/include/cctk_Types.h
@@ -21,6 +21,33 @@
/* Define stuff for C. */
#ifdef CCODE
+
+/* Declare and initialise a variable and tell the compiler that it may
+ be unused. This is used for CCTK_PARAMETERS and CCTK_ARGUMENTS.
+
+ The macro CCTK_DECLARE_INIT (typ, nam, val) is used with
+ typ: a type, used to declare the variable (e.g. "const int")
+ nam: the variable name (e.g. "x")
+ val: the value used to initialise it (e.g. "42")
+*/
+
+#if (! __cplusplus && HAVE_CCTK_C_ATTRIBUTE_UNUSED ) \
+ || ( __cplusplus && HAVE_CCTK_CXX_ATTRIBUTE_UNUSED)
+
+/* We have __attribute__((unused)), so use it */
+#define CCTK_DECLARE_INIT(typ,nam,val) \
+ typ nam __attribute__((unused)) = (val);
+
+#else
+
+/* Some fallback, bound to fool most compilers */
+#define CCTK_DECLARE_INIT(typ,nam,val) \
+ typ nam = (val); \
+ void const * cctki_use_##nam = (cctki_use_##nam = &nam, &cctki_use_##nam);
+
+#endif
+
+
typedef void *CCTK_POINTER;
typedef const void *CCTK_POINTER_TO_CONST;
typedef void (*CCTK_FPOINTER)(void);
@@ -63,9 +90,36 @@ typedef unsigned char CCTK_BYTE;
#endif /* CCODE */
-/* Define stuff for fortran. */
+/* Define stuff for Fortran. */
#ifdef FCODE
+
+/* Declare a variable and tell the compiler that it may be unused.
+ This is used for CCTK_ARGUMENTS.
+
+ The macro CCTK_DECLARE (typ, nam, dim) is used with
+ typ: a type, used to declare the variable (e.g. "CCTK_REAL")
+ nam: the variable name (e.g. "x")
+ dim: optional array dimensions, (e.g. "(10,10)")
+*/
+
+#ifdef F90CODE
+
+/* Declare it, and use it for a dummy operation */
+#define CCTK_DECLARE(typ,nam,dim) \
+ typ nam dim && \
+ integer, parameter :: cctki_use_/**/nam = kind(nam)
+
+#else
+
+/* Just declare it; FORTRAN 77 has no good way of marking it as used
+ within a block of declarations */
+#define CCTK_DECLARE(typ,nam,dim) \
+ typ nam dim
+
+#endif
+
+
#define CCTK_POINTER integer*SIZEOF_CHAR_P
#define CCTK_POINTER_TO_CONST integer*SIZEOF_CHAR_P
/* TODO: add autoconf for determining the size of function pointers */
diff --git a/src/main/Groups.c b/src/main/Groups.c
index 605215fb..45970659 100644
--- a/src/main/Groups.c
+++ b/src/main/Groups.c
@@ -2733,12 +2733,108 @@ static CCTK_INT **CCTKi_ExtractSize (int dimension,
}
/*@@
+ @routine CCTKi_GroupLength
+ @date Sat Jan 22 2005
+ @author Erik Schnetter
+ @desc
+ Get the number of vector elements in a group
+ @enddesc
+
+ @var fullgroupname
+ @vdesc The full name of a GV group
+ @vtype const char *
+ @vio in
+ @endvar
+
+ @returntype int
+ @returndesc
+ the number of vector elements in the group
+ -1
+ @endreturndesc
+@@*/
+int CCTKi_GroupLength(const char *fullgroupname)
+{
+ int group;
+ int retval;
+ char *impname, *groupname;
+
+
+ retval = -1;
+ impname = groupname = NULL;
+
+ if (! CCTK_DecomposeName (fullgroupname, &impname, &groupname))
+ {
+ for (group = 0; group < n_groups; group++)
+ {
+ if (CCTK_Equals (impname, groups[group].implementation) &&
+ CCTK_Equals (groupname, groups[group].name))
+ {
+ retval = groups[group].vectorlength;
+ break;
+ }
+ }
+ }
+
+ if (retval == -1)
+ {
+ CCTK_VWarn (1, __LINE__, __FILE__, "Cactus",
+ "CCTKi_GroupLength: No group named '%s' found",
+ fullgroupname);
+ }
+
+ /* Free memory from CCTK_DecomposeName */
+ free (impname);
+ free (groupname);
+
+ return retval;
+}
+
+ /*@@
+ @routine CCTKi_GroupLengthI
+ @date Thu Mar 24 2005
+ @author Erik Schnetter
+ @desc
+ Get the number of vector elements in a group
+ @enddesc
+
+ @var group
+ @vdesc The group index of a GV group
+ @vtype int
+ @vio in
+ @endvar
+
+ @returntype int
+ @returndesc
+ the number of vector elements in the group
+ -1
+ @endreturndesc
+@@*/
+int CCTKi_GroupLengthI(int group)
+{
+ int retval;
+
+ retval = -1;
+
+ if (group < 0 || group >= n_groups)
+ {
+ CCTK_VWarn (6, __LINE__, __FILE__, "Cactus",
+ "CCTKi_GroupLengthI: Illegal group index %d",
+ group);
+ }
+ else
+ {
+ retval = groups[group].vectorlength;
+ }
+
+ return retval;
+}
+
+ /*@@
@routine CCTKi_GroupLengthAsPointer
@date Sun Oct 7 03:58:44 2001
@author Tom Goodale
@desc
- Get the number of variables in a group,
- or the number of elements in a vector group
+ Get the number of vector elements in a group
@enddesc
@var fullgroupname
@@ -2749,7 +2845,7 @@ static CCTK_INT **CCTKi_ExtractSize (int dimension,
@returntype const int *
@returndesc
- pointer to an integer containing the number of variables in the group
+ pointer to an integer containing the number of vector elements in the group
NULL if group doesn't exist
@endreturndesc
@@*/
@@ -2770,8 +2866,7 @@ const int *CCTKi_GroupLengthAsPointer(const char *fullgroupname)
if (CCTK_Equals (impname, groups[group].implementation) &&
CCTK_Equals (groupname, groups[group].name))
{
- retval = groups[group].vectorlength ?
- &groups[group].vectorlength : &groups[group].n_variables;
+ retval = &groups[group].vectorlength;
break;
}
}
@@ -2792,6 +2887,52 @@ const int *CCTKi_GroupLengthAsPointer(const char *fullgroupname)
}
/*@@
+ @routine CCTKi_GroupLengthAsPointerI
+ @date Sun Jan 27 19:13 2002
+ @author Erik Schnetter
+ @desc
+ Get the number of vector elements in a group
+ @enddesc
+ @calls
+ @calledby
+ @history
+
+ @endhistory
+ @var group
+ @vdesc The index of a GV group
+ @vtype int
+ @vio in
+ @vcomment
+
+ @endvar
+
+ @returntype const int *
+ @returndesc
+ pointer to an integer containing the number of vector elements in the group
+ NULL if group doesn't exist
+ @endreturndesc
+@@*/
+const int *CCTKi_GroupLengthAsPointerI(int group)
+{
+ const int *retval;
+
+ retval = NULL;
+
+ if (group < 0 || group >= n_groups)
+ {
+ CCTK_VWarn (6, __LINE__, __FILE__, "Cactus",
+ "CCTKi_GroupLengthAsPointerI: Group index %d does not exist",
+ group);
+ }
+ else
+ {
+ retval = &groups[group].vectorlength;
+ }
+
+ return retval;
+}
+
+ /*@@
@routine IntParameterEvaluator
@date Fri Oct 12 10:01:32 2001
@author Tom Goodale
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 14:34:32 +0000