Skip to content

Instantly share code, notes, and snippets.

@ncopa

ncopa/ncftp.diff

Created March 27, 2017 19:32
Show Gist options
  • Save ncopa/83233e841957e9f9324960f65fcc8a38 to your computer and use it in GitHub Desktop.
Save ncopa/83233e841957e9f9324960f65fcc8a38 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
ncftp.diff
--- a/ncftp-3.2.6/Strn/DStrInternal.h
+++ b/ncftp-3.2.6/Strn/DStrInternal.h
@@ -1,7 +1,7 @@
/* DStrInternal.h */
-#ifndef _DStrInternal_h_
-#define _DStrInternal_h_ 1
+#ifndef DStrInternal_h
+#define DStrInternal_h 1
#ifdef __cplusplus
extern "C"
--- a/ncftp-3.2.6/Strn/Strn.h
+++ b/ncftp-3.2.6/Strn/Strn.h
@@ -54,7 +54,7 @@
char *Strncat_NoZeroPad(char *const, const char *const, const size_t);
char *Strncpy_NoZeroPad(char *const, const char *const, const size_t);
-#ifndef _DStrInternal_h_
+#ifndef DStrInternal_h
typedef struct DStr {
/* All of these structure fields are read-only; do not modify
* them directly.
--- a/ncftp-3.2.6/autoconf_local/acconfig.h
+++ b/ncftp-3.2.6/autoconf_local/acconfig.h
@@ -258,6 +258,9 @@
/* Define to `int' if <sys/types.h> doesn't define. */
#undef mode_t
+/* Define this because you definitely don't have it. Used only for testing configure. */
+#undef negative_control_t
+
/* Define if you don't have <dirent.h>, but have <ndir.h>. */
#undef NDIR
@@ -335,6 +338,8 @@
/* Format string for the scanf() family for 64 bit integers. */
#undef SCANF_LONG_LONG
+#undef sa_family_t
+
/* Define if scanning a "long long" with "%lld" works. */
#undef SCANF_LONG_LONG_LLD
@@ -404,6 +409,9 @@
#undef sockopt_size_t
#undef SPRINTF_RETURNS_PTR
+
+/* Define to `long' if <sys/types.h> doesn't define. */
+#undef ssize_t
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
--- a/ncftp-3.2.6/autoconf_local/aclocal.m4
+++ b/ncftp-3.2.6/autoconf_local/aclocal.m4
@@ -272,10 +272,11 @@
dnl
AC_DEFUN(wi_EXTRA_IDIR, [
incdir="$1"
-if test -r $incdir ; then
+echo "wi_extra_idir $incdir" 1>&5
+if test -r "$incdir" ; then
case "$CPPFLAGS" in
*${incdir}*)
- # echo " + already had $incdir" 1>&6
+ echo " + already had $incdir" 1>&5
;;
*)
if test "$CPPFLAGS" = "" ; then
@@ -283,7 +284,7 @@
else
CPPFLAGS="$CPPFLAGS -I$incdir"
fi
- echo " + found $incdir" 1>&6
+ echo " + found $incdir" 1>&5
;;
esac
fi
@@ -294,10 +295,11 @@
dnl
AC_DEFUN(wi_EXTRA_LDIR, [
libdir="$1"
-if test -r $libdir ; then
+echo "wi_extra_ldir $libdir" 1>&5
+if test -r "$libdir" ; then
case "$LDFLAGS" in
*${libdir}*)
- # echo " + already had $libdir" 1>&6
+ echo " + already had $libdir" 1>&5
;;
*)
if test "$LDFLAGS" = "" ; then
@@ -305,7 +307,7 @@
else
LDFLAGS="$LDFLAGS -L$libdir"
fi
- echo " + found $libdir" 1>&6
+ echo " + found $libdir" 1>&5
;;
esac
fi
@@ -679,8 +681,28 @@
;;
esac
+CC_is_clang="no"
+case "$CC" in
+ *clang*)
+ CC_is_clang="yes"
+ ;;
+ *)
+ cc_dash_v=`${CC-gcc} -v 2>&1 | grep clang 2>/dev/null`
+ if test -n "$cc_dash_v" ; then
+ CC_is_clang="yes"
+ fi
+ ;;
+esac
+
if test "$wi_os_default_cflags" = yes ; then
- if test "$GCC" = yes ; then
+ if test "$CC_is_clang" = yes ; then
+ wi_os_default_cflags="-Weverything -Wno-unknown-warning-option -Wno-disabled-macro-expansion -Wno-missing-variable-declarations -Wno-date-time"
+ if test "$wi_replace_O_with_g" = yes ; then
+ wi_os_default_cflags="-g $wi_os_default_cflags"
+ else
+ wi_os_default_cflags="-O2 $wi_os_default_cflags"
+ fi
+ elif test "$GCC" = yes ; then
#
# gcc
#
@@ -689,7 +711,7 @@
2.7.*|2.8.*|2.9*)
wi_os_default_cflags="-W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wbad-function-cast -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-declarations -Winline"
;;
- 3.*)
+ [345].*)
wi_os_default_cflags="-W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wbad-function-cast -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-declarations -Winline -Wmissing-format-attribute -Wformat-security"
wi_gcc_optimizer_flags='-Wdisabled-optimization'
;;
@@ -1124,6 +1146,41 @@
dnl
dnl
dnl
+AC_DEFUN(wi_PROG_CC, [
+ if test "x$had_CC" = "x" ; then
+ AC_MSG_CHECKING([for CC environment variable])
+ AC_MSG_RESULT(["${CC-no}"])
+ fi
+
+ AC_MSG_CHECKING([for clang C compiler])
+ CLANG_CC=`which "clang" 2>/dev/null`
+ old_CC="$CC"
+ CC="$CLANG_CC"
+ AC_TRY_COMPILE([#include <stdlib.h>],[extern void exit(int status);],[
+ AC_MSG_RESULT(["$CLANG_CC"])
+ ],[
+ AC_MSG_RESULT(["no"])
+ unset CLANG_CC
+ ])
+ CC="$old_CC"; unset old_CC
+
+ AC_MSG_CHECKING([if CC should now be set])
+ if test "x$CC" = "x" ; then
+ if test "x$CLANG_CC" != "x" ; then
+ CC="$CLANG_CC"
+ export CC
+ AC_MSG_RESULT(["$CC"])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ else
+ AC_MSG_RESULT([no])
+ fi
+ AC_PROG_CC
+])
+dnl
+dnl
+dnl
AC_DEFUN(wi_CFLAGS, [AC_REQUIRE([AC_PROG_CC])
wi_PROG_GCC_VERSION
AC_REQUIRE_CPP()
@@ -1222,9 +1279,11 @@
AC_DEFUN(wi_ENV_VAR_MESSAGES, [
AC_MSG_CHECKING([if you set and exported the environment variable CC])
if test "x$CC" = x ; then
- AC_MSG_RESULT([no (you may want to do that since configure scripts look for gcc first)])
+ AC_MSG_RESULT([no (configure will try to locate a suitable C compiler)])
+ had_CC="no"
else
AC_MSG_RESULT($CC)
+ had_CC="yes"
fi
AC_MSG_CHECKING([for environment variable CFLAGS])
if test "x$CFLAGS" = x ; then
@@ -4119,6 +4178,33 @@
dnl
dnl
dnl
+dnl wi_CHECK_TYPE(TYPE, DEFAULT, INCLUDES)
+AC_DEFUN(wi_CHECK_TYPE,
+[AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL(ac_cv_type_$1,
+[AC_EGREP_CPP(dnl
+changequote(<<,>>)dnl
+<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
+changequote([,]), [
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+$3], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
+AC_MSG_RESULT($ac_cv_type_$1)
+if test $ac_cv_type_$1 = no; then
+ AC_DEFINE($1, $2)
+fi
+])
+dnl
+dnl
+dnl
+dnl
AC_DEFUN(wi_UNISTD_FUNC_PARAM_TYPES, [
AC_REQUIRE([AC_PROG_CPP])
AC_REQUIRE([wi_PATH_PERL])
@@ -5553,15 +5639,17 @@
wi_CFLAGS_TO_ADD_LATER=""
changequote(!@, @!)dnl
if [ -x "$HOME/bin/OS" ] ; then
- HOME_OS=`$HOME/bin/OS`
+ HOME_OS=`$HOME/bin/OS 2>/dev/null`
HOME_OS="$HOME/$HOME_OS"
+else
+ HOME_OS="$HOME"
fi
host=`uname -n 2>/dev/null | tr '[A-Z]' '[a-z]'`
os=`uname -s 2>/dev/null | tr '[A-Z]' '[a-z]'`
if [ "$os" = "TvoPT" ] ; then os="sunos" ; fi
dnl work around inability to use $1
-os_v=`uname -v 2>/dev/null | sed 's/^[^0-9.]*//;s/[^0-9.].*$//;' | awk '-F[-/: ]' '{n = 1; print $n; }'`
-os_r=`uname -r 2>/dev/null | sed 's/^[^0-9.]*//;s/[^0-9.].*$//;' | awk '-F[-/: ]' '{n = 1; print $n; }'`
+os_v=`uname -v 2>/dev/null | sed 's/^[^0-9.]*//;s/[^0-9.].*$//;'`
+os_r=`uname -r 2>/dev/null | sed 's/^[^0-9.]*//;s/[^0-9.].*$//;'`
os_r1=`echo "${os_r}" | cut -c1`
arch=`uname -m 2>/dev/null | tr '[A-Z]' '[a-z]'`
archp=`uname -p 2>/dev/null | tr '[A-Z]' '[a-z]'`
@@ -5709,6 +5797,7 @@
esac
libc=""
+ [ -z "$os_r" ] && os_r="2.2.26"
os_r1=`echo "$os_r" | cut -d. -f1`
os_r2=`echo "$os_r" | cut -d. -f2`
os_r3=`echo "$os_r" | cut -d- -f1 | cut -d. -f3`
@@ -5991,6 +6080,9 @@
fi
wi_cv_OS="$OS"
+if test "x$HOME_OS" = "x" && test "x$OS" != "x" ; then
+ HOME_OS="$HOME/$OS"
+fi
AC_SUBST(NDEFS)
AC_SUBST(OS)
AC_SUBST(host)
--- a/ncftp-3.2.6/config.h.in
+++ b/ncftp-3.2.6/config.h.in
@@ -93,6 +93,9 @@
/* Define to `int' if <sys/types.h> doesn't define. */
#undef mode_t
+/* Define this because you definitely don't have it. Used only for testing configure. */
+#undef negative_control_t
+
/* Define if optind, optarg, etc., need to be declared as extern. */
#undef NEED_GETOPT_EXTERN_DECLS
@@ -133,6 +136,8 @@
/* Format string for the scanf() family for 64 bit integers. */
#undef SCANF_LONG_LONG
+#undef sa_family_t
+
/* Define if scanning a "long long" with "%lld" works. */
#undef SCANF_LONG_LONG_LLD
@@ -192,6 +197,9 @@
#undef SOCKS
#undef sockopt_size_t
+
+/* Define to `long' if <sys/types.h> doesn't define. */
+#undef ssize_t
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
--- a/ncftp-3.2.6/configure
+++ b/ncftp-3.2.6/configure
@@ -638,42 +638,319 @@
echo $ac_n "checking if you set and exported the environment variable CC""... $ac_c" 1>&6
echo "configure:640: checking if you set and exported the environment variable CC" >&5
if test "x$CC" = x ; then
- echo "$ac_t""no (you may want to do that since configure scripts look for gcc first)" 1>&6
+ echo "$ac_t""no (configure will try to locate a suitable C compiler)" 1>&6
+ had_CC="no"
else
echo "$ac_t""$CC" 1>&6
+ had_CC="yes"
fi
echo $ac_n "checking for environment variable CFLAGS""... $ac_c" 1>&6
-echo "configure:647: checking for environment variable CFLAGS" >&5
+echo "configure:649: checking for environment variable CFLAGS" >&5
if test "x$CFLAGS" = x ; then
echo "$ac_t""no (we will choose a default set for you)" 1>&6
else
echo "$ac_t""$CFLAGS" 1>&6
fi
echo $ac_n "checking for environment variable CPPFLAGS""... $ac_c" 1>&6
-echo "configure:654: checking for environment variable CPPFLAGS" >&5
+echo "configure:656: checking for environment variable CPPFLAGS" >&5
echo "$ac_t""${CPPFLAGS-no}" 1>&6
echo $ac_n "checking for environment variable LDFLAGS""... $ac_c" 1>&6
-echo "configure:657: checking for environment variable LDFLAGS" >&5
+echo "configure:659: checking for environment variable LDFLAGS" >&5
echo "$ac_t""${LDFLAGS-no}" 1>&6
echo $ac_n "checking for environment variable LIBS""... $ac_c" 1>&6
-echo "configure:660: checking for environment variable LIBS" >&5
+echo "configure:662: checking for environment variable LIBS" >&5
echo "$ac_t""${LIBS-no}" 1>&6
+ if test "x$had_CC" = "x" ; then
+ echo $ac_n "checking for CC environment variable""... $ac_c" 1>&6
+echo "configure:668: checking for CC environment variable" >&5
+ echo "$ac_t"""${CC-no}"" 1>&6
+ fi
+
+ echo $ac_n "checking for clang C compiler""... $ac_c" 1>&6
+echo "configure:673: checking for clang C compiler" >&5
+ CLANG_CC=`which "clang" 2>/dev/null`
+ old_CC="$CC"
+ CC="$CLANG_CC"
+ cat > conftest.$ac_ext <<EOF
+#line 678 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+int main() {
+extern void exit(int status);
+; return 0; }
+EOF
+if { (eval echo configure:685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ echo "$ac_t"""$CLANG_CC"" 1>&6
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ echo "$ac_t"""no"" 1>&6
+ unset CLANG_CC
+
+fi
+rm -rf conftest*
+ CC="$old_CC"; unset old_CC
+
+ echo $ac_n "checking if CC should now be set""... $ac_c" 1>&6
+echo "configure:703: checking if CC should now be set" >&5
+ if test "x$CC" = "x" ; then
+ if test "x$CLANG_CC" != "x" ; then
+ CC="$CLANG_CC"
+ export CC
+ echo "$ac_t"""$CC"" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:718: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_CC="gcc"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:748: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_prog_rejected=no
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# -gt 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ set dummy "$ac_dir/$ac_word" "$@"
+ shift
+ ac_cv_prog_CC="$@"
+ fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test -z "$CC"; then
+ case "`uname -s`" in
+ *win32* | *WIN32*)
+ # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:799: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_CC="cl"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+ ;;
+ esac
+ fi
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:831: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 842 "configure"
+#include "confdefs.h"
+
+main(){return(0);}
+EOF
+if { (eval echo configure:847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cc_works=yes
+ # If we can't run a trivial program, we are probably using a cross compiler.
+ if (./conftest; exit) 2>/dev/null; then
+ ac_cv_prog_cc_cross=no
+ else
+ ac_cv_prog_cc_cross=yes
+ fi
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+if test $ac_cv_prog_cc_works = no; then
+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:873: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:878: checking whether we are using GNU C" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.c <<EOF
+#ifdef __GNUC__
+ yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+else
+ ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+ GCC=yes
+else
+ GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:906: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+ ac_cv_prog_cc_g=yes
+else
+ ac_cv_prog_cc_g=no
+fi
+rm -rf conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+
+
+
#
# Take note if the user is or is not exporting a CFLAGS env var.
#
wi_orig_CFLAGS="$CFLAGS"
wi_CFLAGS_TO_ADD_LATER=""
if [ -x "$HOME/bin/OS" ] ; then
- HOME_OS=`$HOME/bin/OS`
+ HOME_OS=`$HOME/bin/OS 2>/dev/null`
HOME_OS="$HOME/$HOME_OS"
+else
+ HOME_OS="$HOME"
fi
host=`uname -n 2>/dev/null | tr '[A-Z]' '[a-z]'`
os=`uname -s 2>/dev/null | tr '[A-Z]' '[a-z]'`
if [ "$os" = "TvoPT" ] ; then os="sunos" ; fi
-os_v=`uname -v 2>/dev/null | sed 's/^[^0-9.]*//;s/[^0-9.].*$//;' | awk '-F[-/: ]' '{n = 1; print $n; }'`
-os_r=`uname -r 2>/dev/null | sed 's/^[^0-9.]*//;s/[^0-9.].*$//;' | awk '-F[-/: ]' '{n = 1; print $n; }'`
+os_v=`uname -v 2>/dev/null | sed 's/^[^0-9.]*//;s/[^0-9.].*$//;'`
+os_r=`uname -r 2>/dev/null | sed 's/^[^0-9.]*//;s/[^0-9.].*$//;'`
os_r1=`echo "${os_r}" | cut -c1`
arch=`uname -m 2>/dev/null | tr '[A-Z]' '[a-z]'`
archp=`uname -p 2>/dev/null | tr '[A-Z]' '[a-z]'`
@@ -821,6 +1098,7 @@
esac
libc=""
+ [ -z "$os_r" ] && os_r="2.2.26"
os_r1=`echo "$os_r" | cut -d. -f1`
os_r2=`echo "$os_r" | cut -d. -f2`
os_r3=`echo "$os_r" | cut -d- -f1 | cut -d. -f3`
@@ -878,22 +1156,22 @@
if test "$glibc_r1" = "" ; then glibc_r1=0 ; fi
if test "$glibc_r2" = "" ; then glibc_r2=0 ; fi
if test "$glibc_r3" = "" ; then glibc_r3=0 ; fi
- glibc_int=`expr "$glibc_r1" '*' 10000 + "$glibc_r2" '*' 1000 + "$glibc_r3"`
+ glibc_int=`expr "$glibc_r1" '*' 10000 + "$glibc_r2" '*' 100 + "$glibc_r3"`
NDEFS="$NDEFS -DLINUX_GLIBC=$glibc_int"
libc="glibc${glibc_r1}.${glibc_r2}"
OS="linux-$arch"
;;
*)
if test -f /lib/libc-2.1.3.so ; then
- NDEFS="$NDEFS -DLINUX_GLIBC=21003"
+ NDEFS="$NDEFS -DLINUX_GLIBC=20103"
libc="glibc2.1"
OS="linux-$arch"
elif test -f /lib/libc-2.1.2.so ; then
- NDEFS="$NDEFS -DLINUX_GLIBC=21002"
+ NDEFS="$NDEFS -DLINUX_GLIBC=20102"
libc="glibc2.1"
OS="linux-$arch"
elif test -f /lib/libc-2.1.1.so ; then
- NDEFS="$NDEFS -DLINUX_GLIBC=21001"
+ NDEFS="$NDEFS -DLINUX_GLIBC=20101"
libc="glibc2.1"
OS="linux-$arch"
elif test -f /lib/libc.so.6 ; then
@@ -1103,13 +1381,16 @@
fi
wi_cv_OS="$OS"
+if test "x$HOME_OS" = "x" && test "x$OS" != "x" ; then
+ HOME_OS="$HOME/$OS"
+fi
echo $ac_n "checking platform""... $ac_c" 1>&6
-echo "configure:1113: checking platform" >&5
+echo "configure:1394: checking platform" >&5
echo "$ac_t"""$OS"" 1>&6
@@ -1139,231 +1420,9 @@
ac_config_sub=$ac_aux_dir/config.sub
ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1146: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="gcc"
- break
- fi
- done
- IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1176: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_prog_rejected=no
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- break
- fi
- done
- IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# -gt 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- set dummy "$ac_dir/$ac_word" "$@"
- shift
- ac_cv_prog_CC="$@"
- fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
- if test -z "$CC"; then
- case "`uname -s`" in
- *win32* | *WIN32*)
- # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1227: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="cl"
- break
- fi
- done
- IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
- ;;
- esac
- fi
- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1259: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1270 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cc_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
- ac_cv_prog_cc_cross=no
- else
- ac_cv_prog_cc_cross=yes
- fi
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1301: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1306: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.c <<EOF
-#ifdef __GNUC__
- yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
-else
- ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
- GCC=yes
-else
- GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1334: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
- ac_cv_prog_cc_g=yes
-else
- ac_cv_prog_cc_g=no
-fi
-rm -rf conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-
-
echo $ac_n "checking if the C compiler can use precompiled headers""... $ac_c" 1>&6
-echo "configure:1367: checking if the C compiler can use precompiled headers" >&5
+echo "configure:1426: checking if the C compiler can use precompiled headers" >&5
if eval "test \"`echo '$''{'wi_cv_cc_precomp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1407,14 +1466,14 @@
#
echo "Successfully compiled pchtest.h into the precompiled header file pchtest.h.gch." >&5
cat > conftest.$ac_ext <<EOF
-#line 1411 "configure"
+#line 1470 "configure"
#include "confdefs.h"
#include "pchtest.h"
int main() {
if (FOOBAR == 33) exit(0)
; return 0; }
EOF
-if { (eval echo configure:1418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes" ; wi_cv_cc_precomp_type="gcc_gch_files"
else
@@ -1433,14 +1492,14 @@
${CC-cc} $CPPFLAGS -precomp pchtest.h -o pchtest.p >&5 2>&5
if test -s pchtest.p ; then
cat > conftest.$ac_ext <<EOF
-#line 1437 "configure"
+#line 1496 "configure"
#include "confdefs.h"
#include "pchtest.h"
int main() {
if (FOOBAR == 33) exit(0)
; return 0; }
EOF
-if { (eval echo configure:1444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes" ; wi_cv_cc_precomp_type="gcc_dash_precomp"
else
@@ -1518,7 +1577,7 @@
wi_request_no_y2k_warnings=yes
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1522: checking how to run the C preprocessor" >&5
+echo "configure:1581: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1533,13 +1592,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1537 "configure"
+#line 1596 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1602: \"$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
:
@@ -1550,13 +1609,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1554 "configure"
+#line 1613 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1619: \"$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
:
@@ -1567,13 +1626,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1571 "configure"
+#line 1630 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1636: \"$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
:
@@ -1631,7 +1690,7 @@
if test "$GCC" = yes ; then
echo $ac_n "checking the version of GCC""... $ac_c" 1>&6
-echo "configure:1635: checking the version of GCC" >&5
+echo "configure:1694: checking the version of GCC" >&5
if eval "test \"`echo '$''{'wi_cv_gcc_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1654,7 +1713,7 @@
wi_cv_sunwspro_cc_version2="0"
else
echo $ac_n "checking if the C compiler is Sun WorkShop C""... $ac_c" 1>&6
-echo "configure:1658: checking if the C compiler is Sun WorkShop C" >&5
+echo "configure:1717: checking if the C compiler is Sun WorkShop C" >&5
if eval "test \"`echo '$''{'wi_cv_cc_is_sunwspro_cc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1688,14 +1747,14 @@
echo "$ac_t""$wi_cv_cc_is_sunwspro_cc" 1>&6
if test "$wi_cv_cc_is_sunwspro_cc" = yes ; then
echo $ac_n "checking output of "cc -V" to determine version of Sun WorkShop C""... $ac_c" 1>&6
-echo "configure:1692: checking output of "cc -V" to determine version of Sun WorkShop C" >&5
+echo "configure:1751: checking output of "cc -V" to determine version of Sun WorkShop C" >&5
echo "$ac_t"""version $wi_cv_sunwspro_cc_version"" 1>&6
fi
fi
echo $ac_n "checking if we should customize your CFLAGS environment variable""... $ac_c" 1>&6
-echo "configure:1699: checking if we should customize your CFLAGS environment variable" >&5
+echo "configure:1758: checking if we should customize your CFLAGS environment variable" >&5
wi_replace_O_with_g="no"
case "$wi_orig_CFLAGS" in
"")
@@ -1755,8 +1814,28 @@
;;
esac
+CC_is_clang="no"
+case "$CC" in
+ *clang*)
+ CC_is_clang="yes"
+ ;;
+ *)
+ cc_dash_v=`${CC-gcc} -v 2>&1 | grep clang 2>/dev/null`
+ if test -n "$cc_dash_v" ; then
+ CC_is_clang="yes"
+ fi
+ ;;
+esac
+
if test "$wi_os_default_cflags" = yes ; then
- if test "$GCC" = yes ; then
+ if test "$CC_is_clang" = yes ; then
+ wi_os_default_cflags="-Weverything -Wno-unknown-warning-option -Wno-disabled-macro-expansion -Wno-missing-variable-declarations -Wno-date-time"
+ if test "$wi_replace_O_with_g" = yes ; then
+ wi_os_default_cflags="-g $wi_os_default_cflags"
+ else
+ wi_os_default_cflags="-O2 $wi_os_default_cflags"
+ fi
+ elif test "$GCC" = yes ; then
#
# gcc
#
@@ -1765,7 +1844,7 @@
2.7.*|2.8.*|2.9*)
wi_os_default_cflags="-W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wbad-function-cast -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-declarations -Winline"
;;
- 3.*)
+ 345.*)
wi_os_default_cflags="-W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wbad-function-cast -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-declarations -Winline -Wmissing-format-attribute -Wformat-security"
wi_gcc_optimizer_flags='-Wdisabled-optimization'
;;
@@ -1916,14 +1995,14 @@
# accepts this flag...
#
cat > conftest.$ac_ext <<EOF
-#line 1920 "configure"
+#line 1999 "configure"
#include "confdefs.h"
int main() {
int junk;
; return 0; }
EOF
-if { (eval echo configure:1927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -1941,7 +2020,7 @@
echo $ac_n "checking for ldd""... $ac_c" 1>&6
-echo "configure:1945: checking for ldd" >&5
+echo "configure:2024: checking for ldd" >&5
if eval "test \"`echo '$''{'wi_cv_prog_ldd'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1976,7 +2055,7 @@
# try these
CFLAGS="$CFLAGS $ac_cv_ssp_flags"
cat > conftest.$ac_ext <<EOF
-#line 1980 "configure"
+#line 2059 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -1988,7 +2067,7 @@
; return 0; }
EOF
-if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -2004,13 +2083,13 @@
fi
unset oldCFLAGS
echo $ac_n "checking if stack protection CFLAGS can be used""... $ac_c" 1>&6
-echo "configure:2008: checking if stack protection CFLAGS can be used" >&5
+echo "configure:2087: checking if stack protection CFLAGS can be used" >&5
echo "$ac_t""$ac_cv_ssp_flags" 1>&6
fi
echo $ac_n "checking if compiled programs use a shared library version of libgcc""... $ac_c" 1>&6
-echo "configure:2014: checking if compiled programs use a shared library version of libgcc" >&5
+echo "configure:2093: checking if compiled programs use a shared library version of libgcc" >&5
if eval "test \"`echo '$''{'wi_cv_shared_libgcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2049,7 +2128,7 @@
# accepts this flag...
#
cat > conftest.$ac_ext <<EOF
-#line 2053 "configure"
+#line 2132 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -2059,7 +2138,7 @@
strncpy(testvar, "hello world", sizeof(testvar) - 1);
; return 0; }
EOF
-if { (eval echo configure:2063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -2090,7 +2169,7 @@
# accepts this flag...
#
cat > conftest.$ac_ext <<EOF
-#line 2094 "configure"
+#line 2173 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -2100,7 +2179,7 @@
strncpy(testvar, "hello world", sizeof(testvar) - 1);
; return 0; }
EOF
-if { (eval echo configure:2104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -2140,7 +2219,7 @@
# Was it ./configure --enable-debug ?
#
echo $ac_n "checking if this is a debug build""... $ac_c" 1>&6
-echo "configure:2144: checking if this is a debug build" >&5
+echo "configure:2223: checking if this is a debug build" >&5
if test "$DEBUGBUILD" = yes ; then
echo "$ac_t""yes" 1>&6
CFLAGS="$DEBUGCFLAGS"
@@ -2154,7 +2233,7 @@
CFLAGS=`echo "$CFLAGS" | sed s/-D__STDC_EXT__//g`
echo $ac_n "checking if -D__STDC_EXT__ is needed with GCC on HP-UX""... $ac_c" 1>&6
-echo "configure:2158: checking if -D__STDC_EXT__ is needed with GCC on HP-UX" >&5
+echo "configure:2237: checking if -D__STDC_EXT__ is needed with GCC on HP-UX" >&5
if test "$cross_compiling" = yes; then
# action if cross-compiling, guess
@@ -2163,7 +2242,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 2167 "configure"
+#line 2246 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -2179,7 +2258,7 @@
#endif
}
EOF
-if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -2212,17 +2291,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2216: checking for $ac_hdr" >&5
+echo "configure:2295: checking for $ac_hdr" >&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 2221 "configure"
+#line 2300 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2305: \"$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*
@@ -2251,7 +2330,7 @@
if test "x$ac_cv_sizeof_stat_st_size" = x ; then
echo $ac_n "checking size of st_size field in struct stat""... $ac_c" 1>&6
-echo "configure:2255: checking size of st_size field in struct stat" >&5
+echo "configure:2334: checking size of st_size field in struct stat" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_ST_SIZE." 1>&2; exit 1; }
@@ -2266,7 +2345,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 2270 "configure"
+#line 2349 "configure"
#include "confdefs.h"
/* program */
@@ -2296,7 +2375,7 @@
}
EOF
-if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -2332,7 +2411,7 @@
if test "x$ac_cv_sizeof_off_t" = x ; then
echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:2336: checking size of off_t" >&5
+echo "configure:2415: checking size of off_t" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_OFF_T." 1>&2; exit 1; }
@@ -2347,7 +2426,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 2351 "configure"
+#line 2430 "configure"
#include "confdefs.h"
/* program */
@@ -2377,7 +2456,7 @@
}
EOF
-if { (eval echo configure:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -2426,7 +2505,7 @@
wi_cv_lfs64="yes"
echo $ac_n "checking size of st_size field in struct stat64""... $ac_c" 1>&6
-echo "configure:2430: checking size of st_size field in struct stat64" >&5
+echo "configure:2509: checking size of st_size field in struct stat64" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_STAT64_ST_SIZE." 1>&2; exit 1; }
@@ -2441,7 +2520,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 2445 "configure"
+#line 2524 "configure"
#include "confdefs.h"
/* program */
@@ -2471,7 +2550,7 @@
}
EOF
-if { (eval echo configure:2475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -2509,7 +2588,7 @@
echo $ac_n "checking size of off64_t""... $ac_c" 1>&6
-echo "configure:2513: checking size of off64_t" >&5
+echo "configure:2592: checking size of off64_t" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_OFF64_T." 1>&2; exit 1; }
@@ -2524,7 +2603,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 2528 "configure"
+#line 2607 "configure"
#include "confdefs.h"
/* program */
@@ -2554,7 +2633,7 @@
}
EOF
-if { (eval echo configure:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -2592,7 +2671,7 @@
echo $ac_n "checking size of st_size field in struct stat""... $ac_c" 1>&6
-echo "configure:2596: checking size of st_size field in struct stat" >&5
+echo "configure:2675: checking size of st_size field in struct stat" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_ST_SIZE." 1>&2; exit 1; }
@@ -2607,7 +2686,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 2611 "configure"
+#line 2690 "configure"
#include "confdefs.h"
/* program */
@@ -2637,7 +2716,7 @@
}
EOF
-if { (eval echo configure:2641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -2671,7 +2750,7 @@
echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:2675: checking size of off_t" >&5
+echo "configure:2754: checking size of off_t" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_OFF_T." 1>&2; exit 1; }
@@ -2686,7 +2765,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 2690 "configure"
+#line 2769 "configure"
#include "confdefs.h"
/* program */
@@ -2716,7 +2795,7 @@
}
EOF
-if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -2764,7 +2843,7 @@
fi
echo $ac_n "checking if we should add CFLAGS for LFS64 support""... $ac_c" 1>&6
-echo "configure:2768: checking if we should add CFLAGS for LFS64 support" >&5
+echo "configure:2847: checking if we should add CFLAGS for LFS64 support" >&5
echo "$ac_t""$result" 1>&6
else
@@ -2775,7 +2854,7 @@
if test "$GCC" = yes ; then
echo $ac_n "checking the version of GCC""... $ac_c" 1>&6
-echo "configure:2779: checking the version of GCC" >&5
+echo "configure:2858: checking the version of GCC" >&5
if eval "test \"`echo '$''{'wi_cv_gcc_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2798,7 +2877,7 @@
wi_cv_sunwspro_cc_version2="0"
else
echo $ac_n "checking if the C compiler is Sun WorkShop C""... $ac_c" 1>&6
-echo "configure:2802: checking if the C compiler is Sun WorkShop C" >&5
+echo "configure:2881: checking if the C compiler is Sun WorkShop C" >&5
if eval "test \"`echo '$''{'wi_cv_cc_is_sunwspro_cc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2832,14 +2911,14 @@
echo "$ac_t""$wi_cv_cc_is_sunwspro_cc" 1>&6
if test "$wi_cv_cc_is_sunwspro_cc" = yes ; then
echo $ac_n "checking output of "cc -V" to determine version of Sun WorkShop C""... $ac_c" 1>&6
-echo "configure:2836: checking output of "cc -V" to determine version of Sun WorkShop C" >&5
+echo "configure:2915: checking output of "cc -V" to determine version of Sun WorkShop C" >&5
echo "$ac_t"""version $wi_cv_sunwspro_cc_version"" 1>&6
fi
fi
echo $ac_n "checking if we should customize your CFLAGS environment variable""... $ac_c" 1>&6
-echo "configure:2843: checking if we should customize your CFLAGS environment variable" >&5
+echo "configure:2922: checking if we should customize your CFLAGS environment variable" >&5
wi_replace_O_with_g="no"
case "$wi_orig_CFLAGS" in
"")
@@ -2899,8 +2978,28 @@
;;
esac
+CC_is_clang="no"
+case "$CC" in
+ *clang*)
+ CC_is_clang="yes"
+ ;;
+ *)
+ cc_dash_v=`${CC-gcc} -v 2>&1 | grep clang 2>/dev/null`
+ if test -n "$cc_dash_v" ; then
+ CC_is_clang="yes"
+ fi
+ ;;
+esac
+
if test "$wi_os_default_cflags" = yes ; then
- if test "$GCC" = yes ; then
+ if test "$CC_is_clang" = yes ; then
+ wi_os_default_cflags="-Weverything -Wno-unknown-warning-option -Wno-disabled-macro-expansion -Wno-missing-variable-declarations -Wno-date-time"
+ if test "$wi_replace_O_with_g" = yes ; then
+ wi_os_default_cflags="-g $wi_os_default_cflags"
+ else
+ wi_os_default_cflags="-O2 $wi_os_default_cflags"
+ fi
+ elif test "$GCC" = yes ; then
#
# gcc
#
@@ -2909,7 +3008,7 @@
2.7.*|2.8.*|2.9*)
wi_os_default_cflags="-W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wbad-function-cast -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-declarations -Winline"
;;
- 3.*)
+ 345.*)
wi_os_default_cflags="-W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wbad-function-cast -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-declarations -Winline -Wmissing-format-attribute -Wformat-security"
wi_gcc_optimizer_flags='-Wdisabled-optimization'
;;
@@ -3060,14 +3159,14 @@
# accepts this flag...
#
cat > conftest.$ac_ext <<EOF
-#line 3064 "configure"
+#line 3163 "configure"
#include "confdefs.h"
int main() {
int junk;
; return 0; }
EOF
-if { (eval echo configure:3071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -3085,7 +3184,7 @@
echo $ac_n "checking for ldd""... $ac_c" 1>&6
-echo "configure:3089: checking for ldd" >&5
+echo "configure:3188: checking for ldd" >&5
if eval "test \"`echo '$''{'wi_cv_prog_ldd'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3120,7 +3219,7 @@
# try these
CFLAGS="$CFLAGS $ac_cv_ssp_flags"
cat > conftest.$ac_ext <<EOF
-#line 3124 "configure"
+#line 3223 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -3132,7 +3231,7 @@
; return 0; }
EOF
-if { (eval echo configure:3136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -3148,13 +3247,13 @@
fi
unset oldCFLAGS
echo $ac_n "checking if stack protection CFLAGS can be used""... $ac_c" 1>&6
-echo "configure:3152: checking if stack protection CFLAGS can be used" >&5
+echo "configure:3251: checking if stack protection CFLAGS can be used" >&5
echo "$ac_t""$ac_cv_ssp_flags" 1>&6
fi
echo $ac_n "checking if compiled programs use a shared library version of libgcc""... $ac_c" 1>&6
-echo "configure:3158: checking if compiled programs use a shared library version of libgcc" >&5
+echo "configure:3257: checking if compiled programs use a shared library version of libgcc" >&5
if eval "test \"`echo '$''{'wi_cv_shared_libgcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3193,7 +3292,7 @@
# accepts this flag...
#
cat > conftest.$ac_ext <<EOF
-#line 3197 "configure"
+#line 3296 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -3203,7 +3302,7 @@
strncpy(testvar, "hello world", sizeof(testvar) - 1);
; return 0; }
EOF
-if { (eval echo configure:3207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -3234,7 +3333,7 @@
# accepts this flag...
#
cat > conftest.$ac_ext <<EOF
-#line 3238 "configure"
+#line 3337 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -3244,7 +3343,7 @@
strncpy(testvar, "hello world", sizeof(testvar) - 1);
; return 0; }
EOF
-if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -3284,7 +3383,7 @@
# Was it ./configure --enable-debug ?
#
echo $ac_n "checking if this is a debug build""... $ac_c" 1>&6
-echo "configure:3288: checking if this is a debug build" >&5
+echo "configure:3387: checking if this is a debug build" >&5
if test "$DEBUGBUILD" = yes ; then
echo "$ac_t""yes" 1>&6
CFLAGS="$DEBUGCFLAGS"
@@ -3298,7 +3397,7 @@
CFLAGS=`echo "$CFLAGS" | sed s/-D__STDC_EXT__//g`
echo $ac_n "checking if -D__STDC_EXT__ is needed with GCC on HP-UX""... $ac_c" 1>&6
-echo "configure:3302: checking if -D__STDC_EXT__ is needed with GCC on HP-UX" >&5
+echo "configure:3401: checking if -D__STDC_EXT__ is needed with GCC on HP-UX" >&5
if test "$cross_compiling" = yes; then
# action if cross-compiling, guess
@@ -3307,7 +3406,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3311 "configure"
+#line 3410 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -3323,7 +3422,7 @@
#endif
}
EOF
-if { (eval echo configure:3327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -3356,17 +3455,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3360: checking for $ac_hdr" >&5
+echo "configure:3459: checking for $ac_hdr" >&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 3365 "configure"
+#line 3464 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3469: \"$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*
@@ -3395,7 +3494,7 @@
if test "x$ac_cv_sizeof_stat_st_size" = x ; then
echo $ac_n "checking size of st_size field in struct stat""... $ac_c" 1>&6
-echo "configure:3399: checking size of st_size field in struct stat" >&5
+echo "configure:3498: checking size of st_size field in struct stat" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_ST_SIZE." 1>&2; exit 1; }
@@ -3410,7 +3509,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3414 "configure"
+#line 3513 "configure"
#include "confdefs.h"
/* program */
@@ -3440,7 +3539,7 @@
}
EOF
-if { (eval echo configure:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -3476,7 +3575,7 @@
if test "x$ac_cv_sizeof_off_t" = x ; then
echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:3480: checking size of off_t" >&5
+echo "configure:3579: checking size of off_t" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_OFF_T." 1>&2; exit 1; }
@@ -3491,7 +3590,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3495 "configure"
+#line 3594 "configure"
#include "confdefs.h"
/* program */
@@ -3521,7 +3620,7 @@
}
EOF
-if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -3557,7 +3656,7 @@
if test "x$ac_cv_sizeof_size_t" = x ; then
echo $ac_n "checking size of size_t""... $ac_c" 1>&6
-echo "configure:3561: checking size of size_t" >&5
+echo "configure:3660: checking size of size_t" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_SIZE_T." 1>&2; exit 1; }
@@ -3572,7 +3671,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3576 "configure"
+#line 3675 "configure"
#include "confdefs.h"
/* program */
@@ -3602,7 +3701,7 @@
}
EOF
-if { (eval echo configure:3606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -3656,7 +3755,7 @@
# Recheck, to see if the defines took effect.
echo $ac_n "checking size of st_size field in struct stat""... $ac_c" 1>&6
-echo "configure:3660: checking size of st_size field in struct stat" >&5
+echo "configure:3759: checking size of st_size field in struct stat" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_ST_SIZE." 1>&2; exit 1; }
@@ -3671,7 +3770,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3675 "configure"
+#line 3774 "configure"
#include "confdefs.h"
/* program */
@@ -3701,7 +3800,7 @@
}
EOF
-if { (eval echo configure:3705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -3735,7 +3834,7 @@
echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:3739: checking size of off_t" >&5
+echo "configure:3838: checking size of off_t" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_OFF_T." 1>&2; exit 1; }
@@ -3750,7 +3849,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3754 "configure"
+#line 3853 "configure"
#include "confdefs.h"
/* program */
@@ -3780,7 +3879,7 @@
}
EOF
-if { (eval echo configure:3784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -3814,7 +3913,7 @@
echo $ac_n "checking size of size_t""... $ac_c" 1>&6
-echo "configure:3818: checking size of size_t" >&5
+echo "configure:3917: checking size of size_t" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_SIZE_T." 1>&2; exit 1; }
@@ -3829,7 +3928,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3833 "configure"
+#line 3932 "configure"
#include "confdefs.h"
/* program */
@@ -3859,7 +3958,7 @@
}
EOF
-if { (eval echo configure:3863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -3903,7 +4002,7 @@
unset ac_cv_sizeof_stat_st_size ac_cv_sizeof_off_t
echo $ac_n "checking size of st_size field in struct stat64""... $ac_c" 1>&6
-echo "configure:3907: checking size of st_size field in struct stat64" >&5
+echo "configure:4006: checking size of st_size field in struct stat64" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_STAT64_ST_SIZE." 1>&2; exit 1; }
@@ -3918,7 +4017,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3922 "configure"
+#line 4021 "configure"
#include "confdefs.h"
/* program */
@@ -3948,7 +4047,7 @@
}
EOF
-if { (eval echo configure:3952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -3986,7 +4085,7 @@
echo $ac_n "checking size of off64_t""... $ac_c" 1>&6
-echo "configure:3990: checking size of off64_t" >&5
+echo "configure:4089: checking size of off64_t" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_OFF64_T." 1>&2; exit 1; }
@@ -4001,7 +4100,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 4005 "configure"
+#line 4104 "configure"
#include "confdefs.h"
/* program */
@@ -4031,7 +4130,7 @@
}
EOF
-if { (eval echo configure:4035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -4069,7 +4168,7 @@
echo $ac_n "checking size of st_size field in struct stat""... $ac_c" 1>&6
-echo "configure:4073: checking size of st_size field in struct stat" >&5
+echo "configure:4172: checking size of st_size field in struct stat" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_ST_SIZE." 1>&2; exit 1; }
@@ -4084,7 +4183,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 4088 "configure"
+#line 4187 "configure"
#include "confdefs.h"
/* program */
@@ -4114,7 +4213,7 @@
}
EOF
-if { (eval echo configure:4118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -4148,7 +4247,7 @@
echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:4152: checking size of off_t" >&5
+echo "configure:4251: checking size of off_t" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SIZEOF_OFF_T." 1>&2; exit 1; }
@@ -4163,7 +4262,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 4167 "configure"
+#line 4266 "configure"
#include "confdefs.h"
/* program */
@@ -4193,7 +4292,7 @@
}
EOF
-if { (eval echo configure:4197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -4228,7 +4327,7 @@
fi
fi
echo $ac_n "checking if we should add CFLAGS for Large File Support""... $ac_c" 1>&6
-echo "configure:4232: checking if we should add CFLAGS for Large File Support" >&5
+echo "configure:4331: checking if we should add CFLAGS for Large File Support" >&5
echo "$ac_t""$result" 1>&6
unset orig_CFLAGS
@@ -4260,7 +4359,7 @@
;;
esac
echo $ac_n "checking if we should add CFLAGS for reentrancy""... $ac_c" 1>&6
-echo "configure:4264: checking if we should add CFLAGS for reentrancy" >&5
+echo "configure:4363: checking if we should add CFLAGS for reentrancy" >&5
echo "$ac_t""$result" 1>&6
@@ -4270,7 +4369,7 @@
ac_cv_macosx_ldflags=no
echo $ac_n "checking if MACOSX_DEPLOYMENT_TARGET environment variable is set""... $ac_c" 1>&6
-echo "configure:4274: checking if MACOSX_DEPLOYMENT_TARGET environment variable is set" >&5
+echo "configure:4373: checking if MACOSX_DEPLOYMENT_TARGET environment variable is set" >&5
echo "$ac_t""${MACOSX_DEPLOYMENT_TARGET-no}" 1>&6
test_macosx_sdk_path=`/bin/ls -1d /Developer/SDKs/MacOSX10.*u.sdk 2>/dev/null | sed -n 1,1p`
@@ -4298,7 +4397,7 @@
;;
esac
echo $ac_n "checking if Mac OS X universal SDK is available""... $ac_c" 1>&6
-echo "configure:4302: checking if Mac OS X universal SDK is available" >&5
+echo "configure:4401: checking if Mac OS X universal SDK is available" >&5
echo "$ac_t""${test_macosx_sdk_path-no}" 1>&6
if test "${use_macosx_universal}" != no && test "${test_macosx_sdk_path}" != "no" ; then
@@ -4352,13 +4451,13 @@
# esac
fi
echo $ac_n "checking if we should add CFLAGS for Mac OS X""... $ac_c" 1>&6
-echo "configure:4356: checking if we should add CFLAGS for Mac OS X" >&5
+echo "configure:4455: checking if we should add CFLAGS for Mac OS X" >&5
echo "$ac_t""$ac_cv_macosx_cflags" 1>&6
fi
echo $ac_n "checking for strip""... $ac_c" 1>&6
-echo "configure:4362: checking for strip" >&5
+echo "configure:4461: checking for strip" >&5
STRIP="strip"
if [ "x$cross_compiling" = "xyes" ] ; then
machine=`${CC-gcc} -dumpmachine 2>/dev/null`
@@ -4412,7 +4511,7 @@
STRIPFLAG="$SFLAG"
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:4416: checking for object suffix" >&5
+echo "configure:4515: checking for object suffix" >&5
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4421,7 +4520,7 @@
ac_cv_objext="o"
else
echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:4425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
case $ac_file in
*.c) ;;
@@ -4440,12 +4539,12 @@
ac_objext=$ac_cv_objext
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:4444: checking for Cygwin environment" >&5
+echo "configure:4543: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4449 "configure"
+#line 4548 "configure"
#include "confdefs.h"
int main() {
@@ -4456,7 +4555,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:4460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -4473,19 +4572,19 @@
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:4477: checking for mingw32 environment" >&5
+echo "configure:4576: checking for mingw32 environment" >&5
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4482 "configure"
+#line 4581 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:4489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -4504,7 +4603,7 @@
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:4508: checking for executable suffix" >&5
+echo "configure:4607: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4516,7 +4615,7 @@
rm -rf conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:4520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:4619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
@@ -4550,14 +4649,15 @@
if test "${SYS-sunos}" = sunos ; then
echo $ac_n "checking for System V compatibility directories""... $ac_c" 1>&6
-echo "configure:4554: checking for System V compatibility directories" >&5
+echo "configure:4653: checking for System V compatibility directories" >&5
echo "$ac_t""" 1>&6
incdir=""/usr/5include""
-if test -r $incdir ; then
+echo "wi_extra_idir $incdir" 1>&5
+if test -r "$incdir" ; then
case "$CPPFLAGS" in
*${incdir}*)
- # echo " + already had $incdir" 1>&6
+ echo " + already had $incdir" 1>&5
;;
*)
if test "$CPPFLAGS" = "" ; then
@@ -4565,17 +4665,18 @@
else
CPPFLAGS="$CPPFLAGS -I$incdir"
fi
- echo " + found $incdir" 1>&6
+ echo " + found $incdir" 1>&5
;;
esac
fi
libdir=""/usr/5lib""
-if test -r $libdir ; then
+echo "wi_extra_ldir $libdir" 1>&5
+if test -r "$libdir" ; then
case "$LDFLAGS" in
*${libdir}*)
- # echo " + already had $libdir" 1>&6
+ echo " + already had $libdir" 1>&5
;;
*)
if test "$LDFLAGS" = "" ; then
@@ -4583,7 +4684,7 @@
else
LDFLAGS="$LDFLAGS -L$libdir"
fi
- echo " + found $libdir" 1>&6
+ echo " + found $libdir" 1>&5
;;
esac
fi
@@ -4600,12 +4701,12 @@
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4604: checking for ANSI C header files" >&5
+echo "configure:4705: 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 4609 "configure"
+#line 4710 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -4613,7 +4714,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4718: \"$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*
@@ -4630,7 +4731,7 @@
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 4634 "configure"
+#line 4735 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -4648,7 +4749,7 @@
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 4652 "configure"
+#line 4753 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -4669,7 +4770,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 4673 "configure"
+#line 4774 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4680,7 +4781,7 @@
exit (0); }
EOF
-if { (eval echo configure:4684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -4707,17 +4808,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4711: checking for $ac_hdr" >&5
+echo "configure:4812: checking for $ac_hdr" >&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 4716 "configure"
+#line 4817 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4822: \"$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*
@@ -4744,12 +4845,12 @@
done
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4748: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4849: 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 4753 "configure"
+#line 4854 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -4758,7 +4859,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:4762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -4789,17 +4890,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4793: checking for $ac_hdr" >&5
+echo "configure:4894: checking for $ac_hdr" >&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 4798 "configure"
+#line 4899 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4904: \"$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*
@@ -4826,7 +4927,7 @@
done
echo $ac_n "checking for UNIX domain sockets""... $ac_c" 1>&6
-echo "configure:4830: checking for UNIX domain sockets" >&5
+echo "configure:4931: checking for UNIX domain sockets" >&5
if eval "test \"`echo '$''{'wi_cv_unix_domain_sockets'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4839,7 +4940,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 4843 "configure"
+#line 4944 "configure"
#include "confdefs.h"
#if defined(AIX) || defined(_AIX) || defined(__HOS_AIX__)
@@ -4865,7 +4966,7 @@
exit(0); /* do have UNIX domain sockets */
}
EOF
-if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -4899,13 +5000,13 @@
fi
echo $ac_n "checking for sun_len field in struct sockaddr_un""... $ac_c" 1>&6
-echo "configure:4903: checking for sun_len field in struct sockaddr_un" >&5
+echo "configure:5004: checking for sun_len field in struct sockaddr_un" >&5
if eval "test \"`echo '$''{'wi_cv_sockaddr_un_sun_len'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4909 "configure"
+#line 5010 "configure"
#include "confdefs.h"
/* includes */
@@ -4924,7 +5025,7 @@
; return 0; }
EOF
-if { (eval echo configure:4928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
wi_cv_sockaddr_un_sun_len=yes
@@ -4966,12 +5067,12 @@
# Mostly for SunOS 4 -- needs to come first because other libs depend on it
echo $ac_n "checking for strerror""... $ac_c" 1>&6
-echo "configure:4970: checking for strerror" >&5
+echo "configure:5071: checking for strerror" >&5
if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4975 "configure"
+#line 5076 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strerror(); below. */
@@ -4994,7 +5095,7 @@
; return 0; }
EOF
-if { (eval echo configure:4998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_strerror=yes"
else
@@ -5017,7 +5118,7 @@
if test "$a" = no ; then
# Not in libc, try lib44bsd.
echo $ac_n "checking for strerror in -l44bsd""... $ac_c" 1>&6
-echo "configure:5021: checking for strerror in -l44bsd" >&5
+echo "configure:5122: checking for strerror in -l44bsd" >&5
ac_lib_var=`echo 44bsd'_'strerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5025,7 +5126,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l44bsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5029 "configure"
+#line 5130 "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
@@ -5036,7 +5137,7 @@
strerror()
; return 0; }
EOF
-if { (eval echo configure:5040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5141: \"$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
@@ -5068,12 +5169,12 @@
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:5072: checking for socket" >&5
+echo "configure:5173: checking for socket" >&5
if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5077 "configure"
+#line 5178 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
@@ -5096,7 +5197,7 @@
; return 0; }
EOF
-if { (eval echo configure:5100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
@@ -5119,7 +5220,7 @@
if test "$a" = no ; then
# Not in libc, try libsocket.
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:5123: checking for socket in -lsocket" >&5
+echo "configure:5224: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5127,7 +5228,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5131 "configure"
+#line 5232 "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
@@ -5138,7 +5239,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:5142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5243: \"$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
@@ -5173,7 +5274,7 @@
unixware2*)
# So far, only UnixWare needs this.
echo $ac_n "checking for syslog in -lgen""... $ac_c" 1>&6
-echo "configure:5177: checking for syslog in -lgen" >&5
+echo "configure:5278: checking for syslog in -lgen" >&5
ac_lib_var=`echo gen'_'syslog | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5181,7 +5282,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgen $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5185 "configure"
+#line 5286 "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
@@ -5192,7 +5293,7 @@
syslog()
; return 0; }
EOF
-if { (eval echo configure:5196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5297: \"$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
@@ -5239,12 +5340,12 @@
# AC_CHECK_FUNC(socket,[a=yes],[a=no])
#
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:5243: checking for socket" >&5
+echo "configure:5344: checking for socket" >&5
if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5248 "configure"
+#line 5349 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
@@ -5267,7 +5368,7 @@
; return 0; }
EOF
-if { (eval echo configure:5271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
@@ -5300,7 +5401,7 @@
hpux1123456789*)
# HP-UX 11 uses NSL for YP services
echo $ac_n "checking for getpwent in -lnsl""... $ac_c" 1>&6
-echo "configure:5304: checking for getpwent in -lnsl" >&5
+echo "configure:5405: checking for getpwent in -lnsl" >&5
ac_lib_var=`echo nsl'_'getpwent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5308,7 +5409,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5312 "configure"
+#line 5413 "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
@@ -5319,7 +5420,7 @@
getpwent()
; return 0; }
EOF
-if { (eval echo configure:5323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5424: \"$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
@@ -5350,12 +5451,12 @@
*)
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:5354: checking for gethostbyname" >&5
+echo "configure:5455: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5359 "configure"
+#line 5460 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -5378,7 +5479,7 @@
; return 0; }
EOF
-if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -5401,7 +5502,7 @@
if test "$a" = no ; then
# Not in libc, try libnsl.
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5405: checking for gethostbyname in -lnsl" >&5
+echo "configure:5506: checking for gethostbyname in -lnsl" >&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
@@ -5409,7 +5510,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5413 "configure"
+#line 5514 "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
@@ -5420,7 +5521,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:5424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5525: \"$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
@@ -5456,7 +5557,7 @@
# See if we could access two well-known sites without help of any special
# libraries, like resolv.
echo $ac_n "checking if we need to look for a separate DNS resolver library""... $ac_c" 1>&6
-echo "configure:5460: checking if we need to look for a separate DNS resolver library" >&5
+echo "configure:5561: checking if we need to look for a separate DNS resolver library" >&5
if eval "test \"`echo '$''{'wi_cv_look_for_resolv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5474,7 +5575,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 5478 "configure"
+#line 5579 "configure"
#include "confdefs.h"
#if defined(AIX) || defined(_AIX) || defined(__HOS_AIX__)
@@ -5501,7 +5602,7 @@
exit(0);
}
EOF
-if { (eval echo configure:5505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -5529,7 +5630,7 @@
if test "$wi_cv_look_for_resolv" = yes ; then
echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6
-echo "configure:5533: checking for main in -lresolv" >&5
+echo "configure:5634: checking for main in -lresolv" >&5
ac_lib_var=`echo resolv'_'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
@@ -5537,14 +5638,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5541 "configure"
+#line 5642 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5649: \"$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
@@ -5595,7 +5696,7 @@
#
if test "x$ac_cv_lib_db_main" = "x" ; then
echo $ac_n "checking for main in -ldb""... $ac_c" 1>&6
-echo "configure:5599: checking for main in -ldb" >&5
+echo "configure:5700: checking for main in -ldb" >&5
ac_lib_var=`echo db'_'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
@@ -5603,14 +5704,14 @@
ac_save_LIBS="$LIBS"
LIBS="-ldb $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5607 "configure"
+#line 5708 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5715: \"$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
@@ -5633,7 +5734,7 @@
fi
if test "x$ac_cv_lib_isode_main" = "x" ; then
echo $ac_n "checking for main in -lisode""... $ac_c" 1>&6
-echo "configure:5637: checking for main in -lisode" >&5
+echo "configure:5738: checking for main in -lisode" >&5
ac_lib_var=`echo isode'_'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
@@ -5641,14 +5742,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lisode $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5645 "configure"
+#line 5746 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5753: \"$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
@@ -5671,7 +5772,7 @@
fi
if test "x$ac_cv_lib_com_err_main" = "x" ; then
echo $ac_n "checking for main in -lcom_err""... $ac_c" 1>&6
-echo "configure:5675: checking for main in -lcom_err" >&5
+echo "configure:5776: checking for main in -lcom_err" >&5
ac_lib_var=`echo com_err'_'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
@@ -5679,14 +5780,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lcom_err $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5683 "configure"
+#line 5784 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5791: \"$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
@@ -5709,7 +5810,7 @@
fi
if test "x$ac_cv_lib_crypto_main" = "x" ; then
echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6
-echo "configure:5713: checking for main in -lcrypto" >&5
+echo "configure:5814: checking for main in -lcrypto" >&5
ac_lib_var=`echo crypto'_'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
@@ -5717,14 +5818,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5721 "configure"
+#line 5822 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5829: \"$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
@@ -5747,7 +5848,7 @@
fi
if test "x$ac_cv_lib_krb5_main" = "x" ; then
echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6
-echo "configure:5751: checking for main in -lkrb5" >&5
+echo "configure:5852: checking for main in -lkrb5" >&5
ac_lib_var=`echo krb5'_'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
@@ -5755,14 +5856,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lkrb5 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5759 "configure"
+#line 5860 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5867: \"$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
@@ -5785,7 +5886,7 @@
fi
if test "x$ac_cv_lib_gssapi_krb5_main" = "x" ; then
echo $ac_n "checking for main in -lgssapi_krb5""... $ac_c" 1>&6
-echo "configure:5789: checking for main in -lgssapi_krb5" >&5
+echo "configure:5890: checking for main in -lgssapi_krb5" >&5
ac_lib_var=`echo gssapi_krb5'_'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
@@ -5793,14 +5894,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lgssapi_krb5 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5797 "configure"
+#line 5898 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5905: \"$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
@@ -5823,7 +5924,7 @@
fi
echo $ac_n "checking for SOCKSinit in -lsocks5""... $ac_c" 1>&6
-echo "configure:5827: checking for SOCKSinit in -lsocks5" >&5
+echo "configure:5928: checking for SOCKSinit in -lsocks5" >&5
ac_lib_var=`echo socks5'_'SOCKSinit | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5831,7 +5932,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocks5 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5835 "configure"
+#line 5936 "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
@@ -5842,7 +5943,7 @@
SOCKSinit()
; return 0; }
EOF
-if { (eval echo configure:5846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5947: \"$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
@@ -5866,17 +5967,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5870: checking for $ac_hdr" >&5
+echo "configure:5971: checking for $ac_hdr" >&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 5875 "configure"
+#line 5976 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5981: \"$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*
@@ -5915,14 +6016,14 @@
fi
fi
echo $ac_n "checking if SOCKS5 will be used""... $ac_c" 1>&6
-echo "configure:5919: checking if SOCKS5 will be used" >&5
+echo "configure:6020: checking if SOCKS5 will be used" >&5
echo "$ac_t""$ac_cv_lib_socks5_SOCKSinit" 1>&6
case "$OS" in
solaris8-*)
saved_LIBS="$LIBS"
echo $ac_n "checking for sendfilev in -lsendfile""... $ac_c" 1>&6
-echo "configure:5926: checking for sendfilev in -lsendfile" >&5
+echo "configure:6027: checking for sendfilev in -lsendfile" >&5
ac_lib_var=`echo sendfile'_'sendfilev | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5930,7 +6031,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsendfile $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5934 "configure"
+#line 6035 "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
@@ -5941,7 +6042,7 @@
sendfilev()
; return 0; }
EOF
-if { (eval echo configure:5945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6046: \"$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
@@ -5971,12 +6072,12 @@
for ac_func in sendfilev sendfilev64
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5975: checking for $ac_func" >&5
+echo "configure:6076: 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 5980 "configure"
+#line 6081 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5999,7 +6100,7 @@
; return 0; }
EOF
-if { (eval echo configure:6003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6104: \"$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
@@ -6025,7 +6126,7 @@
LIBS="$saved_LIBS"
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:6029: checking for dlopen in -ldl" >&5
+echo "configure:6130: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6033,7 +6134,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6037 "configure"
+#line 6138 "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
@@ -6044,7 +6145,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:6048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6149: \"$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
@@ -6074,7 +6175,7 @@
;;
solaris9-*|solaris1[0-9]-*)
echo $ac_n "checking for sendfilev in -lsendfile""... $ac_c" 1>&6
-echo "configure:6078: checking for sendfilev in -lsendfile" >&5
+echo "configure:6179: checking for sendfilev in -lsendfile" >&5
ac_lib_var=`echo sendfile'_'sendfilev | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6082,7 +6183,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsendfile $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6086 "configure"
+#line 6187 "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
@@ -6093,7 +6194,7 @@
sendfilev()
; return 0; }
EOF
-if { (eval echo configure:6097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6198: \"$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
@@ -6123,12 +6224,12 @@
for ac_func in sendfilev sendfilev64
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6127: checking for $ac_func" >&5
+echo "configure:6228: 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 6132 "configure"
+#line 6233 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -6151,7 +6252,7 @@
; return 0; }
EOF
-if { (eval echo configure:6155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6256: \"$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
@@ -6183,23 +6284,23 @@
echo $ac_n "checking for curses library headers""... $ac_c" 1>&6
-echo "configure:6187: checking for curses library headers" >&5
+echo "configure:6288: checking for curses library headers" >&5
if test "$wi_cv_ncurses" != "no" ; then
for ac_hdr in ncurses.h curses.h termios.h termio.h sgtty.h sys/ioctl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6193: checking for $ac_hdr" >&5
+echo "configure:6294: checking for $ac_hdr" >&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 6198 "configure"
+#line 6299 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6304: \"$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*
@@ -6230,17 +6331,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6234: checking for $ac_hdr" >&5
+echo "configure:6335: checking for $ac_hdr" >&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 6239 "configure"
+#line 6340 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6345: \"$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*
@@ -6278,7 +6379,7 @@
fi
echo $ac_n "checking for curses library""... $ac_c" 1>&6
-echo "configure:6282: checking for curses library" >&5
+echo "configure:6383: checking for curses library" >&5
wi_cv_lib_curses=no
wi_cv_lib_curses_result=no
@@ -6291,7 +6392,7 @@
fi
LIBS="$ac_save_LIBS $LIBCURSES"
cat > conftest.$ac_ext <<EOF
-#line 6295 "configure"
+#line 6396 "configure"
#include "confdefs.h"
/* includes */
@@ -6314,7 +6415,7 @@
; return 0; }
EOF
-if { (eval echo configure:6318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
linked_with_LIBCURSES=yes
@@ -6338,7 +6439,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 6342 "configure"
+#line 6443 "configure"
#include "confdefs.h"
/* program */
@@ -6364,7 +6465,7 @@
}
EOF
-if { (eval echo configure:6368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -6442,17 +6543,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6446: checking for $ac_hdr" >&5
+echo "configure:6547: checking for $ac_hdr" >&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 6451 "configure"
+#line 6552 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6557: \"$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*
@@ -6482,7 +6583,7 @@
{ echo "configure: error: Can't find validator.h" 1>&2; exit 1; }
fi
echo $ac_n "checking for SHA1_Init in -lssl""... $ac_c" 1>&6
-echo "configure:6486: checking for SHA1_Init in -lssl" >&5
+echo "configure:6587: checking for SHA1_Init in -lssl" >&5
ac_lib_var=`echo ssl'_'SHA1_Init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6490,7 +6591,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6494 "configure"
+#line 6595 "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
@@ -6501,7 +6602,7 @@
SHA1_Init()
; return 0; }
EOF
-if { (eval echo configure:6505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6606: \"$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
@@ -6530,7 +6631,7 @@
fi
echo $ac_n "checking for query_send in -lsres""... $ac_c" 1>&6
-echo "configure:6534: checking for query_send in -lsres" >&5
+echo "configure:6635: checking for query_send in -lsres" >&5
ac_lib_var=`echo sres'_'query_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6538,7 +6639,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsres $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6542 "configure"
+#line 6643 "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
@@ -6549,7 +6650,7 @@
query_send()
; return 0; }
EOF
-if { (eval echo configure:6553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6654: \"$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
@@ -6578,7 +6679,7 @@
fi
echo $ac_n "checking for p_val_status in -lval""... $ac_c" 1>&6
-echo "configure:6582: checking for p_val_status in -lval" >&5
+echo "configure:6683: checking for p_val_status in -lval" >&5
ac_lib_var=`echo val'_'p_val_status | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6586,7 +6687,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lval $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6590 "configure"
+#line 6691 "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
@@ -6597,7 +6698,7 @@
p_val_status()
; return 0; }
EOF
-if { (eval echo configure:6601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6702: \"$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
@@ -6617,7 +6718,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_rwlock_init in -lpthread""... $ac_c" 1>&6
-echo "configure:6621: checking for pthread_rwlock_init in -lpthread" >&5
+echo "configure:6722: checking for pthread_rwlock_init in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_rwlock_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6625,7 +6726,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6629 "configure"
+#line 6730 "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
@@ -6636,7 +6737,7 @@
pthread_rwlock_init()
; return 0; }
EOF
-if { (eval echo configure:6640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6741: \"$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
@@ -6664,7 +6765,7 @@
fi
echo $ac_n "checking for p_val_status in -lval-threads""... $ac_c" 1>&6
-echo "configure:6668: checking for p_val_status in -lval-threads" >&5
+echo "configure:6769: checking for p_val_status in -lval-threads" >&5
ac_lib_var=`echo val-threads'_'p_val_status | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6672,7 +6773,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lval-threads $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6676 "configure"
+#line 6777 "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
@@ -6683,7 +6784,7 @@
p_val_status()
; return 0; }
EOF
-if { (eval echo configure:6687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6788: \"$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
@@ -6718,12 +6819,12 @@
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:6722: checking for working const" >&5
+echo "configure:6823: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6727 "configure"
+#line 6828 "configure"
#include "confdefs.h"
int main() {
@@ -6772,7 +6873,7 @@
; return 0; }
EOF
-if { (eval echo configure:6776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -6793,12 +6894,12 @@
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:6797: checking for size_t" >&5
+echo "configure:6898: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6802 "configure"
+#line 6903 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6826,12 +6927,12 @@
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:6830: checking for off_t" >&5
+echo "configure:6931: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6835 "configure"
+#line 6936 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6859,12 +6960,12 @@
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:6863: checking for mode_t" >&5
+echo "configure:6964: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6868 "configure"
+#line 6969 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6892,12 +6993,12 @@
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6896: checking for pid_t" >&5
+echo "configure:6997: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6901 "configure"
+#line 7002 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6925,12 +7026,12 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:6929: checking for uid_t in sys/types.h" >&5
+echo "configure:7030: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6934 "configure"
+#line 7035 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -6960,7 +7061,7 @@
echo $ac_n "checking what type main() should return""... $ac_c" 1>&6
-echo "configure:6964: checking what type main() should return" >&5
+echo "configure:7065: checking what type main() should return" >&5
if eval "test \"`echo '$''{'wi_cv_main_void_return_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6987,7 +7088,7 @@
fi
echo $ac_n "checking for 64-bit integral type: long long""... $ac_c" 1>&6
-echo "configure:6991: checking for 64-bit integral type: long long" >&5
+echo "configure:7092: checking for 64-bit integral type: long long" >&5
LONGEST_INT="long"
if test "$cross_compiling" = yes; then
@@ -6998,7 +7099,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 7002 "configure"
+#line 7103 "configure"
#include "confdefs.h"
/* program */
@@ -7026,7 +7127,7 @@
EOF
-if { (eval echo configure:7030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -7052,7 +7153,7 @@
if test "$wi_cv_type_long_long" = yes ; then
echo $ac_n "checking how to print a 64-bit integral type""... $ac_c" 1>&6
-echo "configure:7056: checking how to print a 64-bit integral type" >&5
+echo "configure:7157: checking how to print a 64-bit integral type" >&5
wi_cv_printf_long_long=fail
if test "$cross_compiling" = yes; then
@@ -7063,7 +7164,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 7067 "configure"
+#line 7168 "configure"
#include "confdefs.h"
/* program */
@@ -7092,7 +7193,7 @@
}
EOF
-if { (eval echo configure:7096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -7122,7 +7223,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 7126 "configure"
+#line 7227 "configure"
#include "confdefs.h"
/* program */
@@ -7151,7 +7252,7 @@
}
EOF
-if { (eval echo configure:7155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -7181,7 +7282,7 @@
echo $ac_n "checking how to scan a 64-bit integral type""... $ac_c" 1>&6
-echo "configure:7185: checking how to scan a 64-bit integral type" >&5
+echo "configure:7286: checking how to scan a 64-bit integral type" >&5
wi_cv_scanf_long_long=fail
if test "$cross_compiling" = yes; then
@@ -7192,7 +7293,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 7196 "configure"
+#line 7297 "configure"
#include "confdefs.h"
/* program */
@@ -7224,7 +7325,7 @@
}
EOF
-if { (eval echo configure:7228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -7254,7 +7355,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 7258 "configure"
+#line 7359 "configure"
#include "confdefs.h"
/* program */
@@ -7286,7 +7387,7 @@
}
EOF
-if { (eval echo configure:7290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -7317,7 +7418,7 @@
fi
echo $ac_n "checking if everything was available to use the 64-bit integral type""... $ac_c" 1>&6
-echo "configure:7321: checking if everything was available to use the 64-bit integral type" >&5
+echo "configure:7422: checking if everything was available to use the 64-bit integral type" >&5
if test "$wi_cv_type_long_long" = no ; then
wi_cv_use_long_long_msg_result="no (long long type not available)"
@@ -7396,7 +7497,7 @@
wi_struct_timeval_field_checks="cached"
echo $ac_n "checking what type the tv_sec field of struct timeval is""... $ac_c" 1>&6
-echo "configure:7400: checking what type the tv_sec field of struct timeval is" >&5
+echo "configure:7501: checking what type the tv_sec field of struct timeval is" >&5
if eval "test \"`echo '$''{'wi_cv_struct_timeval_tv_sec'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7417,7 +7518,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 7421 "configure"
+#line 7522 "configure"
#include "confdefs.h"
/* program */
@@ -7497,7 +7598,7 @@
}
EOF
-if { (eval echo configure:7501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -7531,12 +7632,12 @@
if test "$wi_struct_timeval_field_checks" = "uncached" ; then
guess="$guess2"
echo $ac_n "checking what type the tv_usec field of struct timeval is""... $ac_c" 1>&6
-echo "configure:7535: checking what type the tv_usec field of struct timeval is" >&5
+echo "configure:7636: checking what type the tv_usec field of struct timeval is" >&5
echo "$ac_t""$guess$wi_cv_struct_timeval_tv_usec" 1>&6
else
guess="$guess2"
echo $ac_n "checking what type the tv_usec field of struct timeval is""... $ac_c" 1>&6
-echo "configure:7540: checking what type the tv_usec field of struct timeval is" >&5
+echo "configure:7641: checking what type the tv_usec field of struct timeval is" >&5
if eval "test \"`echo '$''{'wi_cv_struct_timeval_tv_usec'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7560,7 +7661,7 @@
# Extract the first word of ""perl"", so it can be a program name with args.
set dummy "perl"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7564: checking for $ac_word" >&5
+echo "configure:7665: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7598,7 +7699,7 @@
# Extract the first word of ""mktemp"", so it can be a program name with args.
set dummy "mktemp"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7602: checking for $ac_word" >&5
+echo "configure:7703: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MKTEMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7643,7 +7744,7 @@
fi
echo $ac_n "checking for return type from write""... $ac_c" 1>&6
-echo "configure:7647: checking for return type from write" >&5
+echo "configure:7748: checking for return type from write" >&5
if eval "test \"`echo '$''{'wi_cv_write_return_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7954,35 +8055,35 @@
echo "$ac_t""$wi_cv_write_return_t" 1>&6
if test "x$used_cache_for_wi_unistd_fpt" = "xno" ; then
echo $ac_n "checking for size parameter to write""... $ac_c" 1>&6
-echo "configure:7958: checking for size parameter to write" >&5
+echo "configure:8059: checking for size parameter to write" >&5
echo "$ac_t""$wi_cv_write_size_t" 1>&6
echo $ac_n "checking for return type from send""... $ac_c" 1>&6
-echo "configure:7961: checking for return type from send" >&5
+echo "configure:8062: checking for return type from send" >&5
echo "$ac_t""$wi_cv_send_return_t" 1>&6
echo $ac_n "checking for size parameter to send""... $ac_c" 1>&6
-echo "configure:7964: checking for size parameter to send" >&5
+echo "configure:8065: checking for size parameter to send" >&5
echo "$ac_t""$wi_cv_send_size_t" 1>&6
echo $ac_n "checking for size parameter to connect""... $ac_c" 1>&6
-echo "configure:7967: checking for size parameter to connect" >&5
+echo "configure:8068: checking for size parameter to connect" >&5
echo "$ac_t""$wi_cv_sockaddr_size_t" 1>&6
echo $ac_n "checking for size parameter to setsockopt""... $ac_c" 1>&6
-echo "configure:7970: checking for size parameter to setsockopt" >&5
+echo "configure:8071: checking for size parameter to setsockopt" >&5
echo "$ac_t""$wi_cv_sockopt_size_t" 1>&6
echo $ac_n "checking for backlog parameter to listen""... $ac_c" 1>&6
-echo "configure:7973: checking for backlog parameter to listen" >&5
+echo "configure:8074: checking for backlog parameter to listen" >&5
echo "$ac_t""$wi_cv_listen_backlog_t" 1>&6
echo $ac_n "checking for seconds parameter to alarm""... $ac_c" 1>&6
-echo "configure:7976: checking for seconds parameter to alarm" >&5
+echo "configure:8077: checking for seconds parameter to alarm" >&5
echo "$ac_t""$wi_cv_alarm_time_t" 1>&6
echo $ac_n "checking for address parameter to gethostbyaddr""... $ac_c" 1>&6
-echo "configure:7979: checking for address parameter to gethostbyaddr" >&5
+echo "configure:8080: checking for address parameter to gethostbyaddr" >&5
echo "$ac_t""$wi_cv_gethost_addrptr_t" 1>&6
echo $ac_n "checking for size parameter to gethostname""... $ac_c" 1>&6
-echo "configure:7982: checking for size parameter to gethostname" >&5
+echo "configure:8083: checking for size parameter to gethostname" >&5
echo "$ac_t""$wi_cv_gethostname_size_t" 1>&6
else
echo $ac_n "checking for size parameter to write""... $ac_c" 1>&6
-echo "configure:7986: checking for size parameter to write" >&5
+echo "configure:8087: checking for size parameter to write" >&5
if eval "test \"`echo '$''{'wi_cv_write_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7991,7 +8092,7 @@
echo "$ac_t""$wi_cv_write_size_t" 1>&6
echo $ac_n "checking for return type from send""... $ac_c" 1>&6
-echo "configure:7995: checking for return type from send" >&5
+echo "configure:8096: checking for return type from send" >&5
if eval "test \"`echo '$''{'wi_cv_send_return_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8000,7 +8101,7 @@
echo "$ac_t""$wi_cv_send_return_t" 1>&6
echo $ac_n "checking for size parameter to send""... $ac_c" 1>&6
-echo "configure:8004: checking for size parameter to send" >&5
+echo "configure:8105: checking for size parameter to send" >&5
if eval "test \"`echo '$''{'wi_cv_send_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8009,7 +8110,7 @@
echo "$ac_t""$wi_cv_send_size_t" 1>&6
echo $ac_n "checking for size parameter to connect""... $ac_c" 1>&6
-echo "configure:8013: checking for size parameter to connect" >&5
+echo "configure:8114: checking for size parameter to connect" >&5
if eval "test \"`echo '$''{'wi_cv_sockaddr_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8018,7 +8119,7 @@
echo "$ac_t""$wi_cv_sockaddr_size_t" 1>&6
echo $ac_n "checking for size parameter to setsockopt""... $ac_c" 1>&6
-echo "configure:8022: checking for size parameter to setsockopt" >&5
+echo "configure:8123: checking for size parameter to setsockopt" >&5
if eval "test \"`echo '$''{'wi_cv_sockopt_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8027,7 +8128,7 @@
echo "$ac_t""$wi_cv_sockopt_size_t" 1>&6
echo $ac_n "checking for backlog parameter to listen""... $ac_c" 1>&6
-echo "configure:8031: checking for backlog parameter to listen" >&5
+echo "configure:8132: checking for backlog parameter to listen" >&5
if eval "test \"`echo '$''{'wi_cv_listen_backlog_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8036,7 +8137,7 @@
echo "$ac_t""$wi_cv_listen_backlog_t" 1>&6
echo $ac_n "checking for seconds parameter to alarm""... $ac_c" 1>&6
-echo "configure:8040: checking for seconds parameter to alarm" >&5
+echo "configure:8141: checking for seconds parameter to alarm" >&5
if eval "test \"`echo '$''{'wi_cv_alarm_time_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8045,7 +8146,7 @@
echo "$ac_t""$wi_cv_alarm_time_t" 1>&6
echo $ac_n "checking for address parameter to gethostbyaddr""... $ac_c" 1>&6
-echo "configure:8049: checking for address parameter to gethostbyaddr" >&5
+echo "configure:8150: checking for address parameter to gethostbyaddr" >&5
if eval "test \"`echo '$''{'wi_cv_gethost_addrptr_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8054,7 +8155,7 @@
echo "$ac_t""$wi_cv_gethost_addrptr_t" 1>&6
echo $ac_n "checking for size parameter to gethostname""... $ac_c" 1>&6
-echo "configure:8058: checking for size parameter to gethostname" >&5
+echo "configure:8159: checking for size parameter to gethostname" >&5
if eval "test \"`echo '$''{'wi_cv_gethostname_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8121,14 +8222,132 @@
EOF
+echo $ac_n "checking for negative_control_t""... $ac_c" 1>&6
+echo "configure:8227: checking for negative_control_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_negative_control_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 8232 "configure"
+#include "confdefs.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])negative_control_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_type_negative_control_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_negative_control_t=no
+fi
+rm -rf conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_negative_control_t" 1>&6
+if test $ac_cv_type_negative_control_t = no; then
+ cat >> confdefs.h <<\EOF
+#define negative_control_t long
+EOF
+
+fi
+
+echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
+echo "configure:8265: checking for ssize_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 8270 "configure"
+#include "confdefs.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_type_ssize_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_ssize_t=no
+fi
+rm -rf conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_ssize_t" 1>&6
+if test $ac_cv_type_ssize_t = no; then
+ cat >> confdefs.h <<\EOF
+#define ssize_t long
+EOF
+
+fi
+
+echo $ac_n "checking for sa_family_t""... $ac_c" 1>&6
+echo "configure:8303: checking for sa_family_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_sa_family_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 8308 "configure"
+#include "confdefs.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])sa_family_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_type_sa_family_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_sa_family_t=no
+fi
+rm -rf conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_sa_family_t" 1>&6
+if test $ac_cv_type_sa_family_t = no; then
+ cat >> confdefs.h <<\EOF
+#define sa_family_t unsigned short
+EOF
+
+fi
+
+
+
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_FUNC_SELECT_ARGTYPES." 1>&2; exit 1; }
fi
echo $ac_n "checking types of arguments for select()""... $ac_c" 1>&6
-echo "configure:8132: checking types of arguments for select()" >&5
+echo "configure:8351: checking types of arguments for select()" >&5
if eval "test \"`echo '$''{'ac_cv_func_select_arg234'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8142,7 +8361,7 @@
for ac_cv_func_select_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do
for ac_cv_func_select_arg5 in 'struct timeval *' 'const struct timeval *'; do
cat > conftest.$ac_ext <<EOF
-#line 8146 "configure"
+#line 8365 "configure"
#include "confdefs.h"
#if defined(AIX) || defined(_AIX) || defined(__HOS_AIX__) /* MG */
# define _ALL_SOURCE 1 /* MG */
@@ -8161,7 +8380,7 @@
; return 0; }
EOF
-if { (eval echo configure:8165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_not_found=no ; break 3
else
@@ -8202,14 +8421,14 @@
if test "$wi_cv_lfs64" != "yes" ; then
echo $ac_n "checking for struct stat64""... $ac_c" 1>&6
-echo "configure:8206: checking for struct stat64" >&5
+echo "configure:8425: checking for struct stat64" >&5
echo "$ac_t""not needed" 1>&6
wi_cv_struct_stat64=no
else
echo $ac_n "checking for struct stat64""... $ac_c" 1>&6
-echo "configure:8211: checking for struct stat64" >&5
+echo "configure:8430: checking for struct stat64" >&5
cat > conftest.$ac_ext <<EOF
-#line 8213 "configure"
+#line 8432 "configure"
#include "confdefs.h"
/* includes */
@@ -8226,7 +8445,7 @@
; return 0; }
EOF
-if { (eval echo configure:8230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
wi_cv_struct_stat64=yes
@@ -8254,9 +8473,9 @@
fi
echo $ac_n "checking for sig_atomic_t""... $ac_c" 1>&6
-echo "configure:8258: checking for sig_atomic_t" >&5
+echo "configure:8477: checking for sig_atomic_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 8260 "configure"
+#line 8479 "configure"
#include "confdefs.h"
/* includes */
@@ -8281,7 +8500,7 @@
; return 0; }
EOF
-if { (eval echo configure:8285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_type_sig_atomic_t=yes
@@ -8305,7 +8524,7 @@
echo $ac_n "checking how to access getopt() global variables""... $ac_c" 1>&6
-echo "configure:8309: checking how to access getopt() global variables" >&5
+echo "configure:8528: checking how to access getopt() global variables" >&5
if eval "test \"`echo '$''{'wi_cv_getopt_decl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8316,7 +8535,7 @@
fi
cat > conftest.$ac_ext <<EOF
-#line 8320 "configure"
+#line 8539 "configure"
#include "confdefs.h"
/* includes */
@@ -8335,7 +8554,7 @@
; return 0; }
EOF
-if { (eval echo configure:8339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wi_cv_getopt_decl="automatic"
else
@@ -8350,7 +8569,7 @@
if test "$wi_cv_getopt_decl" = unknown ; then
cat > conftest.$ac_ext <<EOF
-#line 8354 "configure"
+#line 8573 "configure"
#include "confdefs.h"
/* includes */
@@ -8370,7 +8589,7 @@
; return 0; }
EOF
-if { (eval echo configure:8374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
#
@@ -8408,9 +8627,9 @@
echo $ac_n "checking for useable _res global variable""... $ac_c" 1>&6
-echo "configure:8412: checking for useable _res global variable" >&5
+echo "configure:8631: checking for useable _res global variable" >&5
cat > conftest.$ac_ext <<EOF
-#line 8414 "configure"
+#line 8633 "configure"
#include "confdefs.h"
/* includes */
@@ -8437,7 +8656,7 @@
; return 0; }
EOF
-if { (eval echo configure:8441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
wi_cv__res_defdname=yes
@@ -8458,13 +8677,13 @@
echo "$ac_t""$wi_cv__res_defdname" 1>&6
echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
-echo "configure:8462: checking for struct cmsghdr" >&5
+echo "configure:8681: checking for struct cmsghdr" >&5
if eval "test \"`echo '$''{'wi_cv_struct_cmsghdr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8468 "configure"
+#line 8687 "configure"
#include "confdefs.h"
/* includes */
@@ -8485,7 +8704,7 @@
; return 0; }
EOF
-if { (eval echo configure:8489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
wi_cv_struct_cmsghdr=yes
@@ -8511,13 +8730,13 @@
fi
echo $ac_n "checking for msg_control field in struct msghdr""... $ac_c" 1>&6
-echo "configure:8515: checking for msg_control field in struct msghdr" >&5
+echo "configure:8734: checking for msg_control field in struct msghdr" >&5
if eval "test \"`echo '$''{'wi_cv_msghdr_control'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8521 "configure"
+#line 8740 "configure"
#include "confdefs.h"
/* includes */
@@ -8537,7 +8756,7 @@
; return 0; }
EOF
-if { (eval echo configure:8541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
wi_cv_msghdr_control=yes
@@ -8563,13 +8782,13 @@
fi
echo $ac_n "checking for msg_accrights field in struct msghdr""... $ac_c" 1>&6
-echo "configure:8567: checking for msg_accrights field in struct msghdr" >&5
+echo "configure:8786: checking for msg_accrights field in struct msghdr" >&5
if eval "test \"`echo '$''{'wi_cv_msghdr_accrights'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8573 "configure"
+#line 8792 "configure"
#include "confdefs.h"
/* includes */
@@ -8589,7 +8808,7 @@
; return 0; }
EOF
-if { (eval echo configure:8593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
wi_cv_msghdr_accrights=yes
@@ -8629,17 +8848,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8633: checking for $ac_hdr" >&5
+echo "configure:8852: checking for $ac_hdr" >&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 8638 "configure"
+#line 8857 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8862: \"$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*
@@ -8667,11 +8886,11 @@
if test "$ac_cv_header_sys_select_h" = yes ; then
echo $ac_n "checking if <sys/select.h> is compatible with <sys/time.h>""... $ac_c" 1>&6
-echo "configure:8671: checking if <sys/select.h> is compatible with <sys/time.h>" >&5
+echo "configure:8890: checking if <sys/select.h> is compatible with <sys/time.h>" >&5
selecth=yes
if test "$ac_cv_header_sys_time_h" = yes ; then
cat > conftest.$ac_ext <<EOF
-#line 8675 "configure"
+#line 8894 "configure"
#include "confdefs.h"
#if defined(AIX) || defined(_AIX) || defined(__HOS_AIX__)
@@ -8691,7 +8910,7 @@
tmval.tv_sec = 0;
; return 0; }
EOF
-if { (eval echo configure:8695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
selecth=yes
else
@@ -8720,12 +8939,12 @@
for ac_func in getwd
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8724: checking for $ac_func" >&5
+echo "configure:8943: 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 8729 "configure"
+#line 8948 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8748,7 +8967,7 @@
; return 0; }
EOF
-if { (eval echo configure:8752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8971: \"$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
@@ -8776,12 +8995,12 @@
for ac_func in getcwd getwd
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8780: checking for $ac_func" >&5
+echo "configure:8999: 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 8785 "configure"
+#line 9004 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8804,7 +9023,7 @@
; return 0; }
EOF
-if { (eval echo configure:8808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9027: \"$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
@@ -8842,12 +9061,12 @@
for ac_func in fstat64 getdomainname gethostname getpass getpassphrase gnu_get_libc_release gnu_get_libc_version inet_aton inet_ntop llseek lseek64 lstat64 memmove mktime open64 pathconf readlink recvfile res_init sendfile setlocale setpgid setpgrp setsid setvbuf sigaction sigsetjmp stat64 strcasecmp strcoll strdup strerror strncoll strstr strtoq symlink sysconf sysctl sysinfo syslog tcgetattr uname waitpid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8846: checking for $ac_func" >&5
+echo "configure:9065: 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 8851 "configure"
+#line 9070 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8870,7 +9089,7 @@
; return 0; }
EOF
-if { (eval echo configure:8874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9093: \"$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
@@ -8897,12 +9116,12 @@
for ac_func in gethostbyaddr_r gethostbyname_r gethostbyname2_r getlogin_r getpwnam_r _posix_getpwnam_r getpwuid_r _posix_getpwuid_r getservbyname_r getservbyport_r gmtime_r localtime_r readdir_r
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8901: checking for $ac_func" >&5
+echo "configure:9120: 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 8906 "configure"
+#line 9125 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8925,7 +9144,7 @@
; return 0; }
EOF
-if { (eval echo configure:8929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9148: \"$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
@@ -8956,12 +9175,12 @@
for ac_func in snprintf vsnprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8960: checking for $ac_func" >&5
+echo "configure:9179: 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 8965 "configure"
+#line 9184 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8984,7 +9203,7 @@
; return 0; }
EOF
-if { (eval echo configure:8988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9207: \"$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
@@ -9012,7 +9231,7 @@
if test "$ac_cv_func_snprintf" != "no" ; then
echo $ac_n "checking if snprintf works correctly""... $ac_c" 1>&6
-echo "configure:9016: checking if snprintf works correctly" >&5
+echo "configure:9235: checking if snprintf works correctly" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SNPRINTF_TERMINATES." 1>&2; exit 1; }
@@ -9031,7 +9250,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 9035 "configure"
+#line 9254 "configure"
#include "confdefs.h"
/* program */
@@ -9069,7 +9288,7 @@
}
EOF
-if { (eval echo configure:9073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -9100,7 +9319,7 @@
echo $ac_n "checking what snprintf() returns""... $ac_c" 1>&6
-echo "configure:9104: checking what snprintf() returns" >&5
+echo "configure:9323: checking what snprintf() returns" >&5
if test "$cross_compiling" = yes; then
# action if cross compiling
@@ -9110,7 +9329,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 9114 "configure"
+#line 9333 "configure"
#include "confdefs.h"
/* program */
@@ -9143,7 +9362,7 @@
}
EOF
-if { (eval echo configure:9147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -9174,7 +9393,7 @@
if [ "$ac_cv_func_snprintf" = "no" ] || [ "$wi_cv_snprintf_terminates" = "no" ] || [ "$wi_cv_snprintf_returns_ptr" = "yes" ] ; then
echo $ac_n "checking for snprintf in -lsnprintf""... $ac_c" 1>&6
-echo "configure:9178: checking for snprintf in -lsnprintf" >&5
+echo "configure:9397: checking for snprintf in -lsnprintf" >&5
ac_lib_var=`echo snprintf'_'snprintf | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9182,7 +9401,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsnprintf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9186 "configure"
+#line 9405 "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
@@ -9193,7 +9412,7 @@
snprintf()
; return 0; }
EOF
-if { (eval echo configure:9197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9416: \"$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
@@ -9226,17 +9445,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9230: checking for $ac_hdr" >&5
+echo "configure:9449: checking for $ac_hdr" >&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 9235 "configure"
+#line 9454 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9459: \"$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*
@@ -9265,12 +9484,12 @@
for ac_func in snprintf vsnprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9269: checking for $ac_func" >&5
+echo "configure:9488: 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 9274 "configure"
+#line 9493 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -9293,7 +9512,7 @@
; return 0; }
EOF
-if { (eval echo configure:9297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9516: \"$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
@@ -9324,7 +9543,7 @@
if [ "$ac_cv_func_snprintf" = "no" ] || [ "$wi_cv_snprintf_terminates" = "no" ] || [ "$wi_cv_snprintf_returns_ptr" = "yes" ] ; then
echo $ac_n "checking for snprintf in -lsnprintf""... $ac_c" 1>&6
-echo "configure:9328: checking for snprintf in -lsnprintf" >&5
+echo "configure:9547: checking for snprintf in -lsnprintf" >&5
ac_lib_var=`echo snprintf'_'snprintf | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9332,7 +9551,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsnprintf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9336 "configure"
+#line 9555 "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
@@ -9343,7 +9562,7 @@
snprintf()
; return 0; }
EOF
-if { (eval echo configure:9347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9566: \"$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
@@ -9376,17 +9595,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9380: checking for $ac_hdr" >&5
+echo "configure:9599: checking for $ac_hdr" >&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 9385 "configure"
+#line 9604 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9609: \"$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*
@@ -9415,12 +9634,12 @@
for ac_func in snprintf vsnprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9419: checking for $ac_func" >&5
+echo "configure:9638: 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 9424 "configure"
+#line 9643 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -9443,7 +9662,7 @@
; return 0; }
EOF
-if { (eval echo configure:9447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9666: \"$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
@@ -9473,7 +9692,7 @@
if test "$ac_cv_func_snprintf" != "no" ; then
echo $ac_n "checking if snprintf works correctly""... $ac_c" 1>&6
-echo "configure:9477: checking if snprintf works correctly" >&5
+echo "configure:9696: checking if snprintf works correctly" >&5
if test "x$ac_cv_header_unistd_h" = x ; then
{ echo "configure: error: Script needs to check for <unistd.h> before calling wi_SNPRINTF_TERMINATES." 1>&2; exit 1; }
@@ -9492,7 +9711,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 9496 "configure"
+#line 9715 "configure"
#include "confdefs.h"
/* program */
@@ -9530,7 +9749,7 @@
}
EOF
-if { (eval echo configure:9534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -9561,7 +9780,7 @@
echo $ac_n "checking what snprintf() returns""... $ac_c" 1>&6
-echo "configure:9565: checking what snprintf() returns" >&5
+echo "configure:9784: checking what snprintf() returns" >&5
if test "$cross_compiling" = yes; then
# action if cross compiling
@@ -9571,7 +9790,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 9575 "configure"
+#line 9794 "configure"
#include "confdefs.h"
/* program */
@@ -9604,7 +9823,7 @@
}
EOF
-if { (eval echo configure:9608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
# action if true
@@ -9641,14 +9860,14 @@
fi
echo $ac_n "checking for sigsetjmp and siglongjmp""... $ac_c" 1>&6
-echo "configure:9645: checking for sigsetjmp and siglongjmp" >&5
+echo "configure:9864: checking for sigsetjmp and siglongjmp" >&5
if eval "test \"`echo '$''{'wi_cv_func_sigsetjmp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9652 "configure"
+#line 9871 "configure"
#include "confdefs.h"
/* includes */
@@ -9671,7 +9890,7 @@
; return 0; }
EOF
-if { (eval echo configure:9675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
wi_cv_func_sigsetjmp=yes
@@ -9701,12 +9920,12 @@
for ac_func in setpgid setpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9705: checking for $ac_func" >&5
+echo "configure:9924: 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 9710 "configure"
+#line 9929 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -9729,7 +9948,7 @@
; return 0; }
EOF
-if { (eval echo configure:9733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9952: \"$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
@@ -9755,7 +9974,7 @@
fi
echo $ac_n "checking if setpgrp behavior needs to be checked""... $ac_c" 1>&6
-echo "configure:9759: checking if setpgrp behavior needs to be checked" >&5
+echo "configure:9978: checking if setpgrp behavior needs to be checked" >&5
if test "x$ac_cv_func_setpgid" = "xyes" ; then
# OK, we will be using setpgid instead of setpgrp then...
echo "$ac_t""no" 1>&6
@@ -9763,7 +9982,7 @@
elif test "x$cross_compiling" = "xyes" ; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:9767: checking whether setpgrp takes no argument" >&5
+echo "configure:9986: checking whether setpgrp takes no argument" >&5
case "`uname -a`" in
*BSD*|*bsd*)
ac_cv_func_setpgrp_void="no"
@@ -9781,7 +10000,7 @@
# We're not cross compiling, so we can try this check
echo "$ac_t""yes" 1>&6
echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:9785: checking whether setpgrp takes no argument" >&5
+echo "configure:10004: 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
@@ -9789,7 +10008,7 @@
{ echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 9793 "configure"
+#line 10012 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
@@ -9809,7 +10028,7 @@
}
EOF
-if { (eval echo configure:9813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10032: \"$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
@@ -9836,13 +10055,13 @@
echo $ac_n "checking whether setvbuf behavior can be checked""... $ac_c" 1>&6
-echo "configure:9840: checking whether setvbuf behavior can be checked" >&5
+echo "configure:10059: checking whether setvbuf behavior can be checked" >&5
if test "x$cross_compiling" = "xyes" ; then
echo "$ac_t""no" 1>&6
else
echo "$ac_t""yes" 1>&6
echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
-echo "configure:9846: checking whether setvbuf arguments are reversed" >&5
+echo "configure:10065: checking whether setvbuf arguments are reversed" >&5
if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -9850,7 +10069,7 @@
ac_cv_func_setvbuf_reversed=no
else
cat > conftest.$ac_ext <<EOF
-#line 9854 "configure"
+#line 10073 "configure"
#include "confdefs.h"
#include <stdio.h>
/* If setvbuf has the reversed format, exit 0. */
@@ -9864,7 +10083,7 @@
exit(0); /* Non-reversed systems segv here. */
}
EOF
-if { (eval echo configure:9868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_setvbuf_reversed=yes
else
@@ -9891,19 +10110,19 @@
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:9895: checking for working alloca.h" >&5
+echo "configure:10114: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9900 "configure"
+#line 10119 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:9907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -9924,12 +10143,12 @@
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:9928: checking for alloca" >&5
+echo "configure:10147: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9933 "configure"
+#line 10152 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -9957,7 +10176,7 @@
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:9961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -9989,12 +10208,12 @@
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:9993: checking whether alloca needs Cray hooks" >&5
+echo "configure:10212: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9998 "configure"
+#line 10217 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -10019,12 +10238,12 @@
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10023: checking for $ac_func" >&5
+echo "configure:10242: 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 10028 "configure"
+#line 10247 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -10047,7 +10266,7 @@
; return 0; }
EOF
-if { (eval echo configure:10051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10270: \"$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
@@ -10074,7 +10293,7 @@
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:10078: checking stack direction for C alloca" >&5
+echo "configure:10297: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10082,7 +10301,7 @@
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 10086 "configure"
+#line 10305 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -10101,7 +10320,7 @@
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:10105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -10142,7 +10361,7 @@
fi
echo $ac_n "checking string parameter to waddstr""... $ac_c" 1>&6
-echo "configure:10146: checking string parameter to waddstr" >&5
+echo "configure:10365: checking string parameter to waddstr" >&5
if eval "test \"`echo '$''{'wi_cv_waddstr_str_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10346,9 +10565,9 @@
# maxx or _maxx
echo $ac_n "checking whether curses structure has maxx or _maxx field""... $ac_c" 1>&6
-echo "configure:10350: checking whether curses structure has maxx or _maxx field" >&5
+echo "configure:10569: checking whether curses structure has maxx or _maxx field" >&5
cat > conftest.$ac_ext <<EOF
-#line 10352 "configure"
+#line 10571 "configure"
#include "confdefs.h"
/* includes */
@@ -10379,7 +10598,7 @@
; return 0; }
EOF
-if { (eval echo configure:10383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""maxx" 1>&6
@@ -10402,12 +10621,12 @@
for ac_func in __getcurx __getcury __getmaxx __getmaxy __getbegx __getbegy
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10406: checking for $ac_func" >&5
+echo "configure:10625: 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 10411 "configure"
+#line 10630 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -10430,7 +10649,7 @@
; return 0; }
EOF
-if { (eval echo configure:10434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10653: \"$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
@@ -10458,9 +10677,9 @@
# getcurx
echo $ac_n "checking for getcurx() functionality in curses library""... $ac_c" 1>&6
-echo "configure:10462: checking for getcurx() functionality in curses library" >&5
+echo "configure:10681: checking for getcurx() functionality in curses library" >&5
cat > conftest.$ac_ext <<EOF
-#line 10464 "configure"
+#line 10683 "configure"
#include "confdefs.h"
/* includes */
@@ -10491,7 +10710,7 @@
; return 0; }
EOF
-if { (eval echo configure:10495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10512,9 +10731,9 @@
# getyx
echo $ac_n "checking for getyx() functionality in curses library""... $ac_c" 1>&6
-echo "configure:10516: checking for getyx() functionality in curses library" >&5
+echo "configure:10735: checking for getyx() functionality in curses library" >&5
cat > conftest.$ac_ext <<EOF
-#line 10518 "configure"
+#line 10737 "configure"
#include "confdefs.h"
/* includes */
@@ -10545,7 +10764,7 @@
; return 0; }
EOF
-if { (eval echo configure:10549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10566,9 +10785,9 @@
# getmaxx
echo $ac_n "checking for getmaxx() functionality in curses library""... $ac_c" 1>&6
-echo "configure:10570: checking for getmaxx() functionality in curses library" >&5
+echo "configure:10789: checking for getmaxx() functionality in curses library" >&5
cat > conftest.$ac_ext <<EOF
-#line 10572 "configure"
+#line 10791 "configure"
#include "confdefs.h"
/* includes */
@@ -10598,7 +10817,7 @@
; return 0; }
EOF
-if { (eval echo configure:10602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10619,9 +10838,9 @@
# getmaxyx
echo $ac_n "checking for getmaxyx() functionality in curses library""... $ac_c" 1>&6
-echo "configure:10623: checking for getmaxyx() functionality in curses library" >&5
+echo "configure:10842: checking for getmaxyx() functionality in curses library" >&5
cat > conftest.$ac_ext <<EOF
-#line 10625 "configure"
+#line 10844 "configure"
#include "confdefs.h"
/* includes */
@@ -10651,7 +10870,7 @@
; return 0; }
EOF
-if { (eval echo configure:10655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10672,9 +10891,9 @@
# getbegx
echo $ac_n "checking for getbegx() functionality in curses library""... $ac_c" 1>&6
-echo "configure:10676: checking for getbegx() functionality in curses library" >&5
+echo "configure:10895: checking for getbegx() functionality in curses library" >&5
cat > conftest.$ac_ext <<EOF
-#line 10678 "configure"
+#line 10897 "configure"
#include "confdefs.h"
/* includes */
@@ -10705,7 +10924,7 @@
; return 0; }
EOF
-if { (eval echo configure:10709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10726,9 +10945,9 @@
# getbegyx
echo $ac_n "checking for getbegyx() functionality in curses library""... $ac_c" 1>&6
-echo "configure:10730: checking for getbegyx() functionality in curses library" >&5
+echo "configure:10949: checking for getbegyx() functionality in curses library" >&5
cat > conftest.$ac_ext <<EOF
-#line 10732 "configure"
+#line 10951 "configure"
#include "confdefs.h"
/* includes */
@@ -10758,7 +10977,7 @@
; return 0; }
EOF
-if { (eval echo configure:10762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10779,9 +10998,9 @@
# touchwin
echo $ac_n "checking for touchwin() functionality in curses library""... $ac_c" 1>&6
-echo "configure:10783: checking for touchwin() functionality in curses library" >&5
+echo "configure:11002: checking for touchwin() functionality in curses library" >&5
cat > conftest.$ac_ext <<EOF
-#line 10785 "configure"
+#line 11004 "configure"
#include "confdefs.h"
/* includes */
@@ -10809,7 +11028,7 @@
; return 0; }
EOF
-if { (eval echo configure:10813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10830,9 +11049,9 @@
# beep
echo $ac_n "checking for beep() functionality in curses library""... $ac_c" 1>&6
-echo "configure:10834: checking for beep() functionality in curses library" >&5
+echo "configure:11053: checking for beep() functionality in curses library" >&5
cat > conftest.$ac_ext <<EOF
-#line 10836 "configure"
+#line 11055 "configure"
#include "confdefs.h"
/* includes */
@@ -10859,7 +11078,7 @@
; return 0; }
EOF
-if { (eval echo configure:10863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10881,12 +11100,12 @@
for ac_func in keypad nodelay curs_set doupdate wnoutrefresh
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10885: checking for $ac_func" >&5
+echo "configure:11104: 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 10890 "configure"
+#line 11109 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -10909,7 +11128,7 @@
; return 0; }
EOF
-if { (eval echo configure:10913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11132: \"$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
@@ -10946,7 +11165,7 @@
echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:10950: checking for long file names" >&5
+echo "configure:11169: checking for long file names" >&5
if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10990,7 +11209,7 @@
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:10994: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:11213: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -11020,7 +11239,7 @@
# Extract the first word of ""gtar"", so it can be a program name with args.
set dummy "gtar"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:11024: checking for $ac_word" >&5
+echo "configure:11243: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11059,7 +11278,7 @@
# Extract the first word of ""tar"", so it can be a program name with args.
set dummy "tar"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:11063: checking for $ac_word" >&5
+echo "configure:11282: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11107,7 +11326,7 @@
echo $ac_n "checking how to create TAR files""... $ac_c" 1>&6
-echo "configure:11111: checking how to create TAR files" >&5
+echo "configure:11330: checking how to create TAR files" >&5
x=""
if [ -x /usr/bin/what ] ; then
x=`/usr/bin/what "$TAR" 2>&1 | sed -n 's/.*pax.*/pax/g;/pax/p'`
@@ -11165,7 +11384,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:11169: checking for $ac_word" >&5
+echo "configure:11388: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11195,7 +11414,7 @@
echo $ac_n "checking for ar""... $ac_c" 1>&6
-echo "configure:11199: checking for ar" >&5
+echo "configure:11418: checking for ar" >&5
AR="ar"
if [ "x$cross_compiling" = "xyes" ] ; then
machine=`${CC-gcc} -dumpmachine 2>/dev/null`
@@ -11226,7 +11445,7 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:11230: checking for a BSD compatible install" >&5
+echo "configure:11449: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -11282,7 +11501,7 @@
# Extract the first word of ""pwd"", so it can be a program name with args.
set dummy "pwd"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:11286: checking for $ac_word" >&5
+echo "configure:11505: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_wi_PWD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11319,13 +11538,13 @@
if test "x$use_ccdv" = "xno" ; then
echo $ac_n "checking for ccdv""... $ac_c" 1>&6
-echo "configure:11323: checking for ccdv" >&5
+echo "configure:11542: checking for ccdv" >&5
echo "$ac_t""(disabled)" 1>&6
else
unset wi_cv_path_ccdv # can't use cache if it was a temp prog last time
wi_used_cache_path_ccdv="yes"
echo $ac_n "checking for ccdv""... $ac_c" 1>&6
-echo "configure:11329: checking for ccdv" >&5
+echo "configure:11548: checking for ccdv" >&5
if eval "test \"`echo '$''{'wi_cv_path_ccdv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11835,7 +12054,7 @@
echo $ac_n "checking if shell can test for symlinks""... $ac_c" 1>&6
-echo "configure:11839: checking if shell can test for symlinks" >&5
+echo "configure:12058: checking if shell can test for symlinks" >&5
if eval "test \"`echo '$''{'wi_cv_shell_test_symlinks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12318,25 +12537,25 @@
echo $ac_n "checking CC""... $ac_c" 1>&6
-echo "configure:12322: checking CC" >&5
+echo "configure:12541: checking CC" >&5
echo "$ac_t""$CC" 1>&6
echo $ac_n "checking CFLAGS""... $ac_c" 1>&6
-echo "configure:12325: checking CFLAGS" >&5
+echo "configure:12544: checking CFLAGS" >&5
echo "$ac_t""$CFLAGS" 1>&6
echo $ac_n "checking CPPFLAGS""... $ac_c" 1>&6
-echo "configure:12328: checking CPPFLAGS" >&5
+echo "configure:12547: checking CPPFLAGS" >&5
echo "$ac_t""$CPPFLAGS" 1>&6
echo $ac_n "checking DEFS""... $ac_c" 1>&6
-echo "configure:12331: checking DEFS" >&5
+echo "configure:12550: checking DEFS" >&5
echo "$ac_t""$DEFS" 1>&6
echo $ac_n "checking NDEFS""... $ac_c" 1>&6
-echo "configure:12334: checking NDEFS" >&5
+echo "configure:12553: checking NDEFS" >&5
echo "$ac_t""$NDEFS" 1>&6
echo $ac_n "checking LDFLAGS""... $ac_c" 1>&6
-echo "configure:12337: checking LDFLAGS" >&5
+echo "configure:12556: checking LDFLAGS" >&5
echo "$ac_t""$LDFLAGS" 1>&6
echo $ac_n "checking LIBS""... $ac_c" 1>&6
-echo "configure:12340: checking LIBS" >&5
+echo "configure:12559: checking LIBS" >&5
echo "$ac_t""$LIBS" 1>&6
#
# Also take the opportunity to do some post-configure clean-up
@@ -12495,12 +12714,12 @@
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
s%@mandir@%$mandir%g
+s%@CC@%$CC%g
s%@NDEFS@%$NDEFS%g
s%@OS@%$OS%g
s%@host@%$host%g
s%@SYS@%$SYS%g
s%@HOME_OS@%$HOME_OS%g
-s%@CC@%$CC%g
s%@CPP@%$CPP%g
s%@STRIP@%$STRIP%g
s%@OBJEXT@%$OBJEXT%g
--- a/ncftp-3.2.6/configure.in
+++ b/ncftp-3.2.6/configure.in
@@ -20,6 +20,7 @@
dnl ---------------------------------------------------------------------------
dnl
wi_ENV_VAR_MESSAGES
+wi_PROG_CC
wi_OS_VAR
case "$os" in
@@ -30,7 +31,6 @@
if test -f sh/install-sh ; then chmod 755 sh/*.sh sh/config.* sh/install-sh ; fi
AC_CONFIG_AUX_DIR([sh])
-AC_PROG_CC
wi_CC_PRECOMP
wi_REQUEST_NO_Y2K_WARNINGS
wi_CFLAGS_LFS_OR_LFS64
@@ -148,6 +148,13 @@
wi_USE_LONG_LONG
wi_STRUCT_TIMEVAL_FIELD_TYPES
wi_UNISTD_FUNC_PARAM_TYPES
+wi_CHECK_TYPE(negative_control_t, long, [])
+wi_CHECK_TYPE(ssize_t, long, [])
+wi_CHECK_TYPE(sa_family_t, unsigned short, [#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+])
wi_FUNC_SELECT_ARGTYPES
wi_STRUCT_STAT64
wi_TYPE_SIG_ATOMIC_T
--- a/ncftp-3.2.6/doc/CHANGELOG.txt
+++ b/ncftp-3.2.6/doc/CHANGELOG.txt
@@ -1,7 +1,7 @@
NcFTP Change Log:
================
-3.2.6, 2016-09-23
+3.2.6, 2016-12-04
+ If a recursive download operation is also requested with delete mode,
attempt to remove empty directories after all files have completed
--- a/ncftp-3.2.6/libncftp/c_opennologin.c
+++ b/ncftp-3.2.6/libncftp/c_opennologin.c
@@ -77,10 +77,10 @@
elapsed = (int) (t1 - t0);
if (elapsed < cip->redialDelay) {
PrintF(cip, "Sleeping %u seconds.\n",
- (unsigned) cip->redialDelay - elapsed);
+ (unsigned int) (cip->redialDelay - elapsed));
if (cip->redialStatusProc != 0)
(*cip->redialStatusProc)(cip, kRedialStatusSleeping, cip->redialDelay - elapsed);
- (void) sleep((unsigned) cip->redialDelay - elapsed);
+ (void) sleep((unsigned int) (cip->redialDelay - elapsed));
}
}
}
--- a/ncftp-3.2.6/libncftp/ftp.c
+++ b/ncftp-3.2.6/libncftp/ftp.c
@@ -17,7 +17,14 @@
const char gLibNcFTPVersion[] = kLibraryVersion;
#ifdef NO_SIGNALS
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-const-variable"
+#endif
static const char gNoSignalsMarker[] = "@(#) LibNcFTP - NO_SIGNALS";
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
#else
static int gGotSig = 0;
@@ -31,8 +38,15 @@
#ifndef lint
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-const-variable"
+#endif
static const char gCopyright[] = "@(#) LibNcFTP Copyright 1995-2001, by Mike Gleason. All rights reserved.";
+#ifdef __clang__
+#pragma clang diagnostic pop
#endif
+#endif
#ifdef HAVE_LIBSOCKS5
# define SOCKS 5
@@ -210,7 +224,7 @@
cip->servCtlAddr.sin_addr.s_addr = ip_address.s_addr;
} else {
hpok = 1;
- cip->servCtlAddr.sin_family = hp.h_addrtype;
+ cip->servCtlAddr.sin_family = (sa_family_t) hp.h_addrtype;
/* We'll fill in the rest of the structure below. */
}
@@ -980,6 +994,7 @@
int setsbufs;
size_t rbs, sbs;
int passiveAttemptsRemaining = cip->maxNumberOfSuccessivePASVAttempts;
+ char servDataAddrStr[64];
/* Before we can transfer any data, and before we even ask the
* remote server to start transferring via RETR/NLST/etc, we have
@@ -1087,6 +1102,7 @@
goto bad;
}
FTPFixServerDataAddr(cip);
+ AddrToAddrStr(servDataAddrStr, sizeof(servDataAddrStr), &cip->servDataAddr, 0, NULL);
#ifdef HAVE_LIBSOCKS
cip->ourDataAddr.sin_port = 0;
@@ -1107,13 +1123,14 @@
if (result == kTimeoutErr) {
if (mode == kFallBackToSendPortMode) {
- FTPLogError(cip, kDontPerror, "Data connection timed out.\n");
+ FTPLogError(cip, kDontPerror, "Data connection to %s timed out.\n", servDataAddrStr);
if (passiveAttemptsRemaining == 0) {
- FTPLogError(cip, kDontPerror, "Falling back to PORT instead of PASV mode.\n");
(void) DisposeSocket(dataSocket);
dataSocket = kClosedFileDescriptor;
if (cip->hasPASV == kCommandAvailabilityUnknown)
cip->hasPASV = kCommandNotAvailable;
+ if (cip->hasPASV == kCommandNotAvailable)
+ FTPLogError(cip, kDontPerror, "Falling back to PORT instead of PASV mode.\n");
goto tryPort2;
}
} else {
@@ -1147,19 +1164,21 @@
goto bad;
}
if ((mode == kFallBackToSendPortMode) && (passiveAttemptsRemaining == 0)) {
- FTPLogError(cip, kDoPerror, "connect failed.\n");
- FTPLogError(cip, kDontPerror, "Falling back to PORT instead of PASV mode.\n");
+ FTPLogError(cip, kDoPerror, "connect to %s failed.\n", servDataAddrStr);
(void) DisposeSocket(dataSocket);
dataSocket = kClosedFileDescriptor;
if (cip->hasPASV == kCommandAvailabilityUnknown)
cip->hasPASV = kCommandNotAvailable;
+ if (cip->hasPASV == kCommandNotAvailable)
+ FTPLogError(cip, kDontPerror, "Falling back to PORT instead of PASV mode.\n");
goto tryPort2;
}
- FTPLogError(cip, kDoPerror, "connect failed.\n");
+ FTPLogError(cip, kDoPerror, "connect to %s failed.\n", servDataAddrStr);
result = kErrConnectDataSocket;
cip->errNo = kErrConnectDataSocket;
} else {
/* Success, break loop because we do not need to do PASV again. */
+ PrintF(cip, "Connected to %s for PASV.\n", servDataAddrStr);
break;
}
--- a/ncftp-3.2.6/libncftp/ftw.c
+++ b/ncftp-3.2.6/libncftp/ftw.c
@@ -400,7 +400,7 @@
#ifdef HAVE_PATHCONF
nmx = pathconf(ftwip->curPath, _PC_NAME_MAX);
if (nmx >= 256)
- debufsize = nmx;
+ debufsize = (size_t) nmx;
#endif
debufsize += sizeof(struct dirent) + 8;
ftwip->direntbuf = calloc(debufsize, (size_t) 1);
--- a/ncftp-3.2.6/libncftp/io_getmem.c
+++ b/ncftp-3.2.6/libncftp/io_getmem.c
@@ -216,7 +216,7 @@
break;
}
- numberOfBytesLeftInMemBuf -= nread;
+ numberOfBytesLeftInMemBuf -= (size_t) nread;
if (numberOfBytesLeftInMemBuf == 0) {
/* Done (but maybe not at EOF of remote file). */
atEOF = 0;
--- a/ncftp-3.2.6/libncftp/io_list.c
+++ b/ncftp-3.2.6/libncftp/io_list.c
@@ -75,7 +75,11 @@
break;
}
- (void) write(outfd, line, (write_size_t) strlen(line));
+ if (write(outfd, line, (write_size_t) strlen(line)) < 0) {
+ result = kErrLISTFailed;
+ cip->errNo = kErrLISTFailed;
+ break;
+ }
}
DisposeSReadlineInfo(&lsSrl);
--- a/ncftp-3.2.6/libncftp/io_sendfile.c
+++ b/ncftp-3.2.6/libncftp/io_sendfile.c
@@ -377,7 +377,7 @@
errno = oerrno;
} else {
off1 = off;
- nwrote = sendfile(ofd, ifd, &off, (size_t) ntoread);
+ nwrote = (ssize_t) sendfile(ofd, ifd, &off, (size_t) ntoread);
oerrno = errno;
}
@@ -714,7 +714,7 @@
errno = ETIMEDOUT;
goto umodebreak;
}
- nwrote = write(ofd, dspp->buf + (nread - ntowrite), ntowrite);
+ nwrote = (ssize_t) write(ofd, dspp->buf + (nread - ntowrite), (size_t) ntowrite);
if (nwrote < 0) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) {
FD_ZERO(&wfds); FD_SET(ofd, &wfds);
--- a/ncftp-3.2.6/libncftp/io_util.c
+++ b/ncftp-3.2.6/libncftp/io_util.c
@@ -166,7 +166,7 @@
int xferTimeout;
int ocancelXfer;
- xferTimeout = cip->xferTimeout;
+ xferTimeout = (int) cip->xferTimeout;
if (xferTimeout < 1)
return (1);
@@ -245,7 +245,7 @@
int xferTimeout;
int ocancelXfer;
- xferTimeout = cip->xferTimeout;
+ xferTimeout = (int) cip->xferTimeout;
if (xferTimeout < 1)
return (1);
--- a/ncftp-3.2.6/libncftp/ncftp.h
+++ b/ncftp-3.2.6/libncftp/ncftp.h
@@ -13,7 +13,7 @@
{
#endif /* __cplusplus */
-#define kLibraryVersion "@(#) LibNcFTP 3.2.6 (October 30, 2016)"
+#define kLibraryVersion "@(#) LibNcFTP 3.2.6 (November 12, 2016)"
/* This is used to verify validty of the data passed in. */
#define kLibraryMagic "LibNcFTP 3.2.6"
--- a/ncftp-3.2.6/libncftp/open.c
+++ b/ncftp-3.2.6/libncftp/open.c
@@ -978,10 +978,10 @@
elapsed = (int) (t1 - t0);
if (elapsed < cip->redialDelay) {
PrintF(cip, "Sleeping %u seconds.\n",
- (unsigned) cip->redialDelay - elapsed);
+ (unsigned int) (cip->redialDelay - elapsed));
if (cip->redialStatusProc != 0)
(*cip->redialStatusProc)(cip, kRedialStatusSleeping, cip->redialDelay - elapsed);
- (void) sleep((unsigned) cip->redialDelay - elapsed);
+ (void) sleep((unsigned int) (cip->redialDelay - elapsed));
}
}
}
--- a/ncftp-3.2.6/libncftp/rftw.c
+++ b/ncftp-3.2.6/libncftp/rftw.c
@@ -110,7 +110,7 @@
nSubdirs = 0;
++ftwip->numDirs;
- ftwip->depth = depth;
+ ftwip->depth = (size_t) depth;
if (ftwip->maxDepth < ftwip->depth) {
ftwip->maxDepth = ftwip->depth;
}
--- a/ncftp-3.2.6/libncftp/rglobr.c
+++ b/ncftp-3.2.6/libncftp/rglobr.c
@@ -94,7 +94,7 @@
fi.mdtm = ftwip->curStat.st_mtime;
fi.size = (longest_int) ftwip->curStat.st_size;
fi.type = ftwip->curType;
- fi.mode = ftwip->curStat.st_mode;
+ fi.mode = (int) ftwip->curStat.st_mode;
AddFileInfo(xinfop->fileList, &fi);
/*
--- a/ncftp-3.2.6/libncftp/u_decodehost.c
+++ b/ncftp-3.2.6/libncftp/u_decodehost.c
@@ -80,7 +80,7 @@
port = atoi(cp);
if ((port <= 0) || (port > 65535))
return (-2);
- cip->port = port;
+ cip->port = (unsigned int) port;
}
(void) STRNCPY(cip->host, hcp);
--- a/ncftp-3.2.6/libncftp/u_decodeurl.c
+++ b/ncftp-3.2.6/libncftp/u_decodeurl.c
@@ -167,7 +167,7 @@
URLCopyToken(portstr, sizeof(portstr), cp + 1, (size_t) (hend - (cp + 1)));
port = atoi(portstr);
if (port > 0)
- cip->port = port;
+ cip->port = (unsigned int) port;
}
*hend = (char) sc;
--- a/ncftp-3.2.6/libncftp/u_getpass.c
+++ b/ncftp-3.2.6/libncftp/u_getpass.c
@@ -67,7 +67,7 @@
if (tcgetattr(fileno(stdout), &old_ti) != 0)
return (pwbuf);
new_ti = old_ti;
- new_ti.c_lflag &= ~ECHO;
+ new_ti.c_lflag &= (unsigned int) ~ECHO;
if (tcsetattr(fileno(stdout), TCSAFLUSH, &new_ti) != 0)
return (pwbuf);
(void) FGets(pwbuf, pwbufsize, stdin);
--- a/ncftp-3.2.6/libncftp/u_misc.c
+++ b/ncftp-3.2.6/libncftp/u_misc.c
@@ -290,7 +290,7 @@
dirSepStr[0] = (char) dirSep;
dirSepStr[1] = '\0';
dEnd = Strnpcpy(dst, parentDir, dsize);
- nUsed = (dEnd - dst);
+ nUsed = (size_t) (dEnd - dst);
if (nUsed >= (dsize - 3)) {
#ifdef ENAMETOOLONG
errno = ENAMETOOLONG;
--- a/ncftp-3.2.6/libncftp/u_pathcat.c
+++ b/ncftp-3.2.6/libncftp/u_pathcat.c
@@ -290,7 +290,7 @@
*cp++ = '/';
}
*cp = '\0';
- (void) Strnpcat(cp, src, sizeof(tmp) - (cp - tmp));
+ (void) Strnpcat(cp, src, sizeof(tmp) - (size_t) (cp - tmp));
CompressPath(dst, tmp, dsize, dosCompat);
} /* PathCat */
@@ -370,7 +370,7 @@
*cp++ = '/';
}
*cp = '\0';
- (void) Strnpcat(cp, src, dsize - (cp - tmp));
+ (void) Strnpcat(cp, src, dsize - (size_t) (cp - tmp));
CompressPath(dst, tmp, dsize, dosCompat);
free(tmp);
return (0);
--- a/ncftp-3.2.6/libncftp/u_scram.c
+++ b/ncftp-3.2.6/libncftp/u_scram.c
@@ -24,7 +24,7 @@
ch = src[i];
if (ch == 0)
break;
- dst[i] = (unsigned char) (ch ^ (int) (k2[i % (int) keyLen]));
+ dst[i] = (unsigned char) (ch ^ (unsigned int) (k2[i % (int) keyLen]));
}
dst[i] = '\0';
} /* Scramble */
--- a/ncftp-3.2.6/libncftp/wincfg.h
+++ b/ncftp-3.2.6/libncftp/wincfg.h
@@ -16,6 +16,7 @@
#define recv_size_t unsigned int
#define send_return_t int
#define send_size_t unsigned int
+#define sa_family_t short
#define SELECT_TYPE_ARG1 int
--- a/ncftp-3.2.6/ncftp/cmds.c
+++ b/ncftp-3.2.6/ncftp/cmds.c
@@ -63,6 +63,10 @@
/* Did the user stupidly type passwords, etc., on our command line? */
int gUserTypedSensitiveInfoAtShellSoDoNotSaveItToDisk = 0;
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
typedef struct SpoolCmdInfo {
int xtype;
int deleteFlag;
@@ -73,6 +77,9 @@
const char *rcwd;
int base;
} SpoolCmdInfo;
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
extern FTPConnectionInfo gConn;
extern char gOurDirectoryPath[];
@@ -239,7 +246,8 @@
(void) fflush(stdout);
(void) fflush(stdin);
(void) memset(ans, 0, sizeof(ans));
- (void) fgets(ans, sizeof(ans) - 1, stdin);
+ if (fgets(ans, sizeof(ans) - 1, stdin) == NULL)
+ ans[0] = '\0';
Trace(0, "%s%s", buf, ans);
switch ((int) ans[0]) {
case 'y':
@@ -1156,7 +1164,8 @@
printf(" [R!]esume all?");
printf(" [S!]kip all? [C]ancel > ");
fflush(stdin);
- (void) fgets(ans, sizeof(ans) - 1, stdin);
+ if (fgets(ans, sizeof(ans) - 1, stdin) == NULL)
+ ans[0] = '\0';
switch ((int) ans[0]) {
case 'c':
case 'C':
@@ -1224,7 +1233,8 @@
(void) memset(newname, 0, sizeof(newname));
printf("\tSave as: ");
fflush(stdin);
- (void) fgets(newname, sizeof(newname) - 1, stdin);
+ if (fgets(newname, sizeof(newname) - 1, stdin) == NULL)
+ newname[0] = '\0';
newname[strlen(newname) - 1] = '\0';
if (newname[0] == '\0') {
/* Nevermind. */
@@ -1440,7 +1450,14 @@
(void) sprintf(spec, "%%-%ds",
(j < nCols - 1) ? widestName : widestName - 2
);
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
(void) printf(spec, cmdnames[k]);
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
}
}
(void) printf("\n");
@@ -1667,9 +1684,8 @@
Trace(0, "Selected bookmark from editor: [%s]\n", selectedBmName);
}
}
- return (0);
}
- return (-1);
+ return (0);
#endif /* ! Windows */
} /* RunBookmarkEditor */
@@ -2079,7 +2095,8 @@
fprintf(stderr, "Cannot run command: %s\n", cmd);
#else
Trace(0, "Sys: %s\n", cmd);
- (void) system(cmd);
+ if ((i = system(cmd)) != 0)
+ Trace(0, "Sys: %s = %d\n", cmd, i);
#endif
} /* Sys */
@@ -2675,7 +2692,8 @@
/* If the bookmark specified a local directory, change to it now. */
if ((gLoadedBm != 0) && (gBm.ldir[0] != '\0')) {
- (void) chdir(gBm.ldir);
+ if (chdir(gBm.ldir) != 0)
+ Trace(-1, "Could not chdir to %s.\n", gBm.ldir);
(void) STRNCPY(gPrevLocalCWD, gLocalCWD);
if (FTPGetLocalCWD(gLocalCWD, sizeof(gLocalCWD)) != NULL) {
Trace(-1, "Current local directory is %s.\n", gLocalCWD);
@@ -3124,7 +3142,8 @@
if (remotesize < localsize)
printf(" [R!]esume all?");
printf(" [S!]kip all? [C]ancel > ");
- (void) fgets(ans, sizeof(ans) - 1, stdin);
+ if (fgets(ans, sizeof(ans) - 1, stdin) == NULL)
+ ans[0] = '\0';
switch ((int) ans[0]) {
case 'c':
case 'C':
@@ -3192,7 +3211,8 @@
(void) memset(newname, 0, sizeof(newname));
printf("\tSave as: ");
fflush(stdin);
- (void) fgets(newname, sizeof(newname) - 1, stdin);
+ if (fgets(newname, sizeof(newname) - 1, stdin) == NULL)
+ newname[0] = '\0';
newname[strlen(newname) - 1] = '\0';
if (newname[0] == '\0') {
/* Nevermind. */
--- a/ncftp-3.2.6/ncftp/gl_getline.c
+++ b/ncftp-3.2.6/ncftp/gl_getline.c
@@ -139,13 +139,11 @@
# define IsLocalPathDelim(c) ((c == LOCAL_PATH_DELIM) || (c == LOCAL_PATH_ALTDELIM))
# define UNC_PATH_PREFIX "//"
# define IsUNCPrefixed(s) (IsLocalPathDelim(s[0]) && IsLocalPathDelim(s[1]))
-/* _StrFindLocalPathDelim(a) -- use windows-specific function; understands '/' and '\\' */
-/* _StrRFindLocalPathDelim(a) -- use windows-specific function; understands '/' and '\\' */
# else
# define LOCAL_PATH_DELIM '/'
# define LOCAL_PATH_DELIM_STR "/"
-# define _StrFindLocalPathDelim(a) strchr(a, LOCAL_PATH_DELIM)
-# define _StrRFindLocalPathDelim(a) strrchr(a, LOCAL_PATH_DELIM)
+# define My_StrFindLocalPathDelim(a) strchr(a, LOCAL_PATH_DELIM)
+# define My_StrRFindLocalPathDelim(a) strrchr(a, LOCAL_PATH_DELIM)
# define IsLocalPathDelim(c) (c == LOCAL_PATH_DELIM)
# endif
#endif
@@ -502,12 +500,14 @@
gl_putc(int c)
{
char ch = (char) (unsigned char) c;
+ long rc;
- (void) write(1, &ch, (write_size_t) 1);
+ rc = (long) write(1, &ch, (write_size_t) 1);
if (ch == '\n') {
ch = '\r';
- (void) write(1, &ch, (write_size_t) 1); /* RAW mode needs '\r', does not hurt */
+ rc = (long) write(1, &ch, (write_size_t) 1); /* RAW mode needs '\r', does not hurt */
}
+ if (rc == -666) gl_error("\nDon't care about compiler warning\n");
}
/******************** fairly portable part *********************************/
@@ -553,7 +553,8 @@
if (buf) {
len = (write_size_t) strlen(buf);
- (void) write(1, buf, len);
+ if (write(1, buf, len) < 0)
+ gl_error("\ngl_puts failed\n");
}
#endif
}
@@ -567,7 +568,8 @@
write_size_t len = (write_size_t) strlen(buf);
gl_cleanup();
- (void) write(2, buf, len);
+ if (write(2, buf, len) < 0)
+ exit(2);
exit(1);
}
@@ -2173,9 +2175,9 @@
-#ifndef _StrFindLocalPathDelim
+#ifndef My_StrFindLocalPathDelim
static char *
-_StrRFindLocalPathDelim(const char *src) /* TODO: optimize */
+My_StrRFindLocalPathDelim(const char *src) /* TODO: optimize */
{
const char *last;
int c;
@@ -2376,7 +2378,7 @@
if (dir == NULL) {
dirtoopen1 = NULL;
- cp = _StrRFindLocalPathDelim(start);
+ cp = My_StrRFindLocalPathDelim(start);
if (cp == start) {
dirtoopen = LOCAL_PATH_DELIM_STR; /* root dir */
filepfxoffset = 1;
@@ -2504,7 +2506,7 @@
if (searchHandle == NULL) {
dirtoopen1 = NULL;
dirtoopen2 = NULL;
- cp = _StrRFindLocalPathDelim(start);
+ cp = My_StrRFindLocalPathDelim(start);
if (cp == start) {
dirtoopen = LOCAL_PATH_DELIM_STR; /* root dir */
filepfxoffset = 1;
--- a/ncftp-3.2.6/ncftp/ls.c
+++ b/ncftp-3.2.6/ncftp/ls.c
@@ -402,6 +402,11 @@
#endif
}
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+
#ifdef HAVE_SNPRINTF
(void) snprintf(
plugstr,
@@ -415,6 +420,10 @@
plugspec,
diritemp->plug
);
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic pop
#endif
(void) fprintf(stream, "%s %12s %s%s %s%s%s%s%s\n",
--- a/ncftp-3.2.6/ncftp/ls.h
+++ b/ncftp-3.2.6/ncftp/ls.h
@@ -7,12 +7,21 @@
#define kLsCacheItemLifetime 900 /* seconds */
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
typedef struct LsCacheItem {
char *itempath;
FTPFileInfoList fil;
time_t expiration;
int hits;
} LsCacheItem;
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
#define kLsCacheSize 32
--- a/ncftp-3.2.6/ncftp/progress.c
+++ b/ncftp-3.2.6/ncftp/progress.c
@@ -29,6 +29,11 @@
#endif /* ncftp */
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+
double
FileSize(const double size, const char **uStr0, double *const uMult0)
{
@@ -499,3 +504,7 @@
break;
}
} /* PrPhilBar */
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
--- a/ncftp-3.2.6/ncftp/readln.c
+++ b/ncftp-3.2.6/ncftp/readln.c
@@ -135,8 +135,8 @@
osigpipe = NcSignal(SIGPIPE, SIG_IGN);
infp = popen(ncftpbookmarks, "r");
if (infp != NULL) {
- columns = 0;
- (void) fscanf(infp, "%d", &columns);
+ if (fscanf(infp, "%d", &columns) != 1)
+ columns = 0;
while (getc(infp) != EOF) {}
(void) pclose(infp);
--- a/ncftp-3.2.6/ncftp/shell.h
+++ b/ncftp-3.2.6/ncftp/shell.h
@@ -6,10 +6,9 @@
*/
typedef struct ArgvInfo {
- char *cargv[255];
+ char *cargv[256];
int cargc;
int noglobargv[255];
- int reserved;
char argbuf[2048];
} ArgvInfo, *ArgvInfoPtr;
@@ -39,6 +38,10 @@
* table, so each command doesn't have to check the number of
* arguments and print it's own usage messages if it doesn't want to.
*/
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
typedef struct Command {
const char *name;
CmdProc proc;
@@ -46,6 +49,9 @@
int flags;
int minargs, maxargs;
} Command;
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
/* Parameter to GetCommandOrMacro(). */
#define kAbbreviatedMatchAllowed 0
--- a/ncftp-3.2.6/ncftp/spoolutil.c
+++ b/ncftp-3.2.6/ncftp/spoolutil.c
@@ -102,6 +102,8 @@
c = 0;
for (cp = line; *cp; cp++) {
c = (int) *cp;
+ if (c == '\r')
+ continue;
if ((c == '\n') && (cp[1] != '\0')) {
if (putc('\\', ofp) == EOF)
return (-1);
@@ -182,7 +184,7 @@
SpoolName(sname, snsize, 'z', gSpoolSerial, when);
if (SpoolFilePath(initialpath, ipsize, sdir, sname) == NULL) return NULL;
#if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
- if ((fp = _fsopen(finalpath, FOPEN_READ_BINARY, _SH_DENYNO)) != NULL)
+ if ((fp = _fsopen(finalpath, FOPEN_READ_TEXT, _SH_DENYNO)) != NULL)
#else
if ((fp = fopen(finalpath, "r")) != NULL)
#endif
@@ -196,7 +198,7 @@
SpoolName(sname, snsize, op[0], gSpoolSerial, when);
if (SpoolFilePath(finalpath, fpsize, sdir, sname) == NULL) return NULL;
#if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
- if ((fp = _fsopen(finalpath, FOPEN_READ_BINARY, _SH_DENYNO)) != NULL)
+ if ((fp = _fsopen(finalpath, FOPEN_READ_TEXT, _SH_DENYNO)) != NULL)
#else
if ((fp = fopen(finalpath, "r")) != NULL)
#endif
@@ -224,7 +226,7 @@
#endif
return (fp);
-} /* OpenSpoolFile( */
+} /* OpenSpoolFile */
--- a/ncftp-3.2.6/ncftp/version.c
+++ b/ncftp-3.2.6/ncftp/version.c
@@ -6,7 +6,7 @@
/******************************************************************************/
-const char gVersion[] = "@(#) NcFTP 3.2.6/548 Nov 11 2016, 12:11 PM";
+const char gVersion[] = "@(#) NcFTP 3.2.6/575 Dec 04 2016, 01:00 PM";
/******************************************************************************/
--- a/ncftp-3.2.6/sh/mksrctar.sh
+++ b/ncftp-3.2.6/sh/mksrctar.sh
@@ -54,6 +54,7 @@
/sio\/configure$/d
/Strn\/configure$/d
/\.git$/d
+/\.svn$/d
/DerivedData/d
/xcuserdata/d
/\.xcuserstate/d
--- a/ncftp-3.2.6/sh_util/gpshare.c
+++ b/ncftp-3.2.6/sh_util/gpshare.c
@@ -402,7 +402,7 @@
} else if (strncmp(line, "account", 7) == 0) {
(void) STRNCPY(cip->acct, line + 8);
} else if (strncmp(line, "port", 4) == 0) {
- cip->port = atoi(line + 5);
+ cip->port = (unsigned int) atoi(line + 5);
}
}
if ((fp != NULL) && (fp != stdin))
@@ -469,13 +469,13 @@
for (parse = buf; (tok = strtok(parse, ", \n\t\r")) != NULL; parse = NULL) {
nt++;
if (nt == 1) {
- cip->xferTimeout = atoi(tok);
- cip->connTimeout = atoi(tok);
- cip->ctrlTimeout = atoi(tok);
+ cip->xferTimeout = (unsigned int) atoi(tok);
+ cip->connTimeout = (unsigned int) atoi(tok);
+ cip->ctrlTimeout = (unsigned int) atoi(tok);
} else if (nt == 2) {
- cip->connTimeout = atoi(tok);
+ cip->connTimeout = (unsigned int) atoi(tok);
} else if (nt == 3) {
- cip->ctrlTimeout = atoi(tok);
+ cip->ctrlTimeout = (unsigned int) atoi(tok);
}
}
} /* SetTimeouts */
--- a/ncftp-3.2.6/sh_util/ncftpbatch.c
+++ b/ncftp-3.2.6/sh_util/ncftpbatch.c
@@ -38,9 +38,10 @@
# define kSpoolLog "log.txt"
#else
# define kSpoolLog "log"
-# define kGlobalSpoolDir "/var/spool/ncftp"
#endif
+#define kMinimumReconnectDelaySameHost 30
+
#define NEW_SLEEP_VAL(s) ((unsigned int) (((0.1 * (rand() % 15)) + 1.2) * (s)))
int gQuitRequested = 0;
@@ -79,6 +80,7 @@
unsigned int gDelaySinceLastFailure;
time_t gTimeOfFirstAttempt;
time_t gTimeOfLastFailure;
+time_t gTimeOfLastFailureAny;
char gHost[64];
char gLastHost[64];
char gHostIP[32];
@@ -759,6 +761,7 @@
memset(gBatchMiscBuf, 0, sizeof(gBatchMiscBuf));
gTimeOfFirstAttempt = 0;
gTimeOfLastFailure = 0;
+ gTimeOfLastFailureAny = 0;
savefp = NULL;
gCurSpoolFileLinesRead = 0;
InitHostVariables();
@@ -872,7 +875,7 @@
#ifdef HAVE_PATHCONF
nmx = pathconf(gLogFileName, _PC_NAME_MAX);
if (nmx >= 512)
- debufsize = nmx;
+ debufsize = (size_t) nmx;
#endif
debufsize += sizeof(struct dirent) + 8;
direntbuf = (struct dirent *) calloc(debufsize, (size_t) 1);
@@ -914,14 +917,14 @@
if (fp == NULL) {
#if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
/* gItemContents is not used on Win32 */
- if ((fp = _fsopen(gMyItemPath, FOPEN_READ_BINARY, _SH_DENYNO)) == NULL) {
+ if ((fp = _fsopen(gMyItemPath, FOPEN_READ_TEXT, _SH_DENYNO)) == NULL) {
/* Could have been renamed already. */
if (logErrors != 0)
LogPerror("%s", gMyItemPath);
return (-1);
}
#else
- if ((stat(gMyItemPath, &st) < 0) || ((fp = fopen(gMyItemPath, FOPEN_READ_BINARY)) == NULL)) {
+ if ((stat(gMyItemPath, &st) < 0) || ((fp = fopen(gMyItemPath, FOPEN_READ_TEXT)) == NULL)) {
/* Could have been renamed already. */
if (logErrors != 0)
LogPerror("%s", gMyItemPath);
@@ -1059,7 +1062,7 @@
*/
(void) STRNCPY(gHostIP, tok2);
} else if (strcmp(tok1, "port") == 0) {
- gPort = atoi(tok2);
+ gPort = (unsigned int) atoi(tok2);
} else if (strcmp(tok1, "passive") == 0) {
if (isdigit((int) tok2[0]))
gPassive = atoi(tok2);
@@ -1142,6 +1145,8 @@
cp += strlen(cp) - 1;
if (*cp == '\n')
*cp-- = '\0';
+ if (*cp == '\r')
+ *cp-- = '\0';
}
} else if (strcmp(tok1, "job-name") == 0) {
/* ignore */
@@ -1276,7 +1281,7 @@
* command, such as our FTP session descriptors.
*/
FTPCloseControlConnection(&gConn);
- gMyPID = getpid();
+ gMyPID = (unsigned int) getpid();
CloseLog();
(void) execv(cmd, argv);
@@ -1697,9 +1702,11 @@
gConn.ctrlTimeout = 135;
gConn.xferTimeout = 300;
if (ISTRCMP(gHost, gLastHost) == 0) {
- /* Same host, but last "recent" attempt to connect failed. */
- Log(1, "Skipping same failed host as recent attempt (%s).\n", gLastHost);
- return (-1); /* Try again next time. */
+ if ((time(NULL) - gTimeOfLastFailureAny) < kMinimumReconnectDelaySameHost) {
+ /* Same host, but last "recent" attempt to connect failed. */
+ Log(1, "Skipping same failed host as recent attempt (%s).\n", gLastHost);
+ return (-1); /* Try again next time. */
+ }
}
if (AddrStrToIPStr(resolvedIPstr, sizeof(resolvedIPstr), gHost, (int) gPort) == NULL) {
LogEndItemResult(1, 1, "Couldn't resolve IP for %s, will try again next time.\n", gHost);
@@ -1859,8 +1866,9 @@
}
}
- if (result != kNoErr)
- (void) time(&gTimeOfLastFailure);
+ if (result != kNoErr) {
+ gTimeOfLastFailureAny = time(&gTimeOfLastFailure);
+ }
switch (result) {
case kErrSYMLINKFailed:
@@ -2310,14 +2318,16 @@
DIR *DIRp;
char *cp;
int iyyyymmdd, ihhmmss;
- char dstr[64], zstr[64];
+ char dstr[64], zstr[64], jfstr[64];
char yyyy[8], mm[4], dd[4];
char HH[4], MM[4], SS[4];
struct tm lt;
time_t t;
- int iType = 0, nP = 0, nG = 0;
+ int iType = 0, nP = 0, nG = 0, nJobFiles = 0;
double tP = 0.0, tG = 0.0, tX;
const char *uStr;
+ int printedHeader = 0;
+ int nJobsInThisJobFile;
if ((DIRp = opendir(gSpoolDir)) == NULL) {
PerrorBox(gSpoolDir);
@@ -2348,8 +2358,13 @@
cp++;
if (iType == 'P') { nP++; } else if (iType == 'G') { nG++; }
- if (reportMode >= 4) { nItems++; continue; }
+ nJobFiles++;
+ nItems++;
+ if (reportMode >= 4) {
+ continue;
+ }
+
memset(dstr, 0, sizeof(dstr));
(void) sprintf(dstr, "%08d%06d", iyyyymmdd, ihhmmss);
(void) memcpy(yyyy, dstr, 4); yyyy[4] = '\0';
@@ -2361,6 +2376,7 @@
t = UnMDTMDate(dstr);
if ((t == 0) || (t == (time_t) -1) || (Localtime(t, &lt) == NULL)) {
+ memset(zstr, 0, sizeof(zstr));
} else {
memset(dstr, 0, sizeof(dstr));
memset(zstr, 0, sizeof(zstr));
@@ -2368,11 +2384,10 @@
(void) strftime(dstr, sizeof(dstr) - 1, "%Y-%m-%d %H:%M:%S", &lt);
}
- if (reportMode == 2) {
+ if (reportMode == 3) {
/* Only report what can be found from the spool filename itself. */
- nItems++;
- if (nItems == 1) {
- (void) printf("---Scheduled-For------------Job Name-------------------------------------------\n");
+ if (++printedHeader == 1) {
+ (void) printf("---Scheduled For------------Spool File-----------------------------------------\n");
}
if ((activeOnly == 0) || (gItemPath[0] == 'x')) {
if ((t == 0) || (t == (time_t) -1) || (Localtime(t, &lt) == NULL)) {
@@ -2393,7 +2408,7 @@
continue;
}
- /* reportMode == 1 or 3 */
+ /* reportMode == 1 or 2 */
if ((Stat(gItemPath, &st) < 0) || (S_ISREG(st.st_mode) == 0)) {
/* Item may have been
@@ -2403,6 +2418,10 @@
continue;
}
+ --nItems; /* We haven't actually loaded the first item from the spool file yet. */
+ if (iType == 'P') { nP--; } else if (iType == 'G') { nG--; }
+ nJobsInThisJobFile = 0;
+
(void) STRNCPY(gMyItemPath, gItemPath);
do {
if (LoadCurrentSpoolFileContents(0) < 0) {
@@ -2413,6 +2432,7 @@
break;
}
+ nJobsInThisJobFile++;
nItems++;
iType = gOperation;
if (iType == 'P') { nP++; } else if (iType == 'G') { nG++; }
@@ -2422,11 +2442,11 @@
else if ((iType == 'P') && (gLFileSize > 0))
tP += gLFileSize;
- if (reportMode == 3)
+ if (reportMode == 2)
continue;
- if (nItems == 1) {
- (void) printf("---Scheduled-For------------Host------------------------------Command------------------------------\n");
+ if (++printedHeader == 1) {
+ (void) printf("---Scheduled For------------Host------------------------------Command------------------------------\n");
}
if ((activeOnly == 0) || (gItemPath[0] == 'x')) {
if ((t == 0) || (t == (time_t) -1) || (Localtime(t, &lt) == NULL)) {
@@ -2444,18 +2464,18 @@
);
}
if (iType != 'P') {
- (void) printf("GET");
+ (void) printf("%s", (nJobsInThisJobFile < 2) ? "GET" : "+ G");
if (gRecursive != 0) {
- (void) printf(" -R %s", gRFile);
+ (void) printf(" -R \"%s\"", gRFile);
} else {
- (void) printf(" %s", gRFile);
+ (void) printf(" \"%s\"", gRFile);
}
} else {
- (void) printf("PUT");
+ (void) printf("%s", (nJobsInThisJobFile < 2) ? "PUT" : "+ P");
if (gRecursive != 0) {
- (void) printf(" -R %s", gLFile);
+ (void) printf(" -R \"%s\"", gLFile);
} else {
- (void) printf(" %s", gLFile);
+ (void) printf(" \"%s\"", gLFile);
}
}
(void) printf("\n");
@@ -2469,28 +2489,46 @@
(gGlobalSpooler != 0) ? "The" : "Your",
gSpoolDir);
} else {
- printf("\n");
+ if ((reportMode == 1) || (reportMode == 3))
+ printf("\n");
+
+ jfstr[0] = '\0';
+ if ((nG > 0) && (nP > 0)) {
+ } else if (nItems > nJobFiles) {
+#ifdef HAVE_SNPRINTF
+ (void) snprintf(jfstr, sizeof(jfstr), " in %d spool file%s", nJobFiles, (nJobFiles == 1) ? "" : "s");
+#else
+ (void) sprintf(jfstr, " in %d spool file%s", nJobFiles, (nJobFiles == 1) ? "" : "s");
+#endif
+ }
if (nG > 0) {
if (tG > 0.0) {
tX = FileSize(tG, &uStr, NULL);
- printf("%d GET job%s queued for %.1f %s.\n", nG, ((nG == 1) ? "" : "s"), tX, uStr);
+ printf("%d GET job%s queued%s for %.1f %s.\n", nG, ((nG == 1) ? "" : "s"), jfstr, tX, uStr);
} else {
- printf("%d GET job%s queued.\n", nG, ((nG == 1) ? "" : "s"));
+ printf("%d GET job%s queued%s.\n", nG, ((nG == 1) ? "" : "s"), jfstr);
}
}
if (nP > 0) {
if (tP > 0.0) {
tX = FileSize(tP, &uStr, NULL);
- printf("%d PUT job%s queued for %.1f %s.\n", nP, ((nP == 1) ? "" : "s"), tX, uStr);
+ printf("%d PUT job%s queued%s for %.1f %s.\n", nP, ((nP == 1) ? "" : "s"), jfstr, tX, uStr);
} else {
- printf("%d PUT job%s queued.\n", nP, ((nP == 1) ? "" : "s"));
+ printf("%d PUT job%s queued%s.\n", nP, ((nP == 1) ? "" : "s"), jfstr);
}
}
if ((nItems - (nG + nP)) > 0) {
printf("%d job%s in progress.\n", (nItems - (nG + nP)), (((nItems - (nG + nP)) == 1) ? "" : "s"));
}
+ if (nItems > nJobFiles) {
+#ifdef HAVE_SNPRINTF
+ (void) snprintf(jfstr, sizeof(jfstr), " in %d spool file%s", nJobFiles, (nJobFiles == 1) ? "" : "s");
+#else
+ (void) sprintf(jfstr, " in %d spool file%s", nJobFiles, (nJobFiles == 1) ? "" : "s");
+#endif
+ }
if ((nG > 0) && (nP > 0)) {
- printf("%d total job%s queued.\n", nItems, ((nItems == 1) ? "" : "s"));
+ printf("%d total job%s queued%s.\n", nItems, ((nItems == 1) ? "" : "s"), jfstr);
}
}
} /* ListQueue */
@@ -2929,6 +2967,9 @@
static void
+#if (defined(__GNUC__)) && (__GNUC__ >= 2)
+ __attribute__ ((noreturn))
+#endif
Usage(void)
{
(void) fprintf(stderr, "Usages:\n");
@@ -3090,7 +3131,6 @@
DisposeWinsock();
exit(0);
/*NOTREACHED*/
- break;
case '|':
readcore = atoi(opt.arg);
break;
--- a/ncftp-3.2.6/sh_util/ncftpget.c
+++ b/ncftp-3.2.6/sh_util/ncftpget.c
@@ -43,6 +43,9 @@
extern Bookmark gBm;
static void
+#if (defined(__GNUC__)) && (__GNUC__ >= 2)
+ __attribute__ ((noreturn))
+#endif
Usage(void)
{
FILE *fp;
@@ -251,7 +254,6 @@
case 'z': case 'Z': case 'C':
(void) fprintf(stderr, "The \"-%c\" option is not valid when used with conjunction with \"-%c\".\n", c, 'b');
exit(kExitUsage);
- break;
}
}
@@ -484,7 +486,7 @@
GetoptReset(&opt);
while ((c = Getopt(&opt, argc, argv, kGetoptOptions)) > 0) switch(c) {
case 'P':
- fi.port = atoi(opt.arg);
+ fi.port = (unsigned int) atoi(opt.arg);
break;
case 'u':
(void) STRNCPY(fi.user, opt.arg);
--- a/ncftp-3.2.6/sh_util/ncftpls.c
+++ b/ncftp-3.2.6/sh_util/ncftpls.c
@@ -207,6 +207,9 @@
static void
+#if (defined(__GNUC__)) && (__GNUC__ >= 2)
+ __attribute__ ((noreturn))
+#endif
Usage(void)
{
FILE *fp;
@@ -494,7 +497,7 @@
GetoptReset(&opt);
while ((c = Getopt(&opt, argc, argv, kGetoptOptions)) > 0) switch(c) {
case 'P':
- fi.port = atoi(opt.arg);
+ fi.port = (unsigned int) atoi(opt.arg);
break;
case 'u':
(void) STRNCPY(fi.user, opt.arg);
--- a/ncftp-3.2.6/sh_util/ncftpput.c
+++ b/ncftp-3.2.6/sh_util/ncftpput.c
@@ -45,10 +45,17 @@
extern int gSendfileInProgress;
static void
+#if (defined(__GNUC__)) && (__GNUC__ >= 2)
+ __attribute__ ((noreturn))
+#endif
Usage(void)
{
FILE *fp;
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
fp = OpenPager();
(void) fprintf(fp, "NcFTPPut %.5s\n\n", gVersion + 11);
(void) fprintf(fp, "Usages:\n");
@@ -111,6 +118,10 @@
ClosePager(fp);
DisposeWinsock();
exit(kExitUsage);
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
} /* Usage */
@@ -262,7 +273,6 @@
case 'Z': case 'C':
(void) fprintf(stderr, "The \"-%c\" option is not valid when used with conjunction with \"-%c\".\n", c, 'b');
exit(kExitUsage);
- break;
}
}
@@ -473,7 +483,7 @@
GetoptReset(&opt);
while ((c = Getopt(&opt, argc, argv, kGetoptOptions)) > 0) switch(c) {
case 'P':
- fi.port = atoi(opt.arg);
+ fi.port = (unsigned int) atoi(opt.arg);
break;
case 'u':
(void) STRNCPY(fi.user, opt.arg);
--- a/ncftp-3.2.6/sio/DNSUtil.c
+++ b/ncftp-3.2.6/sio/DNSUtil.c
@@ -164,7 +164,7 @@
my_h_errno = 0;
h = NULL;
memset(usehpbuf, 0, hpbufsize);
- rc = gethostbyaddr_r((gethost_addrptr_t) addr, asize, atype, hp, usehpbuf, hpbufsize, &h, &my_h_errno);
+ rc = gethostbyaddr_r((gethost_addrptr_t) addr, (sockaddr_size_t) asize, atype, hp, usehpbuf, hpbufsize, &h, &my_h_errno);
if ((rc == 0) && (h != NULL))
return (0);
if ((rc == ERANGE) || ((rc == -1) && (errno == ERANGE))) {
@@ -189,7 +189,7 @@
#else
/* Note: gethostbyaddr is already threadsafe on: HP-UX, Tru64 */
struct hostent *h;
- h = gethostbyaddr((gethost_addrptr_t) addr, asize, atype);
+ h = gethostbyaddr((gethost_addrptr_t) addr, (sockaddr_size_t) asize, atype);
if (h != NULL) {
memcpy(hp, h, sizeof(struct hostent));
return (0);
--- a/ncftp-3.2.6/sio/Makefile.in
+++ b/ncftp-3.2.6/sio/Makefile.in
@@ -15,6 +15,7 @@
DEFS=@DEFS@@NDEFS@
PREFIX=@prefix@
LIB=libsio.a
+LIB_d=libsio_d.a
LIBSO=libsio.so.5
LIBSOS=libsio.so
STRIP=@STRIP@
@@ -61,14 +62,15 @@
-@RANLIB@ $(LIB)
-@echo $(VER) > sio.version
-@chmod a+r $(LIB) sio.h usio.h
- -@$(LIST) $(LIB)
+ -@if [ "x@DEBUGBUILD@" = xyes ] ; then $(COPY) "$(LIB)" "$(LIB_d)" ; fi
+ -@$(LIST) "$(LIB)" "$(LIB_d)" 2>/dev/null
install: $(LIB)
- $(COPY) $(LIB) $(PREFIX)/lib/$(LIB)
- -@@RANLIB@ $(PREFIX)/lib/$(LIB)
- $(COPY) sio.h usio.h $(PREFIX)/include
- chmod a+r $(PREFIX)/lib/$(LIB) $(PREFIX)/include/sio.h $(PREFIX)/include/usio.h
- -@$(LIST) $(PREFIX)/lib/$(LIB) $(PREFIX)/include/sio.h $(PREFIX)/include/usio.h
+ $(COPY) "$(LIB)" "$(PREFIX)/lib/$(LIB)"
+ -if [ "x@DEBUGBUILD@" = xyes ] ; then $(COPY) "$(LIB_d)" "$(PREFIX)/lib/$(LIB_d)" ; fi
+ $(COPY) sio.h usio.h "$(PREFIX)/include/"
+ -chmod a+r "$(PREFIX)/lib/$(LIB)" "$(PREFIX)/lib/$(LIB_d)" "$(PREFIX)/include/sio.h" "$(PREFIX)/include/usio.h" 2>/dev/null
+ -@$(LIST) "$(PREFIX)/lib/$(LIB)" "$(PREFIX)/lib/$(LIB_d)" "$(PREFIX)/include/sio.h" "$(PREFIX)/include/usio.h" 2>/dev/null
dynamic: $(LIBSO)
@@ -162,7 +164,7 @@
-@$(MKDIR) $(TMPDIR)/TAR
-@$(MKDIR) $(TMPDIR)/TAR/$(TARDIR)
-@chmod ga+r $(PACKAGE)
- find . -follow -depth -type f -print | cut -c3- | egrep -i -v '(((\.(o|so|log|a|lib|ncb|obj|exe|idb|cache|opt|zip|gz|swp|tar|plg|pch|gch))|(config\.h|Makefile))$$|(/\.)|(^\.)|(xcuserdata|dSYM))' | cpio -Lpdm $(TMPDIR)/TAR/$(TARDIR)
+ find . -follow -depth -type f -print | cut -c3- | egrep -i -v '(((\.(o|so|log|a|lib|ncb|obj|exe|idb|cache|opt|zip|gz|swp|tar|plg|pch|gch))|((^|/)(config\.h|config\.status|Makefile|autoheader|autoconf)))$$|(/\.)|(^\.)|(xcuserdata|dSYM))' | cpio -Lpdm $(TMPDIR)/TAR/$(TARDIR)
( cd $(TMPDIR)/TAR ; @TAR@ @TARFLAGS@ $(TARFILE) $(TARDIR) )
$(COPY) $(TMPDIR)/TAR/$(TARFILE) .
-@chmod 644 $(TARFILE)
--- a/ncftp-3.2.6/sio/SBind.c
+++ b/ncftp-3.2.6/sio/SBind.c
@@ -6,15 +6,30 @@
int
SBind(int sockfd, const int port, const int nTries, const int reuseFlag)
{
- unsigned int i;
- int on;
- sockopt_size_t onsize;
struct sockaddr_in localAddr;
localAddr.sin_family = AF_INET;
localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
localAddr.sin_port = htons((unsigned short) port);
+ return (SBindAddr(sockfd, &localAddr, nTries, reuseFlag));
+} /* SBind */
+
+
+
+
+int
+SBindAddr(int sockfd, struct sockaddr_in *localAddr, const int nTries, const int reuseFlag)
+{
+ unsigned int i;
+ int on;
+ sockopt_size_t onsize;
+
+ if ((sockfd < 0) || (localAddr == NULL) || (localAddr->sin_family != AF_INET)) {
+ errno = EINVAL;
+ return (kSioErrInvalidArg);
+ }
+
if (reuseFlag != kReUseAddrNo) {
/* This is mostly so you can quit the server and re-run it
* again right away. If you don't do this, the OS may complain
@@ -41,11 +56,11 @@
/* Try binding a few times, in case we get Address in Use
* errors.
*/
- if (bind(sockfd, (struct sockaddr *) &localAddr, (sockaddr_size_t) sizeof(struct sockaddr_in)) == 0) {
+ if (bind(sockfd, (struct sockaddr *) localAddr, (sockaddr_size_t) sizeof(struct sockaddr_in)) == 0) {
break;
}
if ((int) i == nTries) {
- return (-1);
+ return (kSBindFailed);
}
/* Give the OS time to clean up the old socket,
* and then try again.
@@ -54,7 +69,7 @@
}
return (0);
-} /* SBind */
+} /* SBindAddr */
@@ -62,5 +77,11 @@
int
SListen(int sfd, int backlog)
{
- return (listen(sfd, (listen_backlog_t) backlog));
+ if (sfd < 0) {
+ errno = EINVAL;
+ return (kSioErrInvalidArg);
+ }
+ if (listen(sfd, (listen_backlog_t) backlog) < 0)
+ return (kSListenFailed);
+ return (0);
} /* SListen */
--- a/ncftp-3.2.6/sio/SConnect.c
+++ b/ncftp-3.2.6/sio/SConnect.c
@@ -87,6 +87,8 @@
SIOSETERRNO
RESTORE_SIGPIPE
} while ((result < 0) && (errno == EINTR));
+ if ((result < 0) && (errno == ETIMEDOUT))
+ return (kTimeoutErr);
return (result);
}
@@ -120,11 +122,14 @@
#else
&& (errno != EWOULDBLOCK) && (errno != EINPROGRESS)
#endif
- ) {
+ )
+ {
cErrno = errno;
SIOSETERRNO
shutdown(sfd, 2);
errno = cErrno;
+ if (errno == ETIMEDOUT)
+ return (kTimeoutErr);
return (-1);
}
cErrno = errno;
@@ -166,6 +171,8 @@
} else if (errno != EINTR) {
/* Don't bother turning off FIONBIO */
SIOSETERRNO
+ if (errno == ETIMEDOUT)
+ return (kTimeoutErr);
return (-1);
}
}
--- a/ncftp-3.2.6/sio/SNew.c
+++ b/ncftp-3.2.6/sio/SNew.c
@@ -34,15 +34,75 @@
int
-SNewStreamServer(const int port, const int nTries, const int reuseFlag, int listenQueueSize)
+SNewStreamServerByAddr(struct sockaddr_in *const saddr, const int nTries, const int reuseFlag, const int listenQueueSize)
{
int oerrno;
int sfd;
+ if (saddr == NULL) {
+ errno = EINVAL;
+ return (kSioErrInvalidArg);
+ }
+
sfd = socket(AF_INET, SOCK_STREAM, 0);
if (sfd < 0)
return kSNewFailed;
+ if (SBindAddr(sfd, saddr, nTries, reuseFlag) < 0) {
+ oerrno = errno;
+ (void) closesocket(sfd);
+ errno = oerrno;
+ return kSBindFailed;
+ }
+
+ if (SListen(sfd, listenQueueSize) < 0) {
+ oerrno = errno;
+ (void) closesocket(sfd);
+ errno = oerrno;
+ return kSListenFailed;
+ }
+
+ return (sfd);
+} /* SNewStreamServerByAddr */
+
+
+
+
+int
+SNewStreamServerByName(const char *const addrStr, const int nTries, const int reuseFlag, const int listenQueueSize)
+{
+ struct sockaddr_in saddr;
+
+ if (addrStr == NULL) {
+ errno = EINVAL;
+ return (kSioErrInvalidArg);
+ }
+
+ if ((strchr(addrStr, ':') == NULL) && (isdigit((int) addrStr[0]))) {
+ /* Just a port number specified */
+ return (SNewStreamServer(atoi(addrStr), nTries, reuseFlag, listenQueueSize));
+ }
+
+ /* ip:port */
+ if (AddrStrToAddr(addrStr, &saddr, -1) < 0)
+ return (kSioErrBadAddrStr);
+
+ return (SNewStreamServerByAddr(&saddr, nTries, reuseFlag, listenQueueSize));
+} /* SNewStreamServerByName */
+
+
+
+
+int
+SNewStreamServer(const int port, const int nTries, const int reuseFlag, const int listenQueueSize)
+{
+ int oerrno;
+ int sfd;
+
+ sfd = socket(AF_INET, SOCK_STREAM, 0);
+ if (sfd < 0)
+ return kSNewFailed;
+
if (SBind(sfd, port, nTries, reuseFlag) < 0) {
oerrno = errno;
(void) closesocket(sfd);
@@ -59,6 +119,59 @@
return (sfd);
} /* SNewStreamServer */
+
+
+
+
+int
+SNewDatagramServerByAddr(struct sockaddr_in *const saddr, const int nTries, const int reuseFlag)
+{
+ int oerrno;
+ int sfd;
+
+ if (saddr == NULL) {
+ errno = EINVAL;
+ return (kSioErrInvalidArg);
+ }
+
+ sfd = socket(AF_INET, SOCK_DGRAM, 0);
+ if (sfd < 0)
+ return kSNewFailed;
+
+ if (SBindAddr(sfd, saddr, nTries, reuseFlag) < 0) {
+ oerrno = errno;
+ (void) closesocket(sfd);
+ errno = oerrno;
+ return kSBindFailed;
+ }
+
+ return (sfd);
+} /* SNewDatagramServer */
+
+
+
+
+int
+SNewDatagramServerByName(const char *const addrStr, const int nTries, const int reuseFlag)
+{
+ struct sockaddr_in saddr;
+
+ if (addrStr == NULL) {
+ errno = EINVAL;
+ return (kSioErrInvalidArg);
+ }
+
+ if ((strchr(addrStr, ':') == NULL) && (isdigit((int) addrStr[0]))) {
+ /* Just a port number specified */
+ return (SNewDatagramServer(atoi(addrStr), nTries, reuseFlag));
+ }
+
+ /* ip:port */
+ if (AddrStrToAddr(addrStr, &saddr, -1) < 0)
+ return (kSioErrBadAddrStr);
+
+ return (SNewDatagramServerByAddr(&saddr, nTries, reuseFlag));
+} /* SNewDatagramServer */
--- a/ncftp-3.2.6/sio/SRead.c
+++ b/ncftp-3.2.6/sio/SRead.c
@@ -5,7 +5,7 @@
extern const char gSioVersion[];
const char UNUSED(gSioVersion[]) = kSioVersion;
-static const char UNUSED(gCopyright[]) = "@(#) libsio Copyright 1992-2011, by Mike Gleason. All rights reserved.";
+static const char UNUSED(gCopyright[]) = "@(#) libsio Copyright 1992-2016, by Mike Gleason. All rights reserved.";
/* Read up to "size" bytes on sfd before "tlen" seconds.
@@ -81,7 +81,7 @@
} else if (result == 0) {
/* timeout */
nread = (read_return_t) size - (read_return_t) nleft;
- if ((nread > 0) && ((retry & (kFullBufferRequired|kFullBufferRequiredExceptLast)) == 0)) {
+ if ((nread > 0) && ((retry & (kFullBufferRequired|kFullBufferRequiredExceptLast)) == 0)) {
RESTORE_SIGPIPE
return ((int) nread);
}
@@ -106,7 +106,7 @@
if (nread <= 0) {
if (nread == 0) {
/* EOF */
- if (retry == ((retry & (kFullBufferRequiredExceptLast)) != 0))
+ if ((retry & (kFullBufferRequiredExceptLast)) != 0)
nread = (read_return_t) size - (read_return_t) nleft;
goto done;
} else if (errno != EINTR) {
--- a/ncftp-3.2.6/sio/StrAddr.c
+++ b/ncftp-3.2.6/sio/StrAddr.c
@@ -42,7 +42,7 @@
while (isdigit((int) *cp))
cp++;
*cp = '\0';
- return (atoi(str));
+ return ((unsigned int) atoi(str));
}
for (;; cp++) {
if ((*cp == '\0')
@@ -231,7 +231,7 @@
while (isdigit((int) *cp))
cp++;
*cp = '\0';
- port = atoi(p2);
+ port = (unsigned int) atoi(p2);
}
*cp = '\0';
break;
@@ -284,7 +284,7 @@
errno = ENOENT;
return (kAddrStrToAddrBadHost);
}
- sa->sin_family = hp->h_addrtype;
+ sa->sin_family = (sa_family_t) hp->h_addrtype;
memcpy(&sa->sin_addr.s_addr, hp->h_addr_list[0],
(size_t) hp->h_length);
}
--- a/ncftp-3.2.6/sio/config.h.in
+++ b/ncftp-3.2.6/sio/config.h.in
@@ -44,6 +44,9 @@
#undef main_void_return_t
+/* Define this because you definitely don't have it. Used only for testing configure. */
+#undef negative_control_t
+
#undef PRAGMA_HDRSTOP
#undef read_return_t
@@ -54,6 +57,8 @@
#undef recv_size_t
+#undef sa_family_t
+
/* Define to the type of arg1 for select(). */
#undef SELECT_TYPE_ARG1
@@ -74,6 +79,10 @@
/* Define to `unsigned' if <sys/types.h> doesn't define. */
#undef size_t
+#undef SNPRINTF_RETURNS_PTR
+
+#undef SNPRINTF_TERMINATES
+
#undef sockaddr_size_t
/* If SOCKS library is being used, define the major version (i.e. 5) */
@@ -81,6 +90,9 @@
#undef sockopt_size_t
+/* Define to `long' if <sys/types.h> doesn't define. */
+#undef ssize_t
+
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
@@ -137,9 +149,15 @@
/* Define if you have the sigsetjmp function. */
#undef HAVE_SIGSETJMP
+/* Define if you have the snprintf function. */
+#undef HAVE_SNPRINTF
+
/* Define if you have the strerror function. */
#undef HAVE_STRERROR
+/* Define if you have the vsnprintf function. */
+#undef HAVE_VSNPRINTF
+
/* Define if you have the <arpa/nameser.h> header file. */
#undef HAVE_ARPA_NAMESER_H
@@ -152,6 +170,9 @@
/* Define if you have the <resolv.h> header file. */
#undef HAVE_RESOLV_H
+/* Define if you have the <snprintf.h> header file. */
+#undef HAVE_SNPRINTF_H
+
/* Define if you have the <socks.h> header file. */
#undef HAVE_SOCKS_H
@@ -187,6 +208,9 @@
/* Define if you have the resolv library (-lresolv). */
#undef HAVE_LIBRESOLV
+
+/* Define if you have the snprintf library (-lsnprintf). */
+#undef HAVE_LIBSNPRINTF
/* Define if you have the socket library (-lsocket). */
#undef HAVE_LIBSOCKET
--- a/ncftp-3.2.6/sio/configure.in
+++ b/ncftp-3.2.6/sio/configure.in
@@ -69,6 +69,13 @@
wi__RES_DEFDNAME
wi_STRUCT_TIMEVAL_FIELD_TYPES
wi_VOID_MAIN_RETURN_TYPE
+wi_CHECK_TYPE(negative_control_t, long, [])
+wi_CHECK_TYPE(ssize_t, long, [])
+wi_CHECK_TYPE(sa_family_t, unsigned short, [#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+])
wi_UNISTD_FUNC_PARAM_TYPES
wi_HEADER_SYS_SELECT_H
wi_FUNC_SELECT_ARGTYPES
@@ -147,5 +154,6 @@
AC_SUBST(DEFS)
AC_SUBST(SFLAG)
AC_SUBST(SIO_VERSION)
+AC_SUBST(DEBUGBUILD)
AC_SUBST(MAKE)
AC_OUTPUT([Makefile ucase_c/Makefile ucase_s/Makefile time_c/Makefile time_s/Makefile srltest/Makefile sendmessage/Makefile])
--- a/ncftp-3.2.6/sio/sio.h
+++ b/ncftp-3.2.6/sio/sio.h
@@ -7,7 +7,7 @@
#ifndef sio_h
#define sio_h 1
-#define kSioVersion "@(#) libsio 6.2.2 (October 29, 2016)"
+#define kSioVersion "@(#) libsio 6.3 (November 12, 2016)"
#ifdef __cplusplus
extern "C"
@@ -52,6 +52,7 @@
#define kFullBufferNotRequired 00000
#define kFullBufferRequired 00001
#define kFullBufferRequiredExceptLast 00002
+#define kFullBufferOrEOF 00002 /* alias for kFullBufferRequiredExceptLast */
#define kNoFirstSelect 00010
/* Parameter to AddrToAddrStr */
@@ -67,6 +68,8 @@
#define kSNewFailed (-6)
#define kSBindFailed (-7)
#define kSListenFailed (-8)
+#define kSioErrInvalidArg (-9)
+#define kSioErrBadAddrStr (-10)
#define kSrlBufSize 2048
@@ -200,8 +203,9 @@
int SAccept(int, struct sockaddr_in *const, int);
/* SBind.c */
-int SBind(int, const int, const int, const int);
-int SListen(int, int);
+int SBind(int sockfd, const int port, const int nTries, const int reuseFlag);
+int SBindAddr(int sockfd, struct sockaddr_in *localAddr, const int nTries, const int reuseFlag);
+int SListen(int sfd, int backlog);
/* SClose.c */
int SCloseSocket(int);
@@ -216,8 +220,12 @@
/* SNew.c */
int SNewStreamClient(void);
int SNewDatagramClient(void);
-int SNewStreamServer(const int, const int, const int, int);
-int SNewDatagramServer(const int, const int, const int);
+int SNewStreamServerByAddr(struct sockaddr_in *const saddr, const int nTries, const int reuseFlag, const int listenQueueSize);
+int SNewStreamServerByName(const char *const addrStr, const int nTries, const int reuseFlag, const int listenQueueSize);
+int SNewStreamServer(const int port, const int nTries, const int reuseFlag, const int listenQueueSize);
+int SNewDatagramServerByAddr(struct sockaddr_in *const saddr, const int nTries, const int reuseFlag);
+int SNewDatagramServerByName(const char *const addrStr, const int nTries, const int reuseFlag);
+int SNewDatagramServer(const int port, const int nTries, const int reuseFlag);
/* SRead.c */
int SRead(int, char *const, size_t, int, int);
--- a/ncftp-3.2.6/sio/wincfg.h
+++ b/ncftp-3.2.6/sio/wincfg.h
@@ -19,6 +19,7 @@
#define recv_size_t unsigned int
#define send_return_t int
#define send_size_t unsigned int
+#define sa_family_t short
/* #define CAN_USE_SYS_SELECT_H 1 */
--- a/ncftp-3.2.6/vis/bmed.c
+++ b/ncftp-3.2.6/vis/bmed.c
@@ -143,6 +143,10 @@
int begy, begx;
char spec[32];
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
getmaxyx(gHostListWin, lmaxy, lmaxx);
getbegyx(gHostListWin, begy, begx);
getmaxyx(gHostWin, maxy, maxx);
@@ -226,6 +230,10 @@
wprintw(gHostWin, spec, str);
wmove(gHostWin, maxy - 1, 0);
UpdateHostWindows(0);
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
} /* DrawHostList */
@@ -234,7 +242,7 @@
int HostWinGetKey(void)
{
int c;
- int uc;
+ unsigned int uc;
int escmode;
int maxy;
@@ -1084,6 +1092,9 @@
/*ARGSUSED*/
static void
+#if (defined(__GNUC__)) && (__GNUC__ >= 2)
+__attribute__ ((noreturn))
+#endif
SigIntHostWin(int UNUSED(sig))
{
LIBNCFTP_USE_VAR(sig);
--- a/ncftp-3.2.6/vis/wgets.c
+++ b/ncftp-3.2.6/vis/wgets.c
@@ -152,16 +152,16 @@
/* Just add a character to the end. No need to do
* a memory move for this.
*/
- *gBufPtr = c;
+ *gBufPtr = (char) c;
gBufLen++;
wg_SetCursorPos(gBufPtr + 1);
} else {
/* Have to move characters after the cursor over one
* position so we can insert a character.
*/
- n = limit - gBufPtr;
+ n = (size_t) (limit - gBufPtr);
MEMMOVE(gBufPtr + 1, gBufPtr, n);
- *gBufPtr = c;
+ *gBufPtr = (char) c;
gBufLen++;
wg_SetCursorPos(gBufPtr + 1);
}
@@ -189,10 +189,10 @@
/* Delete the characters before the character under the
* cursor, and move everything after it back one.
*/
- n = limit - gBufPtr;
+ n = (size_t) (limit - gBufPtr);
memcpy(gBufPtr - count, gBufPtr, n);
}
- gBufLen -= count;
+ gBufLen -= (size_t) count;
wg_SetCursorPos(gBufPtr - count); /* Does a --gBufPtr. */
gNeedUpdate = 1;
gChanged = 1;
@@ -237,7 +237,7 @@
/* Nothing in front to delete. */
BEEP(1);
} else {
- n = limit - gBufPtr - 1;
+ n = (size_t) (limit - gBufPtr) - 1;
memcpy(gBufPtr, gBufPtr + 1, n);
--gBufLen;
gNeedUpdate = 1;
--- a/ncftp-3.2.6/vis/wgets.h
+++ b/ncftp-3.2.6/vis/wgets.h
@@ -23,15 +23,16 @@
typedef struct WGetsParams {
WINDOW *w; /* in */
- int sy, sx; /* in */
+ FTPLineListPtr history; /* in, out */
char *dst; /* in, out */
- int fieldLen; /* in */
size_t dstSize; /* in */
+ int sy, sx; /* in */
+ int fieldLen; /* in */
int useCurrentContents; /* in */
int echoMode; /* in */
int changed; /* out */
int dstLen; /* out */
- FTPLineListPtr history; /* in, out */
+ int reserved;
} WGetsParams, *WGetsParamPtr;
int wg_Gets(WGetsParamPtr wgpp);
--- a/ncftp-3.2.6/vis/wutil.c
+++ b/ncftp-3.2.6/vis/wutil.c
@@ -38,6 +38,9 @@
void
+#if (defined(__GNUC__)) && (__GNUC__ >= 2)
+__attribute__ ((noreturn))
+#endif
Exit(int exitStatus)
{
EndWin();
@@ -386,7 +389,8 @@
maxx,
maxy
);
- (void) write(1, buf, strlen(buf));
+ if (write(1, buf, strlen(buf)) < 0)
+ return (-1);
return (0);
}
return (-1);
--- a/ncftp-3.2.6/vis/wutil.h
+++ b/ncftp-3.2.6/vis/wutil.h
@@ -9,7 +9,11 @@
#define kBold 00040
void EndWin(void);
-void Exit(int exitStatus);
+void
+#if (defined(__GNUC__)) && (__GNUC__ >= 2)
+__attribute__ ((noreturn))
+#endif
+Exit(int exitStatus);
void SaveScreen(void);
void TTYWaitForReturn(void);
void RestoreScreen(int pressKey);
--- a/ncftp-3.2.6/win/bmed/bmed.vcproj
+++ b/ncftp-3.2.6/win/bmed/bmed.vcproj
@@ -119,7 +119,7 @@
IntermediateDirectory=".\Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="2"
+ UseOfMFC="1"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
@@ -151,7 +151,7 @@
AdditionalIncludeDirectories="..\..\Strn"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment