summaryrefslogtreecommitdiff
path: root/lib/make
diff options
context:
space:
mode:
authoreschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>2011-06-08 12:53:20 +0000
committereschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>2011-06-08 12:53:20 +0000
commit0213ad6de45b7ca9a67d7e22a55a1b1aff51c6dd (patch)
tree6f549813e148befeaa2d9c7b341fad10c5558f4d /lib/make
parente1e744ad347233881aa0e67263b6a3bd98b3faf3 (diff)
Improve auto-detection of "restrict" keyword
Update and improve the auto-detection of the "restrict" keyword; add more test cases to detect more possible failures. Disable testing the array syntax void foo (double A[restrict]); where the "restrict" keyword is given within the square brackets; instead, one can use the pointer syntax void foo (double *restrict const A); which is tested. Add support for the gcc built-in function "builtin_expect", which tells the compiler the value that an expression is most likely to have. Re-enable the (currently commented out) definitions for attribute(hot) and attribute(cold). git-svn-id: http://svn.cactuscode.org/flesh/trunk@4702 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make')
-rw-r--r--lib/make/aclocal.m476
-rw-r--r--lib/make/cctk_Config.h.in16
-rwxr-xr-xlib/make/configure940
-rw-r--r--lib/make/configure.in18
-rw-r--r--lib/make/force-reconfigure1
5 files changed, 705 insertions, 346 deletions
diff --git a/lib/make/aclocal.m4 b/lib/make/aclocal.m4
index 06c821fa..5b9b6188 100644
--- a/lib/make/aclocal.m4
+++ b/lib/make/aclocal.m4
@@ -377,11 +377,24 @@ AC_DEFUN(CCTK_CHECK_C_RESTRICT,
[AC_CACHE_CHECK([for C restrict], cctk_cv_c_restrict,
[cctk_cv_c_restrict=no
for ac_kw in restrict __restrict__ __restrict; do
- AC_TRY_COMPILE(, [
-double * $ac_kw foo;
-void bar (void * $ac_kw arr[]);
-struct tux { char * $ac_kw arr[3]; };
-void func (void * arr[$ac_kw]);
+ AC_TRY_COMPILE([
+double * $ac_kw p1;
+double * $ac_kw p2[3];
+struct s1 { char * $ac_kw arr; };
+struct s2 { char * $ac_kw arr[3]; };
+void f1 (void * $ac_kw p);
+void f2 (void * $ac_kw p[]);
+void f3 (void * $ac_kw p[3]);
+/* void f4 (void * $ac_kw p[$ac_kw]); */
+/* void f5 (void * $ac_kw p[$ac_kw 3]); */
+void f1 (void * $ac_kw p) { }
+void f2 (void * $ac_kw p[]) { }
+void f3 (void * $ac_kw p[3]) { }
+/* void f4 (void * $ac_kw p[$ac_kw]) { } */
+/* void f5 (void * $ac_kw p[$ac_kw 3]) { } */
+], [
+double * $ac_kw v1;
+double * $ac_kw v2[3];
], [cctk_cv_c_restrict=$ac_kw; break])
done
])
@@ -399,10 +412,24 @@ AC_DEFUN(CCTK_CHECK_CXX_RESTRICT,
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
for ac_kw in restrict __restrict__ __restrict; do
- AC_TRY_COMPILE(, [
-double * $ac_kw foo;
-void bar (void * $ac_kw arr[]);
-struct tux { char * $ac_kw arr[3]; };
+ AC_TRY_COMPILE([
+double * $ac_kw p1;
+double * $ac_kw p2[3];
+struct s1 { char * $ac_kw arr; };
+struct s2 { char * $ac_kw arr[3]; };
+void f1 (void * $ac_kw p);
+void f2 (void * $ac_kw p[]);
+void f3 (void * $ac_kw p[3]);
+// void f4 (void * $ac_kw p[$ac_kw]);
+// void f5 (void * $ac_kw p[$ac_kw 3]);
+void f1 (void * $ac_kw p) { }
+void f2 (void * $ac_kw p[]) { }
+void f3 (void * $ac_kw p[3]) { }
+// void f4 (void * $ac_kw p[$ac_kw]) { }
+// void f5 (void * $ac_kw p[$ac_kw 3]) { }
+], [
+double * $ac_kw v1;
+double * $ac_kw v2[3];
], [cctk_cv_cxx_restrict=$ac_kw; break])
done
AC_LANG_RESTORE
@@ -635,7 +662,7 @@ AC_DEFUN(CCTK_CXX_MEMBER_ATTRIBUTE_CONST,
[cctk_cv_have_cxx_member_attribute_const=no
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE(, struct { double foo (double) __attribute__((__const__)); };, cctk_cv_have_cxx_member_attribute_const=yes, cctk_cv_have_cxx_member_attribute_const=no)
+AC_TRY_COMPILE(, struct bar { double foo (double) __attribute__((__const__)); };, cctk_cv_have_cxx_member_attribute_const=yes, cctk_cv_have_cxx_member_attribute_const=no)
AC_LANG_RESTORE
])
if test "$cctk_cv_have_cxx_member_attribute_const" = "yes" ; then
@@ -673,7 +700,7 @@ AC_DEFUN(CCTK_CXX_MEMBER_ATTRIBUTE_PURE,
[cctk_cv_have_cxx_member_attribute_pure=no
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE(, struct { double foo (double) __attribute__((__pure__)); };, cctk_cv_have_cxx_member_attribute_pure=yes, cctk_cv_have_cxx_member_attribute_pure=no)
+AC_TRY_COMPILE(, struct bar { double foo (double) __attribute__((__pure__)); };, cctk_cv_have_cxx_member_attribute_pure=yes, cctk_cv_have_cxx_member_attribute_pure=no)
AC_LANG_RESTORE
])
if test "$cctk_cv_have_cxx_member_attribute_pure" = "yes" ; then
@@ -711,7 +738,7 @@ AC_DEFUN(CCTK_CXX_MEMBER_ATTRIBUTE_NOINLINE,
[cctk_cv_have_cxx_member_attribute_noinline=no
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE(, struct { double foo (double) __attribute__((__noinline__)); };, cctk_cv_have_cxx_member_attribute_noinline=yes, cctk_cv_have_cxx_member_attribute_noinline=no)
+AC_TRY_COMPILE(, struct bar { double foo (double) __attribute__((__noinline__)); };, cctk_cv_have_cxx_member_attribute_noinline=yes, cctk_cv_have_cxx_member_attribute_noinline=no)
AC_LANG_RESTORE
])
if test "$cctk_cv_have_cxx_member_attribute_noinline" = "yes" ; then
@@ -818,3 +845,28 @@ if test "$cctk_cv_have_cxx_attribute_hot" = "yes" ; then
AC_DEFINE(HAVE_CCTK_CXX_ATTRIBUTE_HOT)
fi
])
+
+
+
+AC_DEFUN(CCTK_C_BUILTIN_EXPECT,
+[AC_CACHE_CHECK([for C __builtin_expect], cctk_cv_have_c_builtin_expect,
+[cctk_cv_have_c_builtin_expect=no
+AC_TRY_COMPILE(, __builtin_expect(0,0);, cctk_cv_have_c_builtin_expect=yes, cctk_cv_have_c_builtin_expect=no)
+])
+if test "$cctk_cv_have_c_builtin_expect" = "yes" ; then
+ AC_DEFINE(HAVE_CCTK_C_BUILTIN_EXPECT)
+fi
+])
+
+AC_DEFUN(CCTK_CXX_BUILTIN_EXPECT,
+[AC_CACHE_CHECK([for CXX __builtin_expect], cctk_cv_have_cxx_builtin_expect,
+[cctk_cv_have_cxx_builtin_expect=no
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_TRY_LINK(, __builtin_expect(0,0);, cctk_cv_have_cxx_builtin_expect=yes, cctk_cv_have_cxx_builtin_expect=no)
+AC_LANG_RESTORE
+])
+if test "$cctk_cv_have_cxx_builtin_expect" = "yes" ; then
+ AC_DEFINE(HAVE_CCTK_CXX_BUILTIN_EXPECT)
+fi
+])
diff --git a/lib/make/cctk_Config.h.in b/lib/make/cctk_Config.h.in
index 9cf429e6..0ccad37b 100644
--- a/lib/make/cctk_Config.h.in
+++ b/lib/make/cctk_Config.h.in
@@ -260,6 +260,14 @@ typedef enum {false, true} bool;
# define CCTK_ATTRIBUTE_HOT
#endif
+/* Whether __builtin_expect exists. */
+#undef HAVE_CCTK_C_BUILTIN_EXPECT
+#ifdef HAVE_CCTK_C_BUILTIN_EXPECT
+# define CCTK_BUILTIN_EXPECT(x,y) __builtin_expect(x,y)
+#else
+# define CCTK_BUILTIN_EXPECT(x,y) (x)
+#endif
+
#endif /* ! defined __cplusplus */
/****************************************************************************/
@@ -354,6 +362,14 @@ typedef enum {false, true} bool;
# define CCTK_ATTRIBUTE_HOT
#endif
+/* Whether __builtin_expect exists. */
+#undef HAVE_CCTK_CXX_BUILTIN_EXPECT
+#ifdef HAVE_CCTK_CXX_BUILTIN_EXPECT
+# define CCTK_BUILTIN_EXPECT(x,y) __builtin_expect(x,y)
+#else
+# define CCTK_BUILTIN_EXPECT(x,y) (x)
+#endif
+
/* Some C++ compilers recognise the restrict keyword */
#undef HAVE_CCTK_CXX_RESTRICT
#undef CCTK_CXX_RESTRICT
diff --git a/lib/make/configure b/lib/make/configure
index d40063ee..3094c03f 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -121,6 +121,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.
@@ -793,7 +799,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:797: checking host system type" >&5
+echo "configure:803: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -839,7 +845,7 @@ if test -n "$LIBS" ; then
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:843: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:849: 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
@@ -872,7 +878,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:876: checking for $ac_word" >&5
+echo "configure:882: 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
@@ -904,7 +910,7 @@ done
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:908: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:914: 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.
@@ -916,12 +922,12 @@ cross_compiling=$ac_cv_prog_cc_cross
rm -fr conftest*
cat > conftest.$ac_ext << EOF
-#line 920 "configure"
+#line 926 "configure"
#include "confdefs.h"
main(){return(0);} int PilotMain(){return(0);}
EOF
-if { (eval echo configure:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:931: \"$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>&5; then
@@ -950,7 +956,7 @@ fi
CROSS_COMPILE=`echo $CROSS_COMPILE | tr '[:upper:]' '[:lower:]'`
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:954: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:960: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
if test $ac_cv_prog_cc_cross = yes -a "x$CROSS_COMPILE" != xyes; then
{ echo "configure: error: Could not run executable generated by C compiler (see configs/<configname>/config-data/config.log for details). If this is a cross configuration please set CROSS_COMPILE=yes." 1>&2; exit 1; }
@@ -958,7 +964,7 @@ fi
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:962: checking whether we are using GNU C" >&5
+echo "configure:968: 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
@@ -967,7 +973,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:971: \"$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:977: \"$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
@@ -983,7 +989,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:987: checking for $ac_word" >&5
+echo "configure:993: 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
@@ -1015,7 +1021,7 @@ done
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1019: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1025: 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.
@@ -1027,12 +1033,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
rm -fr conftest*
cat > conftest.$ac_ext << EOF
-#line 1031 "configure"
+#line 1037 "configure"
#include "confdefs.h"
int main(){return(0);} extern "C" int PilotMain(){return(0);}
EOF
-if { (eval echo configure:1036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1042: \"$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>&5; then
@@ -1058,7 +1064,7 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables (see configs/<configname>/config-data/config.log for details)." 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:1062: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1068: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
if test $ac_cv_prog_cxx_cross = yes -a "x$CROSS_COMPILE" != xyes; then
{ echo "configure: error: Could not run executable generated by C++ compiler (see configs/<configname>/config-data/config.log for details). If this is a cross configuration please set CROSS_COMPILE=yes." 1>&2; exit 1; }
@@ -1066,7 +1072,7 @@ fi
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1070: checking whether we are using GNU C++" >&5
+echo "configure:1076: 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
@@ -1075,7 +1081,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1079: \"$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:1085: \"$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
@@ -1091,7 +1097,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:1095: checking for $ac_word" >&5
+echo "configure:1101: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CUCC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1126,7 +1132,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:1130: checking for $ac_word" >&5
+echo "configure:1136: 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
@@ -1162,7 +1168,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:1166: checking for $ac_word" >&5
+echo "configure:1172: 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
@@ -1208,7 +1214,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:1212: checking for $ac_word" >&5
+echo "configure:1218: 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
@@ -1252,7 +1258,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:1256: checking for $ac_word" >&5
+echo "configure:1262: 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
@@ -1289,7 +1295,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:1293: checking for $ac_word" >&5
+echo "configure:1299: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1326,7 +1332,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:1330: checking for $ac_word" >&5
+echo "configure:1336: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GZIP_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1363,7 +1369,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:1367: checking for $ac_word" >&5
+echo "configure:1373: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_PATCH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1400,7 +1406,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:1404: checking for $ac_word" >&5
+echo "configure:1410: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GIT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1437,7 +1443,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:1441: checking for $ac_word" >&5
+echo "configure:1447: 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
@@ -1474,7 +1480,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:1478: checking for $ac_word" >&5
+echo "configure:1484: 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
@@ -1511,7 +1517,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:1515: checking for $ac_word" >&5
+echo "configure:1521: 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
@@ -1548,7 +1554,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:1552: checking for $ac_word" >&5
+echo "configure:1558: 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
@@ -1587,7 +1593,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:1591: checking for $ac_word" >&5
+echo "configure:1597: 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
@@ -1884,7 +1890,7 @@ unset LDFLAGS
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1888: checking how to run the C preprocessor" >&5
+echo "configure:1894: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1899,13 +1905,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 1903 "configure"
+#line 1909 "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:1909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1915: \"$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
:
@@ -1916,13 +1922,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1920 "configure"
+#line 1926 "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:1926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1932: \"$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
:
@@ -1933,13 +1939,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1937 "configure"
+#line 1943 "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:1943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1949: \"$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
:
@@ -1964,12 +1970,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1968: checking for ANSI C header files" >&5
+echo "configure:1974: 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 1973 "configure"
+#line 1979 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1977,7 +1983,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1987: \"$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*
@@ -1994,7 +2000,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 1998 "configure"
+#line 2004 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2012,7 +2018,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 2016 "configure"
+#line 2022 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2033,7 +2039,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 2037 "configure"
+#line 2043 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2044,7 +2050,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:2048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2071,14 +2077,14 @@ fi
if test "x$cross_compiling" = 'xno' ; then
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2075: checking whether byte ordering is bigendian" >&5
+echo "configure:2081: 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 2082 "configure"
+#line 2088 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -2089,11 +2095,11 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:2093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2099: \"$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 2097 "configure"
+#line 2103 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -2104,7 +2110,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:2108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@@ -2124,7 +2130,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 2128 "configure"
+#line 2134 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@@ -2137,7 +2143,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2147: \"$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
@@ -2180,7 +2186,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:2184: checking size of long long" >&5
+echo "configure:2190: 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
@@ -2188,7 +2194,7 @@ else
ac_cv_sizeof_long_long=$SIZEOF_LONG_LONG
else
cat > conftest.$ac_ext <<EOF
-#line 2192 "configure"
+#line 2198 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2199,7 +2205,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2209: \"$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
@@ -2224,7 +2230,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:2228: checking size of long int" >&5
+echo "configure:2234: 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
@@ -2232,7 +2238,7 @@ else
ac_cv_sizeof_long_int=$SIZEOF_LONG_INT
else
cat > conftest.$ac_ext <<EOF
-#line 2236 "configure"
+#line 2242 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2243,7 +2249,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2253: \"$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
@@ -2268,7 +2274,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:2272: checking size of int" >&5
+echo "configure:2278: 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
@@ -2276,7 +2282,7 @@ else
ac_cv_sizeof_int=$SIZEOF_INT
else
cat > conftest.$ac_ext <<EOF
-#line 2280 "configure"
+#line 2286 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2287,7 +2293,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2297: \"$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
@@ -2312,7 +2318,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:2316: checking size of short int" >&5
+echo "configure:2322: 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
@@ -2320,7 +2326,7 @@ else
ac_cv_sizeof_short_int=$SIZEOF_SHORT_INT
else
cat > conftest.$ac_ext <<EOF
-#line 2324 "configure"
+#line 2330 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2331,7 +2337,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2341: \"$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
@@ -2358,7 +2364,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:2362: checking size of long double" >&5
+echo "configure:2368: 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
@@ -2366,7 +2372,7 @@ else
ac_cv_sizeof_long_double=$SIZEOF_LONG_DOUBLE
else
cat > conftest.$ac_ext <<EOF
-#line 2370 "configure"
+#line 2376 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2377,7 +2383,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2387: \"$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
@@ -2402,7 +2408,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:2406: checking size of double" >&5
+echo "configure:2412: 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
@@ -2410,7 +2416,7 @@ else
ac_cv_sizeof_double=$SIZEOF_DOUBLE
else
cat > conftest.$ac_ext <<EOF
-#line 2414 "configure"
+#line 2420 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2421,7 +2427,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2431: \"$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
@@ -2447,7 +2453,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:2451: checking size of float" >&5
+echo "configure:2457: 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
@@ -2455,7 +2461,7 @@ else
ac_cv_sizeof_float=$SIZEOF_FLOAT
else
cat > conftest.$ac_ext <<EOF
-#line 2459 "configure"
+#line 2465 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2466,7 +2472,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2476: \"$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
@@ -2493,7 +2499,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:2497: checking size of char *" >&5
+echo "configure:2503: 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
@@ -2501,7 +2507,7 @@ else
ac_cv_sizeof_char_p=$SIZEOF_POINTER
else
cat > conftest.$ac_ext <<EOF
-#line 2505 "configure"
+#line 2511 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2512,7 +2518,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2522: \"$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
@@ -2547,7 +2553,7 @@ EOF
else
echo $ac_n "checking for the null device""... $ac_c" 1>&6
-echo "configure:2551: checking for the null device" >&5
+echo "configure:2557: 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
@@ -2612,12 +2618,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:2616: checking for $ac_func" >&5
+echo "configure:2622: 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 2621 "configure"
+#line 2627 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2640,7 +2646,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2650: \"$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
@@ -2662,7 +2668,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in library nsl""... $ac_c" 1>&6
-echo "configure:2666: checking for gethostbyname in library nsl" >&5
+echo "configure:2672: 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
@@ -2671,7 +2677,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="nsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2675 "configure"
+#line 2681 "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
@@ -2682,7 +2688,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:2686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2692: \"$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
@@ -2713,12 +2719,12 @@ done
# Check if we have mode_t available
echo $ac_n "checking whether mode_t is defined""... $ac_c" 1>&6
-echo "configure:2717: checking whether mode_t is defined" >&5
+echo "configure:2723: checking whether 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 2722 "configure"
+#line 2728 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -2728,7 +2734,7 @@ int main() {
mode_t foo; return 0
; return 0; }
EOF
-if { (eval echo configure:2732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have_mode_t=yes"
else
@@ -2754,12 +2760,12 @@ fi
echo $ac_n "checking for availability of gettimeofday timing""... $ac_c" 1>&6
-echo "configure:2758: checking for availability of gettimeofday timing" >&5
+echo "configure:2764: 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 2763 "configure"
+#line 2769 "configure"
#include "confdefs.h"
int main() {
@@ -2767,7 +2773,7 @@ gettimeofday(0, 0);
return 0;
; return 0; }
EOF
-if { (eval echo configure:2771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2777: \"$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
@@ -2789,12 +2795,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:2793: checking if gettimeofday needs timezone" >&5
+echo "configure:2799: 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 2798 "configure"
+#line 2804 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/time.h>
@@ -2807,7 +2813,7 @@ struct timeval tp;
return 0;
; return 0; }
EOF
-if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2817: \"$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
@@ -2830,12 +2836,12 @@ fi
fi
echo $ac_n "checking for availability of getrusage timing""... $ac_c" 1>&6
-echo "configure:2834: checking for availability of getrusage timing" >&5
+echo "configure:2840: 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 2839 "configure"
+#line 2845 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/time.h>
@@ -2848,7 +2854,7 @@ struct rusage ru;
return 0;
; return 0; }
EOF
-if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2858: \"$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
@@ -2870,12 +2876,12 @@ else
fi
echo $ac_n "checking for availability of _ftime timing""... $ac_c" 1>&6
-echo "configure:2874: checking for availability of _ftime timing" >&5
+echo "configure:2880: 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 2879 "configure"
+#line 2885 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <time.h>
@@ -2888,7 +2894,7 @@ int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2898: \"$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
@@ -2915,12 +2921,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:2919: checking for $cctk_hdr" >&5
+echo "configure:2925: 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 2924 "configure"
+#line 2930 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2928,7 +2934,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2955,12 +2961,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:2959: checking for $cctk_hdr" >&5
+echo "configure:2965: 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 2964 "configure"
+#line 2970 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2968,7 +2974,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2995,12 +3001,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:2999: checking for $cctk_hdr" >&5
+echo "configure:3005: 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 3004 "configure"
+#line 3010 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3008,7 +3014,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3035,12 +3041,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:3039: checking for $cctk_hdr" >&5
+echo "configure:3045: 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 3044 "configure"
+#line 3050 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3048,7 +3054,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3075,12 +3081,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:3079: checking for $cctk_hdr" >&5
+echo "configure:3085: 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 3084 "configure"
+#line 3090 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3088,7 +3094,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3115,12 +3121,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:3119: checking for $cctk_hdr" >&5
+echo "configure:3125: 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 3124 "configure"
+#line 3130 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3128,7 +3134,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3155,12 +3161,12 @@ for cctk_hdr in tgmath.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3159: checking for $cctk_hdr" >&5
+echo "configure:3165: 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 3164 "configure"
+#line 3170 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3168,7 +3174,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3195,12 +3201,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:3199: checking for $cctk_hdr" >&5
+echo "configure:3205: 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 3204 "configure"
+#line 3210 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3208,7 +3214,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3235,12 +3241,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:3239: checking for $cctk_hdr" >&5
+echo "configure:3245: 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 3244 "configure"
+#line 3250 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3248,7 +3254,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3275,12 +3281,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:3279: checking for $cctk_hdr" >&5
+echo "configure:3285: 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 3284 "configure"
+#line 3290 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3288,7 +3294,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3315,12 +3321,12 @@ for cctk_hdr in c_asm.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3319: checking for $cctk_hdr" >&5
+echo "configure:3325: 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 3324 "configure"
+#line 3330 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -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 intrinsics.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
@@ -3395,12 +3401,12 @@ for cctk_hdr in mach/mach_time.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3399: checking for $cctk_hdr" >&5
+echo "configure:3405: 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 3404 "configure"
+#line 3410 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3408,7 +3414,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3432,12 +3438,12 @@ fi
done
echo $ac_n "checking for regex.h""... $ac_c" 1>&6
-echo "configure:3436: checking for regex.h" >&5
+echo "configure:3442: 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 3441 "configure"
+#line 3447 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <regex.h>
@@ -3445,7 +3451,7 @@ int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:3449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_regex_h=yes"
else
@@ -3470,12 +3476,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:3474: checking for $cctk_hdr" >&5
+echo "configure:3480: 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 3479 "configure"
+#line 3485 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3485,7 +3491,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3512,12 +3518,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:3516: checking for $cctk_hdr" >&5
+echo "configure:3522: 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 3521 "configure"
+#line 3527 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3527,7 +3533,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3554,12 +3560,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:3558: checking for $cctk_hdr" >&5
+echo "configure:3564: 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 3563 "configure"
+#line 3569 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3569,7 +3575,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3596,12 +3602,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:3600: checking for $cctk_hdr" >&5
+echo "configure:3606: 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 3605 "configure"
+#line 3611 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3611,7 +3617,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3638,12 +3644,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:3642: checking for $cctk_hdr" >&5
+echo "configure:3648: 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 3647 "configure"
+#line 3653 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3653,7 +3659,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3680,12 +3686,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:3684: checking for $cctk_hdr" >&5
+echo "configure:3690: 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 3689 "configure"
+#line 3695 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3695,7 +3701,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3722,12 +3728,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:3726: checking for $cctk_hdr" >&5
+echo "configure:3732: 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 3731 "configure"
+#line 3737 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3735,7 +3741,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3762,12 +3768,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:3766: checking for $cctk_hdr" >&5
+echo "configure:3772: 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 3771 "configure"
+#line 3777 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -3777,7 +3783,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3804,12 +3810,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:3808: checking for $cctk_hdr" >&5
+echo "configure:3814: 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 3813 "configure"
+#line 3819 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3817,7 +3823,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3844,12 +3850,12 @@ for cctk_hdr in malloc.h
do
cctk_safe=`echo "$cctk_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $cctk_hdr""... $ac_c" 1>&6
-echo "configure:3848: checking for $cctk_hdr" >&5
+echo "configure:3854: 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 3853 "configure"
+#line 3859 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3857,7 +3863,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3882,12 +3888,12 @@ done
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3886: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3892: 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 3891 "configure"
+#line 3897 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -3896,7 +3902,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -3921,12 +3927,12 @@ fi
# Check if we have socklen_t available
echo $ac_n "checking whether socklen_t is defined""... $ac_c" 1>&6
-echo "configure:3925: checking whether socklen_t is defined" >&5
+echo "configure:3931: checking whether 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 3930 "configure"
+#line 3936 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -3946,7 +3952,7 @@ int main() {
socklen_t foo; return 0
; return 0; }
EOF
-if { (eval echo configure:3950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have_socklen_t=yes"
else
@@ -3971,12 +3977,12 @@ fi
# Check if someone has defined SOCKET
echo $ac_n "checking whether SOCKET is defined""... $ac_c" 1>&6
-echo "configure:3975: checking whether SOCKET is defined" >&5
+echo "configure:3981: checking whether 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 3980 "configure"
+#line 3986 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -3996,7 +4002,7 @@ int main() {
SOCKET foo; return 0
; return 0; }
EOF
-if { (eval echo configure:4000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have_SOCKET=yes"
else
@@ -4022,12 +4028,12 @@ fi
# Check for timing functions
echo $ac_n "checking for hrtime_t""... $ac_c" 1>&6
-echo "configure:4026: checking for hrtime_t" >&5
+echo "configure:4032: checking for hrtime_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_hrtime_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4031 "configure"
+#line 4037 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -4058,12 +4064,12 @@ fi
for ac_func in gethrtime read_real_time time_base_to_time clock_gettime mach_absolute_time
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4062: checking for $ac_func" >&5
+echo "configure:4068: 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 4067 "configure"
+#line 4073 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4086,7 +4092,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4096: \"$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
@@ -4112,10 +4118,10 @@ done
echo $ac_n "checking for _rtc intrinsic""... $ac_c" 1>&6
-echo "configure:4116: checking for _rtc intrinsic" >&5
+echo "configure:4122: checking for _rtc intrinsic" >&5
rtc_ok=yes
cat > conftest.$ac_ext <<EOF
-#line 4119 "configure"
+#line 4125 "configure"
#include "confdefs.h"
#ifdef HAVE_INTRINSICS_H
#include <intrinsics.h>
@@ -4124,7 +4130,7 @@ int main() {
_rtc()
; return 0; }
EOF
-if { (eval echo configure:4128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE__RTC 1
@@ -4145,12 +4151,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_
for ac_func in mallinfo
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4149: checking for $ac_func" >&5
+echo "configure:4155: 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 4154 "configure"
+#line 4160 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4173,7 +4179,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4183: \"$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
@@ -4202,12 +4208,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_
for ac_func in mallopt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4206: checking for $ac_func" >&5
+echo "configure:4212: 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 4211 "configure"
+#line 4217 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4230,7 +4236,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4240: \"$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
@@ -4258,12 +4264,12 @@ done
# Check if M_MMAP_THRESHOLD is defined
echo $ac_n "checking whether M_MMAP_THRESHOLD is defined""... $ac_c" 1>&6
-echo "configure:4262: checking whether M_MMAP_THRESHOLD is defined" >&5
+echo "configure:4268: checking whether M_MMAP_THRESHOLD is defined" >&5
if eval "test \"`echo '$''{'cctk_cv_have_M_MMAP_THRESHOLD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4267 "configure"
+#line 4273 "configure"
#include "confdefs.h"
#include <stdlib.h>
#ifdef HAVE_MALLOC_H
@@ -4273,7 +4279,7 @@ int main() {
int x=M_MMAP_THRESHOLD; return 0
; return 0; }
EOF
-if { (eval echo configure:4277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have_M_MMAP_THRESHOLD=yes"
else
@@ -4299,19 +4305,19 @@ fi
# Check if we have __int64
echo $ac_n "checking if __int64 is defined""... $ac_c" 1>&6
-echo "configure:4303: checking if __int64 is defined" >&5
+echo "configure:4309: 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 4308 "configure"
+#line 4314 "configure"
#include "confdefs.h"
int main() {
__int64 foo; return 0
; return 0; }
EOF
-if { (eval echo configure:4315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have___int64=yes"
else
@@ -4346,12 +4352,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:4350: checking for $cctk_hdr" >&5
+echo "configure:4356: 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 4355 "configure"
+#line 4361 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -4359,7 +4365,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -4398,12 +4404,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:4402: checking for $ac_func" >&5
+echo "configure:4408: 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 4407 "configure"
+#line 4413 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4426,7 +4432,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4436: \"$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
@@ -4469,12 +4475,12 @@ else
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4473: checking for working const" >&5
+echo "configure:4479: 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 4478 "configure"
+#line 4484 "configure"
#include "confdefs.h"
int main() {
@@ -4523,7 +4529,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:4527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -4545,14 +4551,14 @@ fi
#AC_C_INLINE
echo $ac_n "checking for C inline""... $ac_c" 1>&6
-echo "configure:4549: checking for C inline" >&5
+echo "configure:4555: checking for C inline" >&5
if eval "test \"`echo '$''{'cctk_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cctk_cv_c_inline=no
for ac_kw in inline __inline__ __inline '__inline__ __attribute__((__gnu_inline__))'; do
cat > conftest.$ac_ext <<EOF
-#line 4556 "configure"
+#line 4562 "configure"
#include "confdefs.h"
int main() {
@@ -4560,14 +4566,14 @@ foo();
; return 0; }
EOF
cat > conftest2.$ac_ext <<EOF
-#line 4564 "configure"
+#line 4570 "configure"
#include "confdefs.h"
int main2() {
;} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:4571: \"$ac_link conftest2.$ac_ext\") 1>&5; (eval $ac_link conftest2.$ac_ext) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4577: \"$ac_link conftest2.$ac_ext\") 1>&5; (eval $ac_link conftest2.$ac_ext) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cctk_cv_c_inline=$ac_kw; break
else
@@ -4597,14 +4603,14 @@ EOF
esac
echo $ac_n "checking for C static inline""... $ac_c" 1>&6
-echo "configure:4601: checking for C static inline" >&5
+echo "configure:4607: checking for C static inline" >&5
if eval "test \"`echo '$''{'cctk_cv_c_static_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cctk_cv_c_static_inline=no
for ac_kw in 'static inline' 'static __inline__' 'static __inline' 'static __inline__ __attribute__((__gnu_inline__))'; do
cat > conftest.$ac_ext <<EOF
-#line 4608 "configure"
+#line 4614 "configure"
#include "confdefs.h"
int main() {
@@ -4612,14 +4618,14 @@ int main() {
; return 0; }
EOF
cat > conftest2.$ac_ext <<EOF
-#line 4616 "configure"
+#line 4622 "configure"
#include "confdefs.h"
int main2() {
;} $ac_kw ifoo(){} foo2(){ifoo();
; return 0; }
EOF
-if { (eval echo configure:4623: \"$ac_link conftest2.$ac_ext\") 1>&5; (eval $ac_link conftest2.$ac_ext) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4629: \"$ac_link conftest2.$ac_ext\") 1>&5; (eval $ac_link conftest2.$ac_ext) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cctk_cv_c_static_inline=$ac_kw; break
else
@@ -4645,26 +4651,39 @@ esac
echo $ac_n "checking for C restrict""... $ac_c" 1>&6
-echo "configure:4649: checking for C restrict" >&5
+echo "configure:4655: 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 4656 "configure"
+#line 4662 "configure"
#include "confdefs.h"
+double * $ac_kw p1;
+double * $ac_kw p2[3];
+struct s1 { char * $ac_kw arr; };
+struct s2 { char * $ac_kw arr[3]; };
+void f1 (void * $ac_kw p);
+void f2 (void * $ac_kw p[]);
+void f3 (void * $ac_kw p[3]);
+/* void f4 (void * $ac_kw p[$ac_kw]); */
+/* void f5 (void * $ac_kw p[$ac_kw 3]); */
+void f1 (void * $ac_kw p) { }
+void f2 (void * $ac_kw p[]) { }
+void f3 (void * $ac_kw p[3]) { }
+/* void f4 (void * $ac_kw p[$ac_kw]) { } */
+/* void f5 (void * $ac_kw p[$ac_kw 3]) { } */
+
int main() {
-double * $ac_kw foo;
-void bar (void * $ac_kw arr[]);
-struct tux { char * $ac_kw arr[3]; };
-void func (void * arr[$ac_kw]);
+double * $ac_kw v1;
+double * $ac_kw v2[3];
; return 0; }
EOF
-if { (eval echo configure:4668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_c_restrict=$ac_kw; break
else
@@ -4694,7 +4713,7 @@ EOF
esac
echo $ac_n "checking for C++ restrict""... $ac_c" 1>&6
-echo "configure:4698: checking for C++ restrict" >&5
+echo "configure:4717: 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
@@ -4709,18 +4728,32 @@ cross_compiling=$ac_cv_prog_cxx_cross
for ac_kw in restrict __restrict__ __restrict; do
cat > conftest.$ac_ext <<EOF
-#line 4713 "configure"
+#line 4732 "configure"
#include "confdefs.h"
+double * $ac_kw p1;
+double * $ac_kw p2[3];
+struct s1 { char * $ac_kw arr; };
+struct s2 { char * $ac_kw arr[3]; };
+void f1 (void * $ac_kw p);
+void f2 (void * $ac_kw p[]);
+void f3 (void * $ac_kw p[3]);
+// void f4 (void * $ac_kw p[$ac_kw]);
+// void f5 (void * $ac_kw p[$ac_kw 3]);
+void f1 (void * $ac_kw p) { }
+void f2 (void * $ac_kw p[]) { }
+void f3 (void * $ac_kw p[3]) { }
+// void f4 (void * $ac_kw p[$ac_kw]) { }
+// void f5 (void * $ac_kw p[$ac_kw 3]) { }
+
int main() {
-double * $ac_kw foo;
-void bar (void * $ac_kw arr[]);
-struct tux { char * $ac_kw arr[3]; };
+double * $ac_kw v1;
+double * $ac_kw v2[3];
; return 0; }
EOF
-if { (eval echo configure:4724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_cxx_restrict=$ac_kw; break
else
@@ -4758,20 +4791,20 @@ esac
echo $ac_n "checking for C bool""... $ac_c" 1>&6
-echo "configure:4762: checking for C bool" >&5
+echo "configure:4795: 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 4768 "configure"
+#line 4801 "configure"
#include "confdefs.h"
int main() {
bool foo;
; return 0; }
EOF
-if { (eval echo configure:4775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_c_bool=yes
else
@@ -4793,7 +4826,7 @@ EOF
fi
echo $ac_n "checking for CXX bool""... $ac_c" 1>&6
-echo "configure:4797: checking for CXX bool" >&5
+echo "configure:4830: 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
@@ -4807,14 +4840,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 4811 "configure"
+#line 4844 "configure"
#include "confdefs.h"
int main() {
bool foo;
; return 0; }
EOF
-if { (eval echo configure:4818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_cxx_bool=yes
else
@@ -4844,20 +4877,20 @@ fi
echo $ac_n "checking for C _Pragma""... $ac_c" 1>&6
-echo "configure:4848: checking for C _Pragma" >&5
+echo "configure:4881: checking for C _Pragma" >&5
if eval "test \"`echo '$''{'cctk_cv_have_c__Pragma'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cctk_cv_have_c__Pragma=no
cat > conftest.$ac_ext <<EOF
-#line 4854 "configure"
+#line 4887 "configure"
#include "confdefs.h"
int main() {
int x; _Pragma ("omp barrier") x=0;
; return 0; }
EOF
-if { (eval echo configure:4861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_c__Pragma=yes
else
@@ -4895,20 +4928,20 @@ fi
# Find out whether the C compiler supports __attribute__((noinline))
echo $ac_n "checking for C function __attribute__((__noinline__))""... $ac_c" 1>&6
-echo "configure:4899: checking for C function __attribute__((__noinline__))" >&5
+echo "configure:4932: checking for C function __attribute__((__noinline__))" >&5
if eval "test \"`echo '$''{'cctk_cv_have_c_attribute_noinline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cctk_cv_have_c_attribute_noinline=no
cat > conftest.$ac_ext <<EOF
-#line 4905 "configure"
+#line 4938 "configure"
#include "confdefs.h"
int main() {
double foo (double) __attribute__((__noinline__));
; return 0; }
EOF
-if { (eval echo configure:4912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_c_attribute_noinline=yes
else
@@ -4930,7 +4963,7 @@ EOF
fi
echo $ac_n "checking for CXX function __attribute__((__noinline__))""... $ac_c" 1>&6
-echo "configure:4934: checking for CXX function __attribute__((__noinline__))" >&5
+echo "configure:4967: checking for CXX function __attribute__((__noinline__))" >&5
if eval "test \"`echo '$''{'cctk_cv_have_cxx_attribute_noinline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4944,14 +4977,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 4948 "configure"
+#line 4981 "configure"
#include "confdefs.h"
int main() {
double foo (double) __attribute__((__noinline__));
; return 0; }
EOF
-if { (eval echo configure:4955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_cxx_attribute_noinline=yes
else
@@ -4980,7 +5013,7 @@ EOF
fi
echo $ac_n "checking for CXX member function __attribute__((__noinline__))""... $ac_c" 1>&6
-echo "configure:4984: checking for CXX member function __attribute__((__noinline__))" >&5
+echo "configure:5017: checking for CXX member function __attribute__((__noinline__))" >&5
if eval "test \"`echo '$''{'cctk_cv_have_cxx_member_attribute_noinline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4994,14 +5027,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 4998 "configure"
+#line 5031 "configure"
#include "confdefs.h"
int main() {
-struct { double foo (double) __attribute__((__noinline__)); };
+struct bar { double foo (double) __attribute__((__noinline__)); };
; return 0; }
EOF
-if { (eval echo configure:5005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_cxx_member_attribute_noinline=yes
else
@@ -5032,20 +5065,20 @@ fi
# Find out whether the C compiler supports __attribute__((unused))
echo $ac_n "checking for C __attribute__((__unused__))""... $ac_c" 1>&6
-echo "configure:5036: checking for C __attribute__((__unused__))" >&5
+echo "configure:5069: 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 5042 "configure"
+#line 5075 "configure"
#include "confdefs.h"
int main() {
double * foo __attribute__((__unused__));
; return 0; }
EOF
-if { (eval echo configure:5049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_c_attribute_unused=yes
else
@@ -5067,7 +5100,7 @@ EOF
fi
echo $ac_n "checking for CXX __attribute__((__unused__))""... $ac_c" 1>&6
-echo "configure:5071: checking for CXX __attribute__((__unused__))" >&5
+echo "configure:5104: 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
@@ -5081,14 +5114,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 5085 "configure"
+#line 5118 "configure"
#include "confdefs.h"
int main() {
double * foo __attribute__((__unused__));
; return 0; }
EOF
-if { (eval echo configure:5092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_cxx_attribute_unused=yes
else
@@ -5119,20 +5152,20 @@ fi
# Find out whether the C compiler supports __attribute__((aligned(...)))
echo $ac_n "checking for C __attribute__((__aligned__(...)))""... $ac_c" 1>&6
-echo "configure:5123: checking for C __attribute__((__aligned__(...)))" >&5
+echo "configure:5156: checking for C __attribute__((__aligned__(...)))" >&5
if eval "test \"`echo '$''{'cctk_cv_have_c_attribute_aligned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cctk_cv_have_c_attribute_aligned=no
cat > conftest.$ac_ext <<EOF
-#line 5129 "configure"
+#line 5162 "configure"
#include "confdefs.h"
int main() {
double * foo __attribute__((__aligned__(16)));
; return 0; }
EOF
-if { (eval echo configure:5136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_c_attribute_aligned=yes
else
@@ -5154,7 +5187,7 @@ EOF
fi
echo $ac_n "checking for CXX __attribute__((__aligned__(...)))""... $ac_c" 1>&6
-echo "configure:5158: checking for CXX __attribute__((__aligned__(...)))" >&5
+echo "configure:5191: checking for CXX __attribute__((__aligned__(...)))" >&5
if eval "test \"`echo '$''{'cctk_cv_have_cxx_attribute_aligned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5168,14 +5201,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 5172 "configure"
+#line 5205 "configure"
#include "confdefs.h"
int main() {
double * foo __attribute__((__aligned__(16)));
; return 0; }
EOF
-if { (eval echo configure:5179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_cxx_attribute_aligned=yes
else
@@ -5204,16 +5237,269 @@ EOF
fi
-## Find out whether the C compiler supports __attribute__((cold))
-#CCTK_C_ATTRIBUTE_COLD
-#CCTK_CXX_ATTRIBUTE_COLD
-#
-## Find out whether the C compiler supports __attribute__((hot))
-#CCTK_C_ATTRIBUTE_HOT
-#CCTK_CXX_ATTRIBUTE_HOT
+# Find out whether the C compiler supports __attribute__((cold))
+echo $ac_n "checking for C __attribute__((__cold__))""... $ac_c" 1>&6
+echo "configure:5243: checking for C __attribute__((__cold__))" >&5
+if eval "test \"`echo '$''{'cctk_cv_have_c_attribute_cold'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cctk_cv_have_c_attribute_cold=no
+cat > conftest.$ac_ext <<EOF
+#line 5249 "configure"
+#include "confdefs.h"
+
+int main() {
+double * foo __attribute__((__cold__));
+; return 0; }
+EOF
+if { (eval echo configure:5256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cctk_cv_have_c_attribute_cold=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cctk_cv_have_c_attribute_cold=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cctk_cv_have_c_attribute_cold" 1>&6
+if test "$cctk_cv_have_c_attribute_cold" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_CCTK_C_ATTRIBUTE_COLD 1
+EOF
+
+fi
+
+echo $ac_n "checking for CXX __attribute__((__cold__))""... $ac_c" 1>&6
+echo "configure:5278: checking for CXX __attribute__((__cold__))" >&5
+if eval "test \"`echo '$''{'cctk_cv_have_cxx_attribute_cold'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cctk_cv_have_cxx_attribute_cold=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 5292 "configure"
+#include "confdefs.h"
+
+int main() {
+double * foo __attribute__((__cold__));
+; return 0; }
+EOF
+if { (eval echo configure:5299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cctk_cv_have_cxx_attribute_cold=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cctk_cv_have_cxx_attribute_cold=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_cold" 1>&6
+if test "$cctk_cv_have_cxx_attribute_cold" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_CCTK_CXX_ATTRIBUTE_COLD 1
+EOF
+
+fi
+
+
+# Find out whether the C compiler supports __attribute__((hot))
+echo $ac_n "checking for C __attribute__((__hot__))""... $ac_c" 1>&6
+echo "configure:5330: checking for C __attribute__((__hot__))" >&5
+if eval "test \"`echo '$''{'cctk_cv_have_c_attribute_hot'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cctk_cv_have_c_attribute_hot=no
+cat > conftest.$ac_ext <<EOF
+#line 5336 "configure"
+#include "confdefs.h"
+
+int main() {
+double * foo __attribute__((__hot__));
+; return 0; }
+EOF
+if { (eval echo configure:5343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cctk_cv_have_c_attribute_hot=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cctk_cv_have_c_attribute_hot=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cctk_cv_have_c_attribute_hot" 1>&6
+if test "$cctk_cv_have_c_attribute_hot" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_CCTK_C_ATTRIBUTE_HOT 1
+EOF
+
+fi
+
+echo $ac_n "checking for CXX __attribute__((__hot__))""... $ac_c" 1>&6
+echo "configure:5365: checking for CXX __attribute__((__hot__))" >&5
+if eval "test \"`echo '$''{'cctk_cv_have_cxx_attribute_hot'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cctk_cv_have_cxx_attribute_hot=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 5379 "configure"
+#include "confdefs.h"
+
+int main() {
+double * foo __attribute__((__hot__));
+; return 0; }
+EOF
+if { (eval echo configure:5386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cctk_cv_have_cxx_attribute_hot=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cctk_cv_have_cxx_attribute_hot=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_hot" 1>&6
+if test "$cctk_cv_have_cxx_attribute_hot" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_CCTK_CXX_ATTRIBUTE_HOT 1
+EOF
+
+fi
+
+
+# Find out whether the C compiler supports __builtin_expect
+echo $ac_n "checking for C __builtin_expect""... $ac_c" 1>&6
+echo "configure:5417: checking for C __builtin_expect" >&5
+if eval "test \"`echo '$''{'cctk_cv_have_c_builtin_expect'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cctk_cv_have_c_builtin_expect=no
+cat > conftest.$ac_ext <<EOF
+#line 5423 "configure"
+#include "confdefs.h"
+
+int main() {
+__builtin_expect(0,0);
+; return 0; }
+EOF
+if { (eval echo configure:5430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cctk_cv_have_c_builtin_expect=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cctk_cv_have_c_builtin_expect=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cctk_cv_have_c_builtin_expect" 1>&6
+if test "$cctk_cv_have_c_builtin_expect" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_CCTK_C_BUILTIN_EXPECT 1
+EOF
+
+fi
+
+echo $ac_n "checking for CXX __builtin_expect""... $ac_c" 1>&6
+echo "configure:5452: checking for CXX __builtin_expect" >&5
+if eval "test \"`echo '$''{'cctk_cv_have_cxx_builtin_expect'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cctk_cv_have_cxx_builtin_expect=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 5466 "configure"
+#include "confdefs.h"
+
+int main() {
+__builtin_expect(0,0);
+; return 0; }
+EOF
+if { (eval echo configure:5473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ cctk_cv_have_cxx_builtin_expect=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cctk_cv_have_cxx_builtin_expect=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_builtin_expect" 1>&6
+if test "$cctk_cv_have_cxx_builtin_expect" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_CCTK_CXX_BUILTIN_EXPECT 1
+EOF
+
+fi
+
echo $ac_n "checking for Fortran REAL*4""... $ac_c" 1>&6
-echo "configure:5217: checking for Fortran REAL*4" >&5
+echo "configure:5503: checking for Fortran REAL*4" >&5
if eval "test \"`echo '$''{'cctk_cv_have_fortran_real4'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5229,7 +5515,7 @@ cat > conftest.$ac_ext <<EOF
REAL*4 a
end
EOF
-if { (eval echo configure:5233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_fortran_real4=yes
else
@@ -5258,7 +5544,7 @@ EOF
fi
echo $ac_n "checking for Fortran REAL*8""... $ac_c" 1>&6
-echo "configure:5262: checking for Fortran REAL*8" >&5
+echo "configure:5548: checking for Fortran REAL*8" >&5
if eval "test \"`echo '$''{'cctk_cv_have_fortran_real8'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5274,7 +5560,7 @@ cat > conftest.$ac_ext <<EOF
REAL*8 a
end
EOF
-if { (eval echo configure:5278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_fortran_real8=yes
else
@@ -5303,7 +5589,7 @@ EOF
fi
echo $ac_n "checking for Fortran REAL*16""... $ac_c" 1>&6
-echo "configure:5307: checking for Fortran REAL*16" >&5
+echo "configure:5593: checking for Fortran REAL*16" >&5
if eval "test \"`echo '$''{'cctk_cv_have_fortran_real16'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5319,7 +5605,7 @@ cat > conftest.$ac_ext <<EOF
REAL*16 a
end
EOF
-if { (eval echo configure:5323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_fortran_real16=yes
else
@@ -5349,7 +5635,7 @@ fi
echo $ac_n "checking for Fortran COMPLEX*8""... $ac_c" 1>&6
-echo "configure:5353: checking for Fortran COMPLEX*8" >&5
+echo "configure:5639: checking for Fortran COMPLEX*8" >&5
if eval "test \"`echo '$''{'cctk_cv_have_fortran_complex8'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5365,7 +5651,7 @@ cat > conftest.$ac_ext <<EOF
COMPLEX*8 a
end
EOF
-if { (eval echo configure:5369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_fortran_complex8=yes
else
@@ -5394,7 +5680,7 @@ EOF
fi
echo $ac_n "checking for Fortran COMPLEX*16""... $ac_c" 1>&6
-echo "configure:5398: checking for Fortran COMPLEX*16" >&5
+echo "configure:5684: checking for Fortran COMPLEX*16" >&5
if eval "test \"`echo '$''{'cctk_cv_have_fortran_complex16'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5410,7 +5696,7 @@ cat > conftest.$ac_ext <<EOF
COMPLEX*16 a
end
EOF
-if { (eval echo configure:5414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_fortran_complex16=yes
else
@@ -5439,7 +5725,7 @@ EOF
fi
echo $ac_n "checking for Fortran COMPLEX*32""... $ac_c" 1>&6
-echo "configure:5443: checking for Fortran COMPLEX*32" >&5
+echo "configure:5729: checking for Fortran COMPLEX*32" >&5
if eval "test \"`echo '$''{'cctk_cv_have_fortran_complex32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5455,7 +5741,7 @@ cat > conftest.$ac_ext <<EOF
COMPLEX*32 a
end
EOF
-if { (eval echo configure:5459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cctk_cv_have_fortran_complex32=yes
else
@@ -5486,12 +5772,12 @@ 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:5490: checking for crypt" >&5
+echo "configure:5776: 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 5495 "configure"
+#line 5781 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char crypt(); below. */
@@ -5514,7 +5800,7 @@ crypt();
; return 0; }
EOF
-if { (eval echo configure:5518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5804: \"$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
@@ -5532,7 +5818,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:5536: checking for crypt in library crypt" >&5
+echo "configure:5822: 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
@@ -5541,7 +5827,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="crypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5545 "configure"
+#line 5831 "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
@@ -5552,7 +5838,7 @@ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:5556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5842: \"$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
@@ -5593,12 +5879,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:5597: checking for $ac_func" >&5
+echo "configure:5883: 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 5602 "configure"
+#line 5888 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5621,7 +5907,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5911: \"$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
@@ -5643,7 +5929,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for finite in library m""... $ac_c" 1>&6
-echo "configure:5647: checking for finite in library m" >&5
+echo "configure:5933: 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
@@ -5652,7 +5938,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="m $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5656 "configure"
+#line 5942 "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
@@ -5663,7 +5949,7 @@ int main() {
finite()
; return 0; }
EOF
-if { (eval echo configure:5667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5953: \"$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
@@ -5705,12 +5991,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:5709: checking for $ac_func" >&5
+echo "configure:5995: 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 5714 "configure"
+#line 6000 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5733,7 +6019,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6023: \"$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
@@ -5755,7 +6041,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for isnan in library m""... $ac_c" 1>&6
-echo "configure:5759: checking for isnan in library m" >&5
+echo "configure:6045: 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
@@ -5764,7 +6050,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="m $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5768 "configure"
+#line 6054 "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
@@ -5775,7 +6061,7 @@ int main() {
isnan()
; return 0; }
EOF
-if { (eval echo configure:5779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6065: \"$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
@@ -5817,12 +6103,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_
for ac_func in isinf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5821: checking for $ac_func" >&5
+echo "configure:6107: 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 5826 "configure"
+#line 6112 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5845,7 +6131,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6135: \"$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
@@ -5867,7 +6153,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for isinf in library m""... $ac_c" 1>&6
-echo "configure:5871: checking for isinf in library m" >&5
+echo "configure:6157: checking for isinf in library m" >&5
ac_lib_var=`echo m'_'isinf | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5876,7 +6162,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="m $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5880 "configure"
+#line 6166 "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
@@ -5887,7 +6173,7 @@ int main() {
isinf()
; return 0; }
EOF
-if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6177: \"$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
@@ -5929,12 +6215,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:5933: checking for $ac_func" >&5
+echo "configure:6219: 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 5938 "configure"
+#line 6224 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5957,7 +6243,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6247: \"$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
@@ -5979,7 +6265,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mkstemp in library c""... $ac_c" 1>&6
-echo "configure:5983: checking for mkstemp in library c" >&5
+echo "configure:6269: 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
@@ -5988,18 +6274,18 @@ else
ac_save_LIBS="$LIBS"
LIBS="c $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5992 "configure"
+#line 6278 "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
builtin and then its argument prototype would still apply. */
-char APO2mM;
+char wmWlTu;
int main() {
-jtB7B6
+87LyhD
; return 0; }
EOF
-if { (eval echo configure:6003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6289: \"$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
@@ -6038,19 +6324,19 @@ done
echo $ac_n "checking for va_copy""... $ac_c" 1>&6
-echo "configure:6042: checking for va_copy" >&5
+echo "configure:6328: 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 6047 "configure"
+#line 6333 "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:6054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6340: \"$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
@@ -6089,7 +6375,7 @@ if test "$PTHREADS_MODE" = 'yes'; then
if test -z "$PTHREAD_LIBS"; then
PTHREAD_LIBS=
echo $ac_n "checking for main in library c_r""... $ac_c" 1>&6
-echo "configure:6093: checking for main in library c_r" >&5
+echo "configure:6379: 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
@@ -6098,14 +6384,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="c_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6102 "configure"
+#line 6388 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6395: \"$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
@@ -6126,7 +6412,7 @@ else
fi
echo $ac_n "checking for main in library pthread""... $ac_c" 1>&6
-echo "configure:6130: checking for main in library pthread" >&5
+echo "configure:6416: 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
@@ -6135,14 +6421,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="pthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6139 "configure"
+#line 6425 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6432: \"$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
@@ -6161,7 +6447,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:6165: checking for main in library pthreads" >&5
+echo "configure:6451: 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
@@ -6170,14 +6456,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="pthreads $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6174 "configure"
+#line 6460 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6467: \"$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
@@ -6651,7 +6937,7 @@ if test "x$CCTK_NEED_X" = 'xyes' ; then
# 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:6655: checking for X" >&5
+echo "configure:6941: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -6713,12 +6999,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 6717 "configure"
+#line 7003 "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:6722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7008: \"$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*
@@ -6787,14 +7073,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 6791 "configure"
+#line 7077 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:6798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7084: \"$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.
diff --git a/lib/make/configure.in b/lib/make/configure.in
index eee68c61..9d43bc83 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -874,13 +874,17 @@ CCTK_CXX_ATTRIBUTE_UNUSED
CCTK_C_ATTRIBUTE_ALIGNED
CCTK_CXX_ATTRIBUTE_ALIGNED
-## Find out whether the C compiler supports __attribute__((cold))
-#CCTK_C_ATTRIBUTE_COLD
-#CCTK_CXX_ATTRIBUTE_COLD
-#
-## Find out whether the C compiler supports __attribute__((hot))
-#CCTK_C_ATTRIBUTE_HOT
-#CCTK_CXX_ATTRIBUTE_HOT
+# Find out whether the C compiler supports __attribute__((cold))
+CCTK_C_ATTRIBUTE_COLD
+CCTK_CXX_ATTRIBUTE_COLD
+
+# Find out whether the C compiler supports __attribute__((hot))
+CCTK_C_ATTRIBUTE_HOT
+CCTK_CXX_ATTRIBUTE_HOT
+
+# Find out whether the C compiler supports __builtin_expect
+CCTK_C_BUILTIN_EXPECT
+CCTK_CXX_BUILTIN_EXPECT
CCTK_FORTRAN_REAL4
CCTK_FORTRAN_REAL8
diff --git a/lib/make/force-reconfigure b/lib/make/force-reconfigure
index 80c507bb..80dd665a 100644
--- a/lib/make/force-reconfigure
+++ b/lib/make/force-reconfigure
@@ -28,3 +28,4 @@
21 Dec 2010: Add new options CPP_*_FLAGS and FPP_*_FLAGS
04 Jan 2011: Add CCTK_ATTRIBUTE_ALIGNED
30 Mar 2011: Add variables MAKE, TAR, GZIP_CMD, PATCH, GIT
+26 Apr 2011: Add CCTK_BUILTIN_EXPECT