summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlib/make/configure230
-rw-r--r--lib/make/configure.in3
-rw-r--r--lib/make/make.config.defn.in1
-rw-r--r--lib/make/make.thornlib2
4 files changed, 122 insertions, 114 deletions
diff --git a/lib/make/configure b/lib/make/configure
index 1f0912eb..5dca393a 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -2343,6 +2343,9 @@ X_INC_DIR="$x_includes"
: ${USE_RANLIB=no}
+: ${RANLIBFLAGS=cs}
+
+
#: ${F90FLAGS="$CFLAGS"}
@@ -2356,12 +2359,12 @@ ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_
for ac_func in scandir
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2360: checking for $ac_func" >&5
+echo "configure:2363: 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 2365 "configure"
+#line 2368 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2384,7 +2387,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2391: \"$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
@@ -2408,7 +2411,7 @@ else
SAVED_LIBDIRS="$LIBDIRS"
LIBDIRS="$LIBDIRS /usr/ucblib"
echo $ac_n "checking for scandir in library ucb""... $ac_c" 1>&6
-echo "configure:2412: checking for scandir in library ucb" >&5
+echo "configure:2415: checking for scandir in library ucb" >&5
ac_lib_var=`echo ucb'_'scandir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2417,7 +2420,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="ucb $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2421 "configure"
+#line 2424 "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
@@ -2428,7 +2431,7 @@ int main() {
scandir()
; return 0; }
EOF
-if { (eval echo configure:2432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2435: \"$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
@@ -2465,12 +2468,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:2469: checking for $ac_func" >&5
+echo "configure:2472: 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 2474 "configure"
+#line 2477 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2493,7 +2496,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2500: \"$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
@@ -2515,7 +2518,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in library nsl""... $ac_c" 1>&6
-echo "configure:2519: checking for gethostbyname in library nsl" >&5
+echo "configure:2522: 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
@@ -2524,7 +2527,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="nsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2528 "configure"
+#line 2531 "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
@@ -2535,7 +2538,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2542: \"$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
@@ -2566,12 +2569,12 @@ done
# Check if we have mode_t available
echo $ac_n "checking if mode_t is defined""... $ac_c" 1>&6
-echo "configure:2570: checking if mode_t is defined" >&5
+echo "configure:2573: checking if mode_t is defined" >&5
if eval "test \"`echo '$''{'cctk_cv_have_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2575 "configure"
+#line 2578 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -2581,7 +2584,7 @@ int main() {
mode_t foo; return 0
; return 0; }
EOF
-if { (eval echo configure:2585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have_mode_t=yes"
else
@@ -2607,12 +2610,12 @@ fi
echo $ac_n "checking for availability of gettimeofday timing""... $ac_c" 1>&6
-echo "configure:2611: checking for availability of gettimeofday timing" >&5
+echo "configure:2614: 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 2616 "configure"
+#line 2619 "configure"
#include "confdefs.h"
int main() {
@@ -2620,7 +2623,7 @@ gettimeofday();
return 0;
; return 0; }
EOF
-if { (eval echo configure:2624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2627: \"$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
@@ -2642,12 +2645,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:2646: checking if gettimeofday needs timezone" >&5
+echo "configure:2649: 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 2651 "configure"
+#line 2654 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/time.h>
@@ -2660,7 +2663,7 @@ struct timeval tp;
return 0;
; return 0; }
EOF
-if { (eval echo configure:2664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2667: \"$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
@@ -2683,12 +2686,12 @@ fi
fi
echo $ac_n "checking for availability of getrusage timing""... $ac_c" 1>&6
-echo "configure:2687: checking for availability of getrusage timing" >&5
+echo "configure:2690: 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 2692 "configure"
+#line 2695 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/time.h>
@@ -2701,7 +2704,7 @@ struct rusage ru;
return 0;
; return 0; }
EOF
-if { (eval echo configure:2705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2708: \"$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
@@ -2723,12 +2726,12 @@ else
fi
echo $ac_n "checking for availability of _ftime timing""... $ac_c" 1>&6
-echo "configure:2727: checking for availability of _ftime timing" >&5
+echo "configure:2730: 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 2732 "configure"
+#line 2735 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <time.h>
@@ -2741,7 +2744,7 @@ int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2748: \"$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
@@ -2768,12 +2771,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:2772: checking for $cctk_hdr" >&5
+echo "configure:2775: 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 2777 "configure"
+#line 2780 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2781,7 +2784,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2808,12 +2811,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:2812: checking for $cctk_hdr" >&5
+echo "configure:2815: 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 2817 "configure"
+#line 2820 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2821,7 +2824,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2848,12 +2851,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:2852: checking for $cctk_hdr" >&5
+echo "configure:2855: 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 2857 "configure"
+#line 2860 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2861,7 +2864,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2888,12 +2891,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:2892: checking for $cctk_hdr" >&5
+echo "configure:2895: 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 2897 "configure"
+#line 2900 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2901,7 +2904,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2928,12 +2931,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:2932: checking for $cctk_hdr" >&5
+echo "configure:2935: 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 2937 "configure"
+#line 2940 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2941,7 +2944,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -2968,12 +2971,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:2972: checking for $cctk_hdr" >&5
+echo "configure:2975: 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 2977 "configure"
+#line 2980 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -2981,7 +2984,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3008,12 +3011,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:3012: checking for $cctk_hdr" >&5
+echo "configure:3015: 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 3017 "configure"
+#line 3020 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3021,7 +3024,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3048,12 +3051,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:3052: checking for $cctk_hdr" >&5
+echo "configure:3055: 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 3057 "configure"
+#line 3060 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3061,7 +3064,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3085,12 +3088,12 @@ fi
done
echo $ac_n "checking for regex.h""... $ac_c" 1>&6
-echo "configure:3089: checking for regex.h" >&5
+echo "configure:3092: 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 3094 "configure"
+#line 3097 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <regex.h>
@@ -3098,7 +3101,7 @@ int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:3102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_regex_h=yes"
else
@@ -3123,12 +3126,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:3127: checking for $cctk_hdr" >&5
+echo "configure:3130: 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 3132 "configure"
+#line 3135 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3138,7 +3141,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3165,12 +3168,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:3169: checking for $cctk_hdr" >&5
+echo "configure:3172: 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 3174 "configure"
+#line 3177 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3180,7 +3183,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3207,12 +3210,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:3211: checking for $cctk_hdr" >&5
+echo "configure:3214: 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 3216 "configure"
+#line 3219 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3222,7 +3225,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3249,12 +3252,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:3253: checking for $cctk_hdr" >&5
+echo "configure:3256: 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 3258 "configure"
+#line 3261 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -3264,7 +3267,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3291,12 +3294,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:3295: checking for $cctk_hdr" >&5
+echo "configure:3298: 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 3300 "configure"
+#line 3303 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3304,7 +3307,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3331,12 +3334,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:3335: checking for $cctk_hdr" >&5
+echo "configure:3338: 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 3340 "configure"
+#line 3343 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -3346,7 +3349,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3371,12 +3374,12 @@ done
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3375: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3378: 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 3380 "configure"
+#line 3383 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -3385,7 +3388,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -3410,12 +3413,12 @@ fi
# Check if we have socklen_t available
echo $ac_n "checking if socklen_t is defined""... $ac_c" 1>&6
-echo "configure:3414: checking if socklen_t is defined" >&5
+echo "configure:3417: checking if socklen_t is defined" >&5
if eval "test \"`echo '$''{'cctk_cv_have_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3419 "configure"
+#line 3422 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -3435,7 +3438,7 @@ int main() {
socklen_t foo; return 0
; return 0; }
EOF
-if { (eval echo configure:3439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have_socklen_t=yes"
else
@@ -3460,12 +3463,12 @@ fi
# Check if someone has defined SOCKET
echo $ac_n "checking if SOCKET is defined""... $ac_c" 1>&6
-echo "configure:3464: checking if SOCKET is defined" >&5
+echo "configure:3467: checking if SOCKET is defined" >&5
if eval "test \"`echo '$''{'cctk_cv_have_SOCKET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3469 "configure"
+#line 3472 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -3485,7 +3488,7 @@ int main() {
SOCKET foo; return 0
; return 0; }
EOF
-if { (eval echo configure:3489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have_SOCKET=yes"
else
@@ -3510,19 +3513,19 @@ fi
# Check if we have __int64
echo $ac_n "checking if __int64 is defined""... $ac_c" 1>&6
-echo "configure:3514: checking if __int64 is defined" >&5
+echo "configure:3517: 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 3519 "configure"
+#line 3522 "configure"
#include "confdefs.h"
int main() {
__int64 foo; return 0
; return 0; }
EOF
-if { (eval echo configure:3526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_have___int64=yes"
else
@@ -3557,12 +3560,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:3561: 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 3566 "configure"
+#line 3569 "configure"
#include "confdefs.h"
#include <$cctk_hdr>
@@ -3570,7 +3573,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "cctk_cv_header_$cctk_safe=yes"
else
@@ -3610,14 +3613,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 3614 "configure"
+#line 3617 "configure"
#include "confdefs.h"
int main() {
bool foo;
; return 0; }
EOF
-if { (eval echo configure:3621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_BOOL 1
@@ -3643,12 +3646,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:3647: checking for $ac_func" >&5
+echo "configure:3650: 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 3652 "configure"
+#line 3655 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3671,7 +3674,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3678: \"$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
@@ -3716,12 +3719,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:3720: checking for crypt" >&5
+echo "configure:3723: 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 3725 "configure"
+#line 3728 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char crypt(); below. */
@@ -3744,7 +3747,7 @@ crypt();
; return 0; }
EOF
-if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3751: \"$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
@@ -3762,7 +3765,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:3766: checking for crypt in library crypt" >&5
+echo "configure:3769: 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
@@ -3771,7 +3774,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="crypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3775 "configure"
+#line 3778 "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
@@ -3782,7 +3785,7 @@ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3789: \"$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
@@ -3824,12 +3827,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:3828: checking for $ac_func" >&5
+echo "configure:3831: 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 3833 "configure"
+#line 3836 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3852,7 +3855,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3859: \"$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
@@ -3874,7 +3877,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for finite in library m""... $ac_c" 1>&6
-echo "configure:3878: checking for finite in library m" >&5
+echo "configure:3881: 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
@@ -3883,7 +3886,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="m $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3887 "configure"
+#line 3890 "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
@@ -3894,7 +3897,7 @@ int main() {
finite()
; return 0; }
EOF
-if { (eval echo configure:3898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3901: \"$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
@@ -3937,7 +3940,7 @@ done
if test "X$PTHREADS" = "Xyes"; then
PTHREAD_LIBS=
echo $ac_n "checking for main in library c_r""... $ac_c" 1>&6
-echo "configure:3941: checking for main in library c_r" >&5
+echo "configure:3944: 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
@@ -3946,14 +3949,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="c_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3950 "configure"
+#line 3953 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3960: \"$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
@@ -3974,7 +3977,7 @@ else
fi
echo $ac_n "checking for main in library pthread""... $ac_c" 1>&6
-echo "configure:3978: checking for main in library pthread" >&5
+echo "configure:3981: 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
@@ -3983,14 +3986,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="pthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3987 "configure"
+#line 3990 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3997: \"$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
@@ -4009,7 +4012,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:4013: checking for main in library pthreads" >&5
+echo "configure:4016: 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
@@ -4018,14 +4021,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="pthreads $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4022 "configure"
+#line 4025 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4032: \"$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
@@ -4854,6 +4857,7 @@ s%@X_LIB_DIR@%$X_LIB_DIR%g
s%@X_INC_DIR@%$X_INC_DIR%g
s%@ARFLAGS@%$ARFLAGS%g
s%@USE_RANLIB@%$USE_RANLIB%g
+s%@RANLIBFLAGS@%$RANLIBFLAGS%g
s%@F90FLAGS@%$F90FLAGS%g
s%@F77FLAGS@%$F77FLAGS%g
s%@BUILD_GETOPT@%$BUILD_GETOPT%g
diff --git a/lib/make/configure.in b/lib/make/configure.in
index 687ac646..b42062ed 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -320,6 +320,9 @@ AC_SUBST(ARFLAGS)
AC_SUBST(USE_RANLIB)
: ${USE_RANLIB=no}
+AC_SUBST(RANLIBFLAGS)
+: ${RANLIBFLAGS=cs}
+
AC_SUBST(F90FLAGS)
AC_SUBST(F77FLAGS)
diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in
index de7660ed..8ac2008b 100644
--- a/lib/make/make.config.defn.in
+++ b/lib/make/make.config.defn.in
@@ -40,6 +40,7 @@ MKDIRFLAGS = @MKDIRFLAGS@
LDFLAGS = @LDFLAGS@
ARFLAGS = @ARFLAGS@
+RANLIBFLAGS = @RANLIBFLAGS@
# Debug flags
diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib
index d8f13863..f39b730c 100644
--- a/lib/make/make.thornlib
+++ b/lib/make/make.thornlib
@@ -68,7 +68,7 @@ $(NAME): $(addsuffix /make.checked, $(SUBDIRS)) $(LOCAL_OBJS) $(foreach DIR,. $(
if [ -r $(NAME) ] ; then echo Updating $(NAME) ; else echo Creating $(NAME) ; fi
if [ -r $@ ] ; then rm $@ ; fi
$(AR) $(ARFLAGS) $@ $(OBJS)
- if test "x$(USE_RANLIB)" = "xyes" ; then $(RANLIB) $@ ; fi
+ if test "x$(USE_RANLIB)" = "xyes" ; then $(RANLIB) $(RANLIBFLAGS) $@ ; fi
# Rules to make the object files
include $(CONFIG)/make.config.rules