commit 47a9b51cfe688bc31988cc02cb1653017ecc595c
parent 99b8ab480c05f159cc7ba01ad9d1388ca868d053
Author: ukai <ukai>
Date: Mon, 10 Mar 2003 16:07:33 +0000
[w3m-dev 03802] fix autoconf
* acinclude.m4 (AC_W3M_CHECK_VER): warn only
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat:
4 files changed, 105 insertions(+), 90 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-11 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03802] fix autoconf
+ * acinclude.m4 (AC_W3M_CHECK_VER): warn only
+
2003-03-11 Yuji Abe <cbo46560@pop12.odn.ne.jp>
* [w3m-dev 03801] fix autoconf
diff --git a/acinclude.m4 b/acinclude.m4
@@ -604,9 +604,11 @@ AC_DEFUN([AC_W3M_CHECK_VER],
set -- $version
IFS="$save_ifs"
if test "$[1]" -ne "$3" -o "$[2]" -lt "$4" -o "$[3]" -lt "$5"; then
- AC_MSG_ERROR([$1 is too old Install $1 (version >= $3.$4.$5)])
+ AC_MSG_WARN([$1 is too old Install $1 (version >= $3.$4.$5)])
+ $7
+ else
+ $6
fi
- $6
else
$7
fi])
diff --git a/aclocal.m4 b/aclocal.m4
@@ -616,9 +616,11 @@ AC_DEFUN([AC_W3M_CHECK_VER],
set -- $version
IFS="$save_ifs"
if test "$[1]" -ne "$3" -o "$[2]" -lt "$4" -o "$[3]" -lt "$5"; then
- AC_MSG_ERROR([$1 is too old Install $1 (version >= $3.$4.$5)])
+ AC_MSG_WARN([$1 is too old Install $1 (version >= $3.$4.$5)])
+ $7
+ else
+ $6
fi
- $6
else
$7
fi])
diff --git a/configure b/configure
@@ -2697,9 +2697,11 @@ EOF
set -- $version
IFS="$save_ifs"
if test "$1" -ne "0" -o "$2" -lt "16" -o "$3" -lt "0"; then
- { echo "configure: error: GdkPixbuf is too old Install GdkPixbuf (version >= 0.16.0)" 1>&2; exit 1; }
+ echo "configure: warning: GdkPixbuf is too old Install GdkPixbuf (version >= 0.16.0)" 1>&2
+ have_gdkpixbuf=no
+ else
+ have_gdkpixbuf=yes
fi
- have_gdkpixbuf=yes
else
have_gdkpixbuf=no
fi
@@ -2709,9 +2711,11 @@ EOF
set -- $version
IFS="$save_ifs"
if test "$1" -ne "1" -o "$2" -lt "9" -o "$3" -lt "8"; then
- { echo "configure: error: Imlib is too old Install Imlib (version >= 1.9.8)" 1>&2; exit 1; }
+ echo "configure: warning: Imlib is too old Install Imlib (version >= 1.9.8)" 1>&2
+ have_imlib=no
+ else
+ have_imlib=yes
fi
- have_imlib=yes
else
have_imlib=no
fi
@@ -2721,9 +2725,11 @@ EOF
set -- $version
IFS="$save_ifs"
if test "$1" -ne "1" -o "$2" -lt "0" -o "$3" -lt "5"; then
- { echo "configure: error: Imlib2 is too old Install Imlib2 (version >= 1.0.5)" 1>&2; exit 1; }
+ echo "configure: warning: Imlib2 is too old Install Imlib2 (version >= 1.0.5)" 1>&2
+ have_imlib2=no
+ else
+ have_imlib2=yes
fi
- have_imlib2=yes
else
have_imlib2=no
fi
@@ -2822,7 +2828,7 @@ if test x$enable_image != xno; then
AUXBIN_TARGETS="$AUXBIN_TARGETS w3mimgdisplay\$(EXT)"
echo $ac_n "checking if xface is enabled""... $ac_c" 1>&6
-echo "configure:2826: checking if xface is enabled" >&5
+echo "configure:2832: checking if xface is enabled" >&5
# Check whether --enable-xface or --disable-xface was given.
if test "${enable_xface+set}" = set; then
enableval="$enable_xface"
@@ -2840,7 +2846,7 @@ fi
echo $ac_n "checking if SSL is suported""... $ac_c" 1>&6
-echo "configure:2844: checking if SSL is suported" >&5
+echo "configure:2850: checking if SSL is suported" >&5
# Check whether --with-ssl or --without-ssl was given.
if test "${with_ssl+set}" = set; then
withval="$with_ssl"
@@ -2856,7 +2862,7 @@ if test x"${with_ssl+set}" = xset; then
EOF
echo $ac_n "checking for SSL library/header""... $ac_c" 1>&6
-echo "configure:2860: checking for SSL library/header" >&5
+echo "configure:2866: checking for SSL library/header" >&5
test -d $with_ssl || $with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
for i in $with_ssl
do
@@ -2870,7 +2876,7 @@ echo "configure:2860: checking for SSL library/header" >&5
fi
done
echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
-echo "configure:2874: checking for SSL_new in -lssl" >&5
+echo "configure:2880: checking for SSL_new in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_new | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2878,7 +2884,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl -lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2882 "configure"
+#line 2888 "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
@@ -2889,7 +2895,7 @@ int main() {
SSL_new()
; return 0; }
EOF
-if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2899: \"$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
@@ -2913,7 +2919,7 @@ fi
if test x$w3m_ssl = xfound; then
echo $ac_n "checking if SSL certificate verify is enabled""... $ac_c" 1>&6
-echo "configure:2917: checking if SSL certificate verify is enabled" >&5
+echo "configure:2923: checking if SSL certificate verify is enabled" >&5
# Check whether --enable-sslverify or --disable-sslverify was given.
if test "${enable_sslverify+set}" = set; then
enableval="$enable_sslverify"
@@ -2930,7 +2936,7 @@ EOF
fi
fi
echo $ac_n "checking if --enable-ipv6 option specified""... $ac_c" 1>&6
-echo "configure:2934: checking if --enable-ipv6 option specified" >&5
+echo "configure:2940: checking if --enable-ipv6 option specified" >&5
# Check whether --enable-ipv6 or --disable-ipv6 was given.
if test "${enable_ipv6+set}" = set; then
enableval="$enable_ipv6"
@@ -2943,15 +2949,15 @@ echo "$ac_t""$enable_ipv6" 1>&6
if test x$enable_ipv6 = xyes; then
echo $ac_n "checking if IPv6 API available""... $ac_c" 1>&6
-echo "configure:2947: checking if IPv6 API available" >&5
+echo "configure:2953: checking if IPv6 API available" >&5
echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
-echo "configure:2950: checking for getaddrinfo" >&5
+echo "configure:2956: checking for getaddrinfo" >&5
if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2955 "configure"
+#line 2961 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getaddrinfo(); below. */
@@ -2974,7 +2980,7 @@ getaddrinfo();
; return 0; }
EOF
-if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_getaddrinfo=yes"
else
@@ -2999,7 +3005,7 @@ fi
if test x$enable_ipv6 = xno; then
echo $ac_n "checking for libinet6""... $ac_c" 1>&6
-echo "configure:3003: checking for libinet6" >&5
+echo "configure:3009: checking for libinet6" >&5
for libdir in /usr/local/v6/lib /usr/local/lib /usr/lib
do
if test -f $libdir/libinet6.a; then
@@ -3007,7 +3013,7 @@ echo "configure:3003: checking for libinet6" >&5
LIBS="$LIBS -L$libdir"
fi
echo $ac_n "checking for getaddrinfo in -linet6""... $ac_c" 1>&6
-echo "configure:3011: checking for getaddrinfo in -linet6" >&5
+echo "configure:3017: checking for getaddrinfo in -linet6" >&5
ac_lib_var=`echo inet6'_'getaddrinfo | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3015,7 +3021,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-linet6 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3019 "configure"
+#line 3025 "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
@@ -3026,7 +3032,7 @@ int main() {
getaddrinfo()
; return 0; }
EOF
-if { (eval echo configure:3030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3036: \"$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
@@ -3053,7 +3059,7 @@ fi
fi
fi
echo $ac_n "checking for zError in -lz""... $ac_c" 1>&6
-echo "configure:3057: checking for zError in -lz" >&5
+echo "configure:3063: checking for zError in -lz" >&5
ac_lib_var=`echo z'_'zError | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3061,7 +3067,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3065 "configure"
+#line 3071 "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
@@ -3072,7 +3078,7 @@ int main() {
zError()
; return 0; }
EOF
-if { (eval echo configure:3076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3082: \"$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
@@ -3111,12 +3117,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:3115: checking for $ac_hdr that defines DIR" >&5
+echo "configure:3121: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3120 "configure"
+#line 3126 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -3124,7 +3130,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:3128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -3149,7 +3155,7 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:3153: checking for opendir in -ldir" >&5
+echo "configure:3159: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3157,7 +3163,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3161 "configure"
+#line 3167 "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
@@ -3168,7 +3174,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:3172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3178: \"$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
@@ -3190,7 +3196,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:3194: checking for opendir in -lx" >&5
+echo "configure:3200: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3198,7 +3204,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3202 "configure"
+#line 3208 "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
@@ -3209,7 +3215,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3219: \"$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
@@ -3232,12 +3238,12 @@ fi
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3236: checking for ANSI C header files" >&5
+echo "configure:3242: 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 3241 "configure"
+#line 3247 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -3245,7 +3251,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3255: \"$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*
@@ -3262,7 +3268,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 3266 "configure"
+#line 3272 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -3280,7 +3286,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 3284 "configure"
+#line 3290 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -3301,7 +3307,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 3305 "configure"
+#line 3311 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3312,7 +3318,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:3316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -3336,12 +3342,12 @@ EOF
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3340: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3346: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3345 "configure"
+#line 3351 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -3357,7 +3363,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:3361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -3379,17 +3385,17 @@ fi
ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:3383: checking for termios.h" >&5
+echo "configure:3389: checking for termios.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3388 "configure"
+#line 3394 "configure"
#include "confdefs.h"
#include <termios.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3399: \"$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*
@@ -3413,17 +3419,17 @@ else
echo "$ac_t""no" 1>&6
ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:3417: checking for termio.h" >&5
+echo "configure:3423: checking for termio.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3422 "configure"
+#line 3428 "configure"
#include "confdefs.h"
#include <termio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3433: \"$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*
@@ -3447,17 +3453,17 @@ else
echo "$ac_t""no" 1>&6
ac_safe=`echo "sgtty.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sgtty.h""... $ac_c" 1>&6
-echo "configure:3451: checking for sgtty.h" >&5
+echo "configure:3457: checking for sgtty.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3456 "configure"
+#line 3462 "configure"
#include "confdefs.h"
#include <sgtty.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3467: \"$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*
@@ -3487,17 +3493,17 @@ fi
ac_safe=`echo "float.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for float.h""... $ac_c" 1>&6
-echo "configure:3491: checking for float.h" >&5
+echo "configure:3497: checking for float.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3496 "configure"
+#line 3502 "configure"
#include "confdefs.h"
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3507: \"$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*
@@ -3520,17 +3526,17 @@ fi
ac_safe=`echo "sys/select.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/select.h""... $ac_c" 1>&6
-echo "configure:3524: checking for sys/select.h" >&5
+echo "configure:3530: checking for sys/select.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3529 "configure"
+#line 3535 "configure"
#include "confdefs.h"
#include <sys/select.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3540: \"$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*
@@ -3553,7 +3559,7 @@ fi
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:3557: checking size of long long" >&5
+echo "configure:3563: 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
@@ -3561,7 +3567,7 @@ else
ac_cv_sizeof_long_long=0
else
cat > conftest.$ac_ext <<EOF
-#line 3565 "configure"
+#line 3571 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -3573,7 +3579,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3583: \"$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
@@ -3596,12 +3602,12 @@ EOF
for ac_func in strcasecmp strcasestr strchr memcpy strerror bcopy setpgrp chdir getcwd getwd readlink setenv putenv strtoll stroq atoll atoq symlink readlink lstat srand48 srandom getpassphrase waitpid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3600: checking for $ac_func" >&5
+echo "configure:3606: 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 3605 "configure"
+#line 3611 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3624,7 +3630,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3634: \"$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
@@ -3649,12 +3655,12 @@ fi
done
echo $ac_n "checking for strftime""... $ac_c" 1>&6
-echo "configure:3653: checking for strftime" >&5
+echo "configure:3659: checking for strftime" >&5
if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3658 "configure"
+#line 3664 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strftime(); below. */
@@ -3677,7 +3683,7 @@ strftime();
; return 0; }
EOF
-if { (eval echo configure:3681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_strftime=yes"
else
@@ -3699,7 +3705,7 @@ else
echo "$ac_t""no" 1>&6
# strftime is in -lintl on SCO UNIX.
echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
-echo "configure:3703: checking for strftime in -lintl" >&5
+echo "configure:3709: checking for strftime in -lintl" >&5
ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3707,7 +3713,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3711 "configure"
+#line 3717 "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
@@ -3718,7 +3724,7 @@ int main() {
strftime()
; return 0; }
EOF
-if { (eval echo configure:3722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3728: \"$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
@@ -3745,7 +3751,7 @@ fi
fi
echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-echo "configure:3749: checking for wait3 that fills in rusage" >&5
+echo "configure:3755: checking for wait3 that fills in rusage" >&5
if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3753,7 +3759,7 @@ else
ac_cv_func_wait3_rusage=no
else
cat > conftest.$ac_ext <<EOF
-#line 3757 "configure"
+#line 3763 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -3784,7 +3790,7 @@ main() {
}
}
EOF
-if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_wait3_rusage=yes
else
@@ -3807,7 +3813,7 @@ EOF
fi
echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:3811: checking whether setpgrp takes no argument" >&5
+echo "configure:3817: checking whether setpgrp takes no argument" >&5
if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3815,7 +3821,7 @@ else
{ echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3819 "configure"
+#line 3825 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
@@ -3835,7 +3841,7 @@ main()
}
EOF
-if { (eval echo configure:3839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_setpgrp_void=no
else
@@ -3860,16 +3866,16 @@ fi
echo $ac_n "checking for sys_errlist""... $ac_c" 1>&6
-echo "configure:3864: checking for sys_errlist" >&5
+echo "configure:3870: checking for sys_errlist" >&5
cat > conftest.$ac_ext <<EOF
-#line 3866 "configure"
+#line 3872 "configure"
#include "confdefs.h"
extern char *sys_errlist[];
int main() {
printf(sys_errlist[0]);
; return 0; }
EOF
-if { (eval echo configure:3873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_sys_errlist="yes"; cat >> confdefs.h <<\EOF
#define HAVE_SYS_ERRLIST 1
@@ -3885,9 +3891,9 @@ rm -f conftest*
echo "$ac_t""$have_sys_errlist" 1>&6
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:3889: checking for sigsetjmp" >&5
+echo "configure:3895: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <<EOF
-#line 3891 "configure"
+#line 3897 "configure"
#include "confdefs.h"
#include <setjmp.h>
int main() {
@@ -3895,7 +3901,7 @@ int main() {
if (sigsetjmp(env, 1) != 0) { exit(0); } siglongjmp(env, 1);
; return 0; }
EOF
-if { (eval echo configure:3899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_sigsetjmp="yes"; cat >> confdefs.h <<\EOF
#define HAVE_SIGSETJMP 1
@@ -3910,12 +3916,12 @@ fi
rm -f conftest*
echo "$ac_t""$have_sigsetjmp" 1>&6
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3914: checking return type of signal handlers" >&5
+echo "configure:3920: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3919 "configure"
+#line 3925 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -3932,7 +3938,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:3936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else