commit 99b8ab480c05f159cc7ba01ad9d1388ca868d053
parent 483ac295bc7b17b66cf5aacc48445b80685bff5c
Author: ukai <ukai>
Date: Mon, 10 Mar 2003 16:04:09 +0000
[w3m-dev 03801] fix autoconf
* acinclude.m4 (AC_W3M_BG_COLOR): fix typo
(AC_W3M_KANJI_SYMBOLS): check enable_japanese != 'no'
(AC_W3M_KEYMAP): needs {}
(AC_W3M_EXTLIBS): don't modify libdir, use extlibdir
(AC_W3M_SSL): missing x
(AC_W3M_IMAGE): add AC_DEFINE(USE_IMAGE)
* config.h.in: s/USE_KANJI_SYMBOLS/KANJI_SYMBOLS/
add SIZEOF_LONG_LONG
don't use //, use /* */
* configure.in: add AC_CHECK_SIZEOF(long long, 0)
From: Yuji Abe <cbo46560@pop12.odn.ne.jp>
Diffstat:
6 files changed, 169 insertions(+), 103 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,20 @@
+2003-03-11 Yuji Abe <cbo46560@pop12.odn.ne.jp>
+
+ * [w3m-dev 03801] fix autoconf
+ * acinclude.m4 (AC_W3M_BG_COLOR): fix typo
+ (AC_W3M_KANJI_SYMBOLS): check enable_japanese != 'no'
+ (AC_W3M_KEYMAP): needs {}
+ (AC_W3M_EXTLIBS): don't modify libdir, use extlibdir
+ (AC_W3M_SSL): missing x
+ (AC_W3M_IMAGE): add AC_DEFINE(USE_IMAGE)
+ * config.h.in: s/USE_KANJI_SYMBOLS/KANJI_SYMBOLS/
+ add SIZEOF_LONG_LONG
+ don't use //, use /* */
+ * configure.in: add AC_CHECK_SIZEOF(long long, 0)
+
2003-03-10 Fumitoshi UKAI <ukai@debian.or.jp>
- * autoconficate
+ * autoconfiscate
* Makefile.in: added
* acinclude.m4: added
* aclocal.m4: added (generated from acinclude.m4 by aclocal)
diff --git a/acinclude.m4 b/acinclude.m4
@@ -84,7 +84,7 @@ AC_MSG_CHECKING(if background color support is enabled)
AC_ARG_ENABLE(bgcolor,
[ --enable-bgcolor enable to set background color],,
[enable_bgcolor="no"])
- test x$enable_ansi_color = xyes && AC_DEFINE(USE_ANSI_COLOR)
+ test x$enable_bgcolor = xyes && AC_DEFINE(USE_BG_COLOR)
AC_MSG_RESULT($enable_bgcolor)])
#
# ----------------------------------------------------------------
@@ -269,7 +269,7 @@ AC_DEFINE_UNQUOTED(W3M_LANG,$W3M_LANG)])
# ----------------------------------------------------------------
AC_DEFUN([AC_W3M_KANJI_SYMBOLS],
[AC_SUBST(KANJI_SYMBOLS)
-if test x$enable_japanese = xyes; then
+if test x$enable_japanese != xno; then
AC_MSG_CHECKING(if --enable-kanjisymbols option specified)
AC_ARG_ENABLE(kanjisymbols,
[ --enable-kanjisymbols use kanji symbols],
@@ -297,7 +297,7 @@ AC_DEFUN([AC_W3M_KEYMAP],
KEYMAP_FILE="keybind"
fi
AC_SUBST(HELP_FILE)
- HELP_FILE=w3mhelp-$w3m_keybind_$w3m_lang.html
+ HELP_FILE=w3mhelp-${w3m_keybind}_$w3m_lang.html
AC_DEFINE_UNQUOTED(HELP_FILE, "$HELP_FILE")
AC_SUBST(KEYBIND)
AC_DEFINE_UNQUOTED(KEYBIND, $w3m_keybind)])
@@ -474,11 +474,11 @@ AC_DEFUN([AC_W3M_EXTLIBS],
[lib=$1
AC_MSG_CHECKING(for -l$lib)
extlib="not found"
- for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
+ for extlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
do
- if test -f $libdir/lib$lib.a -o -f $libdir/lib$lib.so ; then
+ if test -f $extlibdir/lib$lib.a -o -f $extlibdir/lib$lib.so ; then
LIBS="$LIBS -l$lib"
- extlib="found at $libdir"
+ extlib="found at $extlibdir"
break
fi
done
@@ -544,7 +544,7 @@ AC_ARG_WITH(ssl,
[ --with-ssl=PATH support https protocol],,
[with_ssl="no"])
AC_MSG_RESULT($with_ssl)
-if test "${with_ssl+set}" = xset; then
+if test x"${with_ssl+set}" = xset; then
AC_DEFINE(USE_SSL)
AC_MSG_CHECKING(for SSL library/header)
test -d $with_ssl || $with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
@@ -659,6 +659,7 @@ AC_DEFUN([AC_W3M_IMAGE],
done
IFS="$save_ifs"
enable_image=yes
+ AC_DEFINE(USE_IMAGE)
if test x$IMLIB_CONFIG = x; then
IMLIB_CONFIG=imlib-config
fi
diff --git a/aclocal.m4 b/aclocal.m4
@@ -96,7 +96,7 @@ AC_MSG_CHECKING(if background color support is enabled)
AC_ARG_ENABLE(bgcolor,
[ --enable-bgcolor enable to set background color],,
[enable_bgcolor="no"])
- test x$enable_ansi_color = xyes && AC_DEFINE(USE_ANSI_COLOR)
+ test x$enable_bgcolor = xyes && AC_DEFINE(USE_BG_COLOR)
AC_MSG_RESULT($enable_bgcolor)])
#
# ----------------------------------------------------------------
@@ -281,7 +281,7 @@ AC_DEFINE_UNQUOTED(W3M_LANG,$W3M_LANG)])
# ----------------------------------------------------------------
AC_DEFUN([AC_W3M_KANJI_SYMBOLS],
[AC_SUBST(KANJI_SYMBOLS)
-if test x$enable_japanese = xyes; then
+if test x$enable_japanese != xno; then
AC_MSG_CHECKING(if --enable-kanjisymbols option specified)
AC_ARG_ENABLE(kanjisymbols,
[ --enable-kanjisymbols use kanji symbols],
@@ -309,7 +309,7 @@ AC_DEFUN([AC_W3M_KEYMAP],
KEYMAP_FILE="keybind"
fi
AC_SUBST(HELP_FILE)
- HELP_FILE=w3mhelp-$w3m_keybind_$w3m_lang.html
+ HELP_FILE=w3mhelp-${w3m_keybind}_$w3m_lang.html
AC_DEFINE_UNQUOTED(HELP_FILE, "$HELP_FILE")
AC_SUBST(KEYBIND)
AC_DEFINE_UNQUOTED(KEYBIND, $w3m_keybind)])
@@ -486,11 +486,11 @@ AC_DEFUN([AC_W3M_EXTLIBS],
[lib=$1
AC_MSG_CHECKING(for -l$lib)
extlib="not found"
- for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
+ for extlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
do
- if test -f $libdir/lib$lib.a -o -f $libdir/lib$lib.so ; then
+ if test -f $extlibdir/lib$lib.a -o -f $extlibdir/lib$lib.so ; then
LIBS="$LIBS -l$lib"
- extlib="found at $libdir"
+ extlib="found at $extlibdir"
break
fi
done
@@ -556,7 +556,7 @@ AC_ARG_WITH(ssl,
[ --with-ssl=PATH support https protocol],,
[with_ssl="no"])
AC_MSG_RESULT($with_ssl)
-if test "${with_ssl+set}" = xset; then
+if test x"${with_ssl+set}" = xset; then
AC_DEFINE(USE_SSL)
AC_MSG_CHECKING(for SSL library/header)
test -d $with_ssl || $with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
@@ -671,6 +671,7 @@ AC_DEFUN([AC_W3M_IMAGE],
done
IFS="$save_ifs"
enable_image=yes
+ AC_DEFINE(USE_IMAGE)
if test x$IMLIB_CONFIG = x; then
IMLIB_CONFIG=imlib-config
fi
diff --git a/config.h.in b/config.h.in
@@ -37,7 +37,7 @@
#define SYSTEM_CODE '@SYSTEM_CODE@'
#define W3M_LANG @W3M_LANG@
#define LANG W3M_LANG
-#undef USE_KANJI_SYMBOLS
+#undef KANJI_SYMBOLS
#undef USE_COLOR
#undef USE_ANSI_COLOR
#undef USE_BG_COLOR
@@ -103,7 +103,12 @@
#undef HAVE_TERMIO_H
#undef HAVE_SGTTY_H
#undef HAVE_DIRENT_H
+#define SIZEOF_LONG_LONG 8
+#if SIZEOF_LONG_LONG > 0
typedef long long clen_t;
+#else
+typedef long clen_t;
+#endif
#undef HAVE_STRTOLL
#undef HAVE_STROQ
#undef HAVE_ATOLL
@@ -144,8 +149,8 @@ typedef long long clen_t;
#define RETSIGTYPE @RETSIGTYPE@
typedef RETSIGTYPE MySignalHandler;
-#define SIGNAL_ARG int _dummy // XXX
-#define SIGNAL_ARGLIST 0 // XXX
+#define SIGNAL_ARG int _dummy /* XXX */
+#define SIGNAL_ARGLIST 0 /* XXX */
#define SIGNAL_RETURN @SIGNAL_RETURN@
#ifdef HAVE_SIGSETJMP
diff --git a/configure b/configure
@@ -1354,7 +1354,7 @@ cat >> confdefs.h <<EOF
EOF
-if test x$enable_japanese = xyes; then
+if test x$enable_japanese != xno; then
echo $ac_n "checking if --enable-kanjisymbols option specified""... $ac_c" 1>&6
echo "configure:1360: checking if --enable-kanjisymbols option specified" >&5
# Check whether --enable-kanjisymbols or --disable-kanjisymbols was given.
@@ -1414,8 +1414,8 @@ else
enable_bgcolor="no"
fi
- test x$enable_ansi_color = xyes && cat >> confdefs.h <<\EOF
-#define USE_ANSI_COLOR 1
+ test x$enable_bgcolor = xyes && cat >> confdefs.h <<\EOF
+#define USE_BG_COLOR 1
EOF
echo "$ac_t""$enable_bgcolor" 1>&6
@@ -1739,7 +1739,7 @@ fi
KEYMAP_FILE="keybind"
fi
- HELP_FILE=w3mhelp-$w3m_keybind_$w3m_lang.html
+ HELP_FILE=w3mhelp-${w3m_keybind}_$w3m_lang.html
cat >> confdefs.h <<EOF
#define HELP_FILE "$HELP_FILE"
EOF
@@ -1851,11 +1851,11 @@ do
echo $ac_n "checking for -l$lib""... $ac_c" 1>&6
echo "configure:1853: checking for -l$lib" >&5
extlib="not found"
- for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
+ for extlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
do
- if test -f $libdir/lib$lib.a -o -f $libdir/lib$lib.so ; then
+ if test -f $extlibdir/lib$lib.a -o -f $extlibdir/lib$lib.so ; then
LIBS="$LIBS -l$lib"
- extlib="found at $libdir"
+ extlib="found at $extlibdir"
break
fi
done
@@ -2678,6 +2678,10 @@ EOF
done
IFS="$save_ifs"
enable_image=yes
+ cat >> confdefs.h <<\EOF
+#define USE_IMAGE 1
+EOF
+
if test x$IMLIB_CONFIG = x; then
IMLIB_CONFIG=imlib-config
fi
@@ -2818,7 +2822,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:2822: checking if xface is enabled" >&5
+echo "configure:2826: 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"
@@ -2836,7 +2840,7 @@ fi
echo $ac_n "checking if SSL is suported""... $ac_c" 1>&6
-echo "configure:2840: checking if SSL is suported" >&5
+echo "configure:2844: 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"
@@ -2846,13 +2850,13 @@ else
fi
echo "$ac_t""$with_ssl" 1>&6
-if test "${with_ssl+set}" = xset; then
+if test x"${with_ssl+set}" = xset; then
cat >> confdefs.h <<\EOF
#define USE_SSL 1
EOF
echo $ac_n "checking for SSL library/header""... $ac_c" 1>&6
-echo "configure:2856: checking for SSL library/header" >&5
+echo "configure:2860: 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
@@ -2866,7 +2870,7 @@ echo "configure:2856: checking for SSL library/header" >&5
fi
done
echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
-echo "configure:2870: checking for SSL_new in -lssl" >&5
+echo "configure:2874: 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
@@ -2874,7 +2878,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl -lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2878 "configure"
+#line 2882 "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
@@ -2885,7 +2889,7 @@ int main() {
SSL_new()
; return 0; }
EOF
-if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2893: \"$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
@@ -2909,7 +2913,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:2913: checking if SSL certificate verify is enabled" >&5
+echo "configure:2917: 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"
@@ -2926,7 +2930,7 @@ EOF
fi
fi
echo $ac_n "checking if --enable-ipv6 option specified""... $ac_c" 1>&6
-echo "configure:2930: checking if --enable-ipv6 option specified" >&5
+echo "configure:2934: 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"
@@ -2939,15 +2943,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:2943: checking if IPv6 API available" >&5
+echo "configure:2947: checking if IPv6 API available" >&5
echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
-echo "configure:2946: checking for getaddrinfo" >&5
+echo "configure:2950: 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 2951 "configure"
+#line 2955 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getaddrinfo(); below. */
@@ -2970,7 +2974,7 @@ getaddrinfo();
; return 0; }
EOF
-if { (eval echo configure:2974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2978: \"$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
@@ -2995,7 +2999,7 @@ fi
if test x$enable_ipv6 = xno; then
echo $ac_n "checking for libinet6""... $ac_c" 1>&6
-echo "configure:2999: checking for libinet6" >&5
+echo "configure:3003: checking for libinet6" >&5
for libdir in /usr/local/v6/lib /usr/local/lib /usr/lib
do
if test -f $libdir/libinet6.a; then
@@ -3003,7 +3007,7 @@ echo "configure:2999: checking for libinet6" >&5
LIBS="$LIBS -L$libdir"
fi
echo $ac_n "checking for getaddrinfo in -linet6""... $ac_c" 1>&6
-echo "configure:3007: checking for getaddrinfo in -linet6" >&5
+echo "configure:3011: 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
@@ -3011,7 +3015,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-linet6 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3015 "configure"
+#line 3019 "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
@@ -3022,7 +3026,7 @@ int main() {
getaddrinfo()
; return 0; }
EOF
-if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3030: \"$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
@@ -3049,7 +3053,7 @@ fi
fi
fi
echo $ac_n "checking for zError in -lz""... $ac_c" 1>&6
-echo "configure:3053: checking for zError in -lz" >&5
+echo "configure:3057: 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
@@ -3057,7 +3061,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3061 "configure"
+#line 3065 "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
@@ -3068,7 +3072,7 @@ int main() {
zError()
; return 0; }
EOF
-if { (eval echo configure:3072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3076: \"$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
@@ -3107,12 +3111,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:3111: checking for $ac_hdr that defines DIR" >&5
+echo "configure:3115: 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 3116 "configure"
+#line 3120 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -3120,7 +3124,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -3145,7 +3149,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:3149: checking for opendir in -ldir" >&5
+echo "configure:3153: 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
@@ -3153,7 +3157,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3157 "configure"
+#line 3161 "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
@@ -3164,7 +3168,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:3168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3172: \"$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
@@ -3186,7 +3190,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:3190: checking for opendir in -lx" >&5
+echo "configure:3194: 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
@@ -3194,7 +3198,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3198 "configure"
+#line 3202 "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
@@ -3205,7 +3209,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:3209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3213: \"$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
@@ -3228,12 +3232,12 @@ fi
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3232: checking for ANSI C header files" >&5
+echo "configure:3236: 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 3237 "configure"
+#line 3241 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -3241,7 +3245,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3249: \"$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*
@@ -3258,7 +3262,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 3262 "configure"
+#line 3266 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -3276,7 +3280,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 3280 "configure"
+#line 3284 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -3297,7 +3301,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 3301 "configure"
+#line 3305 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3308,7 +3312,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:3312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -3332,12 +3336,12 @@ EOF
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3336: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3340: 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 3341 "configure"
+#line 3345 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -3353,7 +3357,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:3357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -3375,17 +3379,17 @@ fi
ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:3379: checking for termios.h" >&5
+echo "configure:3383: 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 3384 "configure"
+#line 3388 "configure"
#include "confdefs.h"
#include <termios.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3393: \"$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*
@@ -3409,17 +3413,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:3413: checking for termio.h" >&5
+echo "configure:3417: 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 3418 "configure"
+#line 3422 "configure"
#include "confdefs.h"
#include <termio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3427: \"$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*
@@ -3443,17 +3447,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:3447: checking for sgtty.h" >&5
+echo "configure:3451: 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 3452 "configure"
+#line 3456 "configure"
#include "confdefs.h"
#include <sgtty.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3461: \"$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*
@@ -3483,17 +3487,17 @@ fi
ac_safe=`echo "float.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for float.h""... $ac_c" 1>&6
-echo "configure:3487: checking for float.h" >&5
+echo "configure:3491: 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 3492 "configure"
+#line 3496 "configure"
#include "confdefs.h"
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3501: \"$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*
@@ -3516,17 +3520,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:3520: checking for sys/select.h" >&5
+echo "configure:3524: 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 3525 "configure"
+#line 3529 "configure"
#include "confdefs.h"
#include <sys/select.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3534: \"$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*
@@ -3548,16 +3552,56 @@ else
fi
+echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:3557: 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
+ if test "$cross_compiling" = yes; then
+ ac_cv_sizeof_long_long=0
+else
+ cat > conftest.$ac_ext <<EOF
+#line 3565 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+ fprintf(f, "%d\n", sizeof(long long));
+ 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
+then
+ ac_cv_sizeof_long_long=`cat conftestval`
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ac_cv_sizeof_long_long=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+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:3556: checking for $ac_func" >&5
+echo "configure:3600: 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 3561 "configure"
+#line 3605 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3580,7 +3624,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3628: \"$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
@@ -3605,12 +3649,12 @@ fi
done
echo $ac_n "checking for strftime""... $ac_c" 1>&6
-echo "configure:3609: checking for strftime" >&5
+echo "configure:3653: 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 3614 "configure"
+#line 3658 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strftime(); below. */
@@ -3633,7 +3677,7 @@ strftime();
; return 0; }
EOF
-if { (eval echo configure:3637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3681: \"$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
@@ -3655,7 +3699,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:3659: checking for strftime in -lintl" >&5
+echo "configure:3703: 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
@@ -3663,7 +3707,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3667 "configure"
+#line 3711 "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
@@ -3674,7 +3718,7 @@ int main() {
strftime()
; return 0; }
EOF
-if { (eval echo configure:3678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3722: \"$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
@@ -3701,7 +3745,7 @@ fi
fi
echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-echo "configure:3705: checking for wait3 that fills in rusage" >&5
+echo "configure:3749: 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
@@ -3709,7 +3753,7 @@ else
ac_cv_func_wait3_rusage=no
else
cat > conftest.$ac_ext <<EOF
-#line 3713 "configure"
+#line 3757 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -3740,7 +3784,7 @@ main() {
}
}
EOF
-if { (eval echo configure:3744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3788: \"$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
@@ -3763,7 +3807,7 @@ EOF
fi
echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:3767: checking whether setpgrp takes no argument" >&5
+echo "configure:3811: 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
@@ -3771,7 +3815,7 @@ else
{ echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3775 "configure"
+#line 3819 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
@@ -3791,7 +3835,7 @@ main()
}
EOF
-if { (eval echo configure:3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3839: \"$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
@@ -3816,16 +3860,16 @@ fi
echo $ac_n "checking for sys_errlist""... $ac_c" 1>&6
-echo "configure:3820: checking for sys_errlist" >&5
+echo "configure:3864: checking for sys_errlist" >&5
cat > conftest.$ac_ext <<EOF
-#line 3822 "configure"
+#line 3866 "configure"
#include "confdefs.h"
extern char *sys_errlist[];
int main() {
printf(sys_errlist[0]);
; return 0; }
EOF
-if { (eval echo configure:3829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3873: \"$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
@@ -3841,9 +3885,9 @@ rm -f conftest*
echo "$ac_t""$have_sys_errlist" 1>&6
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:3845: checking for sigsetjmp" >&5
+echo "configure:3889: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <<EOF
-#line 3847 "configure"
+#line 3891 "configure"
#include "confdefs.h"
#include <setjmp.h>
int main() {
@@ -3851,7 +3895,7 @@ int main() {
if (sigsetjmp(env, 1) != 0) { exit(0); } siglongjmp(env, 1);
; return 0; }
EOF
-if { (eval echo configure:3855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_sigsetjmp="yes"; cat >> confdefs.h <<\EOF
#define HAVE_SIGSETJMP 1
@@ -3866,12 +3910,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:3870: checking return type of signal handlers" >&5
+echo "configure:3914: 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 3875 "configure"
+#line 3919 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -3888,7 +3932,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:3892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
diff --git a/configure.in b/configure.in
@@ -118,6 +118,7 @@ dnl AC_TYPE_PID_T
dnl AC_TYPE_SIZE_T
dnl AC_HEADER_TIME
dnl AC_STRUCT_TM
+AC_CHECK_SIZEOF(long long, 0)
dnl Checks for library functions.
dnl AC_FUNC_ALLOCA
