[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Building 64-bit version of ncurses on Solaris 8
From: |
Albert Chin |
Subject: |
Re: Building 64-bit version of ncurses on Solaris 8 |
Date: |
Fri, 1 Feb 2002 19:41:45 -0600 |
User-agent: |
Mutt/1.2.5i |
On Fri, Feb 01, 2002 at 08:09:38PM -0500, Thomas Dickey wrote:
> If it's too inconvenient, I'll rewrite it. (I don't know offhand why
> it should need the math library, since the ordinary floating-point
> stuff is adequate for sscanf's conversions - but it's something to
> keep in mind).
I think it needs the math libraries because it implements more than
just sscanf.
Ok, here's the first iteration of the patch. I am excluding the trio
files for now as I want to make sure everything is OK with you first.
BTW, how do I test the replacement vsscanf function?
I've done a test build on Solaris 8/SPARC 32-bit and 64-bit. The
64-bit failed in the test directory (because we're using cc to link in
the test directory, we should link with $CCFLAGS to get -xarch=v9).
No runtime testing though.
--
albert chin (address@hidden)
-- snip snip
--- ncurses/base/vsscanf.c.orig Fri Feb 1 15:35:26 2002
+++ ncurses/base/vsscanf.c Fri Feb 1 15:51:13 2002
@@ -34,37 +34,16 @@
#if !HAVE_VSSCANF
+#include "trio.h"
+
MODULE_ID("$Id: vsscanf.c,v 1.14 2001/12/08 20:12:35 tom Exp $")
/*VARARGS2*/
NCURSES_EXPORT(int)
vsscanf(const char *str, const char *format, va_list ap)
{
-#if HAVE_VFSCANF || HAVE__DOSCAN
- /*
- * This code should work on anything descended from AT&T SVr1.
- */
- FILE strbuf;
-
- strbuf._flag = _IOREAD;
- strbuf._ptr = strbuf._base = (unsigned char *) str;
- strbuf._cnt = strlen(str);
- strbuf._file = _NFILE;
-
-#if HAVE_VFSCANF
- return (vfscanf(&strbuf, format, ap));
-#else
- return (_doscan(&strbuf, format, ap));
-#endif
-#else
- /*
- * You don't have a native vsscanf(3), and you don't have System-V
- * compatible stdio internals. You're probably using a BSD
- * older than 4.4 or a really old Linux. You lose. Upgrade
- * to a current C library to win.
- */
- return -1; /* not implemented */
-#endif
+ /* Emulate with trio function */
+ trio_vsscanf(str, format, ap);
}
#else
extern
--- mk-1st.awk.orig Fri Feb 1 18:48:42 2002
+++ mk-1st.awk Fri Feb 1 18:48:53 2002
@@ -195,7 +195,7 @@
if ( subset == "termlib") {
printf "\t$(MK_SHARED_LIB) $(%s_OBJS)
$(TINFO_LIST)\n", OBJS
} else {
- printf "\t$(MK_SHARED_LIB) $(%s_OBJS)
$(SHLIB_LIST)\n", OBJS
+ printf "\t$(MK_SHARED_LIB) $(%s_OBJS)
$(SHLIB_LIST) $(LDFLAGS)\n", OBJS
}
sharedlinks("../lib")
--- ncurses/modules.orig Fri Feb 1 18:06:12 2002
+++ ncurses/modules Fri Feb 1 18:22:10 2002
@@ -114,6 +114,11 @@
tty_update lib $(serial) ../include/term.h
varargs lib $(trace)
+# trio libraries
+trio lib $(base)
+trionan lib $(base)
+triostr lib $(base)
+
# Modules for porting
memmove lib $(base)
sigaction lib $(base)
--- aclocal.m4.orig Fri Feb 1 16:14:04 2002
+++ aclocal.m4 Fri Feb 1 18:07:25 2002
@@ -651,49 +651,6 @@
test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR)
])dnl
dnl ---------------------------------------------------------------------------
-dnl Check for vsscanf() function, which is in c9x but generally not in earlier
-dnl versions of C. It is in the GNU C library, and can often be simulated by
-dnl other functions.
-AC_DEFUN([CF_FUNC_VSSCANF],
-[
-AC_CACHE_CHECK(for vsscanf function or workaround,cf_cv_func_vsscanf,[
-AC_TRY_LINK([
-#include <stdarg.h>
-#include <stdio.h>],[
- va_list ap;
- vsscanf("from", "%d", ap)],[cf_cv_func_vsscanf=vsscanf],[
-AC_TRY_LINK([
-#include <stdarg.h>
-#include <stdio.h>],[
- FILE strbuf;
- char *str = "from";
-
- strbuf._flag = _IOREAD;
- strbuf._ptr = strbuf._base = (unsigned char *) str;
- strbuf._cnt = strlen(str);
- strbuf._file = _NFILE;
- return (vfscanf(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=vfscanf],[
-AC_TRY_LINK([
-#include <stdarg.h>
-#include <stdio.h>],[
- FILE strbuf;
- char *str = "from";
-
- strbuf._flag = _IOREAD;
- strbuf._ptr = strbuf._base = (unsigned char *) str;
- strbuf._cnt = strlen(str);
- strbuf._file = _NFILE;
- return (_doscan(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=_doscan],[
-cf_cv_func_vsscanf=no])])])])
-
-case $cf_cv_func_vsscanf in #(vi
-vsscanf) AC_DEFINE(HAVE_VSSCANF);; #(vi
-vfscanf) AC_DEFINE(HAVE_VFSCANF);; #(vi
-_doscan) AC_DEFINE(HAVE__DOSCAN);;
-esac
-
-])dnl
-dnl ---------------------------------------------------------------------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
dnl to documentation, unrecognized directives cause older compilers to barf.
--- configure.orig Fri Feb 1 15:57:40 2002
+++ configure Fri Feb 1 18:59:55 2002
@@ -5884,16 +5884,15 @@
strstr \
tcgetpgrp \
times \
-vsnprintf \
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5892: checking for $ac_func" >&5
+echo "configure:5891: 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 5897 "configure"
+#line 5896 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5916,7 +5915,7 @@
; return 0; }
EOF
-if { (eval echo configure:5920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5919: \"$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
@@ -5943,13 +5942,13 @@
if test "$with_getcap" = "yes" ; then
echo $ac_n "checking for terminal-capability database functions""... $ac_c"
1>&6
-echo "configure:5947: checking for terminal-capability database functions" >&5
+echo "configure:5946: checking for terminal-capability database functions" >&5
if eval "test \"`echo '$''{'cf_cv_cgetent'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5953 "configure"
+#line 5952 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -5964,7 +5963,7 @@
; return 0; }
EOF
-if { (eval echo configure:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_cgetent=yes
else
@@ -5985,22 +5984,339 @@
fi
+# add replacements for vsnprintf and vsscanf if not found
+for ac_func in vsnprintf
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:5992: 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 5997 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:6020: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz'
'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF 1
+EOF
+
+ for ac_func in vsscanf
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:6046: 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 6051 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:6074: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz'
'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+ HAVE_VSSCANF=1
+else
+ echo "$ac_t""no" 1>&6
+HAVE_VSSCANF=0
+ cat >> confdefs.h <<EOF
+#define NEED_TRIO 1
+EOF
+
+ echo $ac_n "checking for fabs""... $ac_c" 1>&6
+echo "configure:6102: checking for fabs" >&5
+if eval "test \"`echo '$''{'ac_cv_func_fabs'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 6107 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char fabs(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char fabs();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_fabs) || defined (__stub___fabs)
+choke me
+#else
+fabs();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_fabs=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_fabs=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'fabs`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6
+echo "configure:6148: checking for fabs in -lm" >&5
+ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 6156 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char fabs();
+
+int main() {
+fabs()
+; return 0; }
+EOF
+if { (eval echo configure:6167: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo m | sed -e 's/^a-zA-Z0-9_/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-lm $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+fi
+done
+
+else
+ echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<EOF
+#define NEED_TRIO 1
+EOF
+
+ echo $ac_n "checking for fabs""... $ac_c" 1>&6
+echo "configure:6206: checking for fabs" >&5
+if eval "test \"`echo '$''{'ac_cv_func_fabs'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 6211 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char fabs(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char fabs();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_fabs) || defined (__stub___fabs)
+choke me
+#else
+fabs();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:6234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_fabs=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_fabs=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'fabs`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6
+echo "configure:6252: checking for fabs in -lm" >&5
+ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 6260 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char fabs();
+
+int main() {
+fabs()
+; return 0; }
+EOF
+if { (eval echo configure:6271: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo m | sed -e 's/^a-zA-Z0-9_/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-lm $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+fi
+done
+
+
+
echo $ac_n "checking for isascii""... $ac_c" 1>&6
-echo "configure:5991: checking for isascii" >&5
+echo "configure:6307: checking for isascii" >&5
if eval "test \"`echo '$''{'cf_cv_have_isascii'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5997 "configure"
+#line 6313 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
int x = isascii(' ')
; return 0; }
EOF
-if { (eval echo configure:6004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_have_isascii=yes
else
@@ -6021,9 +6337,9 @@
if test "$ac_cv_func_sigaction" = yes; then
echo $ac_n "checking whether sigaction needs _POSIX_SOURCE""... $ac_c" 1>&6
-echo "configure:6025: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "configure:6341: checking whether sigaction needs _POSIX_SOURCE" >&5
cat > conftest.$ac_ext <<EOF
-#line 6027 "configure"
+#line 6343 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6032,7 +6348,7 @@
struct sigaction act
; return 0; }
EOF
-if { (eval echo configure:6036: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+if { (eval echo configure:6352: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
sigact_bad=no
else
@@ -6041,7 +6357,7 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 6045 "configure"
+#line 6361 "configure"
#include "confdefs.h"
#define _POSIX_SOURCE
@@ -6051,7 +6367,7 @@
struct sigaction act
; return 0; }
EOF
-if { (eval echo configure:6055: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+if { (eval echo configure:6371: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
sigact_bad=yes
cat >> confdefs.h <<\EOF
@@ -6079,17 +6395,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6083: checking for $ac_hdr" >&5
+echo "configure:6399: 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 6088 "configure"
+#line 6404 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6409: \"$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*
@@ -6120,17 +6436,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6124: checking for $ac_hdr" >&5
+echo "configure:6440: 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 6129 "configure"
+#line 6445 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6450: \"$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*
@@ -6165,16 +6481,16 @@
esac
if test "$termios_bad" = maybe ; then
echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c"
1>&6
-echo "configure:6169: checking whether termios.h needs _POSIX_SOURCE" >&5
+echo "configure:6485: checking whether termios.h needs _POSIX_SOURCE" >&5
cat > conftest.$ac_ext <<EOF
-#line 6171 "configure"
+#line 6487 "configure"
#include "confdefs.h"
#include <termios.h>
int main() {
struct termios foo; int x = foo.c_iflag
; return 0; }
EOF
-if { (eval echo configure:6178: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+if { (eval echo configure:6494: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
termios_bad=no
else
@@ -6183,7 +6499,7 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 6187 "configure"
+#line 6503 "configure"
#include "confdefs.h"
#define _POSIX_SOURCE
@@ -6192,7 +6508,7 @@
struct termios foo; int x = foo.c_iflag
; return 0; }
EOF
-if { (eval echo configure:6196: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+if { (eval echo configure:6512: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
termios_bad=unknown
else
@@ -6215,13 +6531,13 @@
echo $ac_n "checking for tcgetattr""... $ac_c" 1>&6
-echo "configure:6219: checking for tcgetattr" >&5
+echo "configure:6535: checking for tcgetattr" >&5
if eval "test \"`echo '$''{'cf_cv_have_tcgetattr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6225 "configure"
+#line 6541 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6244,7 +6560,7 @@
tcgetattr(1, &foo);
; return 0; }
EOF
-if { (eval echo configure:6248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_have_tcgetattr=yes
else
@@ -6263,114 +6579,8 @@
-echo $ac_n "checking for vsscanf function or workaround""... $ac_c" 1>&6
-echo "configure:6268: checking for vsscanf function or workaround" >&5
-if eval "test \"`echo '$''{'cf_cv_func_vsscanf'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
-cat > conftest.$ac_ext <<EOF
-#line 6274 "configure"
-#include "confdefs.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-int main() {
-
- va_list ap;
- vsscanf("from", "%d", ap)
-; return 0; }
-EOF
-if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
- rm -rf conftest*
- cf_cv_func_vsscanf=vsscanf
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 6294 "configure"
-#include "confdefs.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-int main() {
-
- FILE strbuf;
- char *str = "from";
-
- strbuf._flag = _IOREAD;
- strbuf._ptr = strbuf._base = (unsigned char *) str;
- strbuf._cnt = strlen(str);
- strbuf._file = _NFILE;
- return (vfscanf(&strbuf, "%d", ap))
-; return 0; }
-EOF
-if { (eval echo configure:6311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
- rm -rf conftest*
- cf_cv_func_vsscanf=vfscanf
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 6320 "configure"
-#include "confdefs.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-int main() {
-
- FILE strbuf;
- char *str = "from";
-
- strbuf._flag = _IOREAD;
- strbuf._ptr = strbuf._base = (unsigned char *) str;
- strbuf._cnt = strlen(str);
- strbuf._file = _NFILE;
- return (_doscan(&strbuf, "%d", ap))
-; return 0; }
-EOF
-if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
- rm -rf conftest*
- cf_cv_func_vsscanf=_doscan
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
-
-cf_cv_func_vsscanf=no
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$cf_cv_func_vsscanf" 1>&6
-
-case $cf_cv_func_vsscanf in #(vi
-vsscanf) cat >> confdefs.h <<\EOF
-#define HAVE_VSSCANF 1
-EOF
-;; #(vi
-vfscanf) cat >> confdefs.h <<\EOF
-#define HAVE_VFSCANF 1
-EOF
-;; #(vi
-_doscan) cat >> confdefs.h <<\EOF
-#define HAVE__DOSCAN 1
-EOF
-;;
-esac
-
-
-
echo $ac_n "checking for working mkstemp""... $ac_c" 1>&6
-echo "configure:6374: checking for working mkstemp" >&5
+echo "configure:6584: checking for working mkstemp" >&5
if eval "test \"`echo '$''{'cf_cv_func_mkstemp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6378,12 +6588,12 @@
rm -f conftest*
if test "$cross_compiling" = yes; then
echo $ac_n "checking for mkstemp""... $ac_c" 1>&6
-echo "configure:6382: checking for mkstemp" >&5
+echo "configure:6592: checking for mkstemp" >&5
if eval "test \"`echo '$''{'ac_cv_func_mkstemp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6387 "configure"
+#line 6597 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mkstemp(); below. */
@@ -6406,7 +6616,7 @@
; return 0; }
EOF
-if { (eval echo configure:6410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_mkstemp=yes"
else
@@ -6428,7 +6638,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 6432 "configure"
+#line 6642 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6465,7 +6675,7 @@
}
EOF
-if { (eval echo configure:6469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_func_mkstemp=yes
@@ -6491,19 +6701,11 @@
fi
-# setup for prototype of fallback for vsscanf()
-if test "$cf_cv_func_vsscanf" = vsscanf ; then
- HAVE_VSSCANF=1
-else
- HAVE_VSSCANF=0
-fi
-
-
if test "$cross_compiling" = yes ; then
echo "configure: warning: cross compiling: assume setvbuf params not
reversed" 1>&2
else
echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c"
1>&6
-echo "configure:6507: checking whether setvbuf arguments are reversed" >&5
+echo "configure:6709: 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
@@ -6511,7 +6713,7 @@
{ echo "configure: error: can not run test program while cross compiling"
1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6515 "configure"
+#line 6717 "configure"
#include "confdefs.h"
#include <stdio.h>
/* If setvbuf has the reversed format, exit 0. */
@@ -6525,7 +6727,7 @@
exit(0); /* Non-reversed systems segv here. */
}
EOF
-if { (eval echo configure:6529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6731: \"$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
@@ -6550,12 +6752,12 @@
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:6554: checking return type of signal handlers" >&5
+echo "configure:6756: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6559 "configure"
+#line 6761 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -6572,7 +6774,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:6576: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+if { (eval echo configure:6778: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -6592,13 +6794,13 @@
echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6
-echo "configure:6596: checking for type sigaction_t" >&5
+echo "configure:6798: checking for type sigaction_t" >&5
if eval "test \"`echo '$''{'cf_cv_type_sigaction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6602 "configure"
+#line 6804 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -6606,7 +6808,7 @@
sigaction_t x
; return 0; }
EOF
-if { (eval echo configure:6610: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+if { (eval echo configure:6812: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
cf_cv_type_sigaction=yes
else
@@ -6627,7 +6829,7 @@
echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
-echo "configure:6631: checking declaration of size-change" >&5
+echo "configure:6833: checking declaration of size-change" >&5
if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6641,7 +6843,7 @@
CPPFLAGS="$cf_save_CPPFLAGS"
test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
cat > conftest.$ac_ext <<EOF
-#line 6645 "configure"
+#line 6847 "configure"
#include "confdefs.h"
#include <sys/types.h>
#ifdef HAVE_TERMIOS_H
@@ -6680,7 +6882,7 @@
; return 0; }
EOF
-if { (eval echo configure:6684: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+if { (eval echo configure:6886: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
cf_cv_sizechange=yes
else
@@ -6719,12 +6921,12 @@
echo $ac_n "checking for memmove""... $ac_c" 1>&6
-echo "configure:6723: checking for memmove" >&5
+echo "configure:6925: checking for memmove" >&5
if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6728 "configure"
+#line 6930 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char memmove(); below. */
@@ -6747,7 +6949,7 @@
; return 0; }
EOF
-if { (eval echo configure:6751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:6953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_memmove=yes"
else
@@ -6766,12 +6968,12 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for bcopy""... $ac_c" 1>&6
-echo "configure:6770: checking for bcopy" >&5
+echo "configure:6972: checking for bcopy" >&5
if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6775 "configure"
+#line 6977 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char bcopy(); below. */
@@ -6794,7 +6996,7 @@
; return 0; }
EOF
-if { (eval echo configure:6798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:7000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_bcopy=yes"
else
@@ -6810,7 +7012,7 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6
-echo "configure:6814: checking if bcopy does overlapping moves" >&5
+echo "configure:7016: checking if bcopy does overlapping moves" >&5
if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6819,7 +7021,7 @@
cf_cv_good_bcopy=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 6823 "configure"
+#line 7025 "configure"
#include "confdefs.h"
int main() {
@@ -6832,7 +7034,7 @@
}
EOF
-if { (eval echo configure:6836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_good_bcopy=yes
else
@@ -6870,7 +7072,7 @@
echo $ac_n "checking if poll really works""... $ac_c" 1>&6
-echo "configure:6874: checking if poll really works" >&5
+echo "configure:7076: checking if poll really works" >&5
if eval "test \"`echo '$''{'cf_cv_working_poll'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6879,7 +7081,7 @@
cf_cv_working_poll=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 6883 "configure"
+#line 7085 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -6899,7 +7101,7 @@
exit(ret != 0);
}
EOF
-if { (eval echo configure:6903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_working_poll=yes
else
@@ -6928,17 +7130,17 @@
ac_safe=`echo "stdbool.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for stdbool.h""... $ac_c" 1>&6
-echo "configure:6932: checking for stdbool.h" >&5
+echo "configure:7134: checking for stdbool.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6937 "configure"
+#line 7139 "configure"
#include "confdefs.h"
#include <stdbool.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7144: \"$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*
@@ -6961,13 +7163,13 @@
fi
echo $ac_n "checking for builtin bool type""... $ac_c" 1>&6
-echo "configure:6965: checking for builtin bool type" >&5
+echo "configure:7167: checking for builtin bool type" >&5
if eval "test \"`echo '$''{'cf_cv_cc_bool_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6971 "configure"
+#line 7173 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -6977,7 +7179,7 @@
bool x = false
; return 0; }
EOF
-if { (eval echo configure:6981: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+if { (eval echo configure:7183: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
cf_cv_cc_bool_type=1
else
@@ -7014,7 +7216,7 @@
;;
esac
echo $ac_n "checking for library $cf_stdcpp_libname""... $ac_c" 1>&6
-echo "configure:7018: checking for library $cf_stdcpp_libname" >&5
+echo "configure:7220: checking for library $cf_stdcpp_libname" >&5
if eval "test \"`echo '$''{'cf_cv_libstdcpp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7022,7 +7224,7 @@
cf_save="$LIBS"
LIBS="$LIBS -l$cf_stdcpp_libname"
cat > conftest.$ac_ext <<EOF
-#line 7026 "configure"
+#line 7228 "configure"
#include "confdefs.h"
#include <strstream.h>
@@ -7033,7 +7235,7 @@
; return 0; }
EOF
-if { (eval echo configure:7037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:7239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_libstdcpp=yes
else
@@ -7054,7 +7256,7 @@
if test "$GXX" = yes; then
echo $ac_n "checking version of ${CXX-g++}""... $ac_c" 1>&6
-echo "configure:7058: checking version of ${CXX-g++}" >&5
+echo "configure:7260: checking version of ${CXX-g++}" >&5
eval "${CXX-g++} --version"
case "`${CXX-g++} --version`" in
1*|2.0-6*)
@@ -7073,11 +7275,11 @@
esac
if test "$ac_cv_prog_gxx" = yes; then
echo $ac_n "checking for lib$cf_gpp_libname""... $ac_c" 1>&6
-echo "configure:7077: checking for lib$cf_gpp_libname" >&5
+echo "configure:7279: checking for lib$cf_gpp_libname" >&5
cf_save="$LIBS"
LIBS="$LIBS -l$cf_gpp_libname"
cat > conftest.$ac_ext <<EOF
-#line 7081 "configure"
+#line 7283 "configure"
#include "confdefs.h"
#include <$cf_gpp_libname/builtin.h>
@@ -7086,7 +7288,7 @@
two_arg_error_handler_t foo2 = lib_error_handler
; return 0; }
EOF
-if { (eval echo configure:7090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:7292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cxx_library=yes
CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
@@ -7106,7 +7308,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 7110 "configure"
+#line 7312 "configure"
#include "confdefs.h"
#include <builtin.h>
@@ -7115,7 +7317,7 @@
two_arg_error_handler_t foo2 = lib_error_handler
; return 0; }
EOF
-if { (eval echo configure:7119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:7321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cxx_library=yes
CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
@@ -7146,7 +7348,7 @@
fi
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:7150: checking how to run the C++ preprocessor" >&5
+echo "configure:7352: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7159,12 +7361,12 @@
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 7163 "configure"
+#line 7365 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7370: \"$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
:
@@ -7192,17 +7394,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7196: checking for $ac_hdr" >&5
+echo "configure:7398: 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 7201 "configure"
+#line 7403 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7408: \"$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*
@@ -7232,17 +7434,17 @@
ac_safe=`echo "stdbool.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for stdbool.h""... $ac_c" 1>&6
-echo "configure:7236: checking for stdbool.h" >&5
+echo "configure:7438: checking for stdbool.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7241 "configure"
+#line 7443 "configure"
#include "confdefs.h"
#include <stdbool.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7448: \"$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*
@@ -7265,13 +7467,13 @@
fi
echo $ac_n "checking for builtin bool type""... $ac_c" 1>&6
-echo "configure:7269: checking for builtin bool type" >&5
+echo "configure:7471: checking for builtin bool type" >&5
if eval "test \"`echo '$''{'cf_cv_builtin_bool'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7275 "configure"
+#line 7477 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -7281,7 +7483,7 @@
bool x = false
; return 0; }
EOF
-if { (eval echo configure:7285: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+if { (eval echo configure:7487: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
cf_cv_builtin_bool=1
else
@@ -7301,7 +7503,7 @@
echo $ac_n "checking for size of bool""... $ac_c" 1>&6
-echo "configure:7305: checking for size of bool" >&5
+echo "configure:7507: checking for size of bool" >&5
if eval "test \"`echo '$''{'cf_cv_type_of_bool'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7311,7 +7513,7 @@
cf_cv_type_of_bool=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 7315 "configure"
+#line 7517 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@@ -7355,7 +7557,7 @@
}
EOF
-if { (eval echo configure:7359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_type_of_bool=`cat cf_test.out`
else
@@ -7382,7 +7584,7 @@
echo $ac_n "checking for special defines needed for etip.h""... $ac_c" 1>&6
-echo "configure:7386: checking for special defines needed for etip.h" >&5
+echo "configure:7588: checking for special defines needed for etip.h" >&5
cf_save_CXXFLAGS="$CXXFLAGS"
cf_result="none"
for cf_math in "" MATH_H
@@ -7393,7 +7595,7 @@
test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
cat > conftest.$ac_ext <<EOF
-#line 7397 "configure"
+#line 7599 "configure"
#include "confdefs.h"
#include <etip.h.in>
@@ -7402,7 +7604,7 @@
; return 0; }
EOF
-if { (eval echo configure:7406: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+if { (eval echo configure:7608: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
test -n "$cf_math" && cat >> confdefs.h <<EOF
@@ -7429,7 +7631,7 @@
if test -n "$CXX"; then
echo $ac_n "checking if $CXX accepts parameter initialization""... $ac_c" 1>&6
-echo "configure:7433: checking if $CXX accepts parameter initialization" >&5
+echo "configure:7635: checking if $CXX accepts parameter initialization" >&5
if eval "test \"`echo '$''{'cf_cv_cpp_param_init'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7446,7 +7648,7 @@
cf_cv_cpp_param_init=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 7450 "configure"
+#line 7652 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@@ -7467,7 +7669,7 @@
void main() { }
EOF
-if { (eval echo configure:7471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_cpp_param_init=yes
else
@@ -7511,17 +7713,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7515: checking for $ac_hdr" >&5
+echo "configure:7717: 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 7520 "configure"
+#line 7722 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7727: \"$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*
@@ -7549,7 +7751,7 @@
echo $ac_n "checking if $CXX supports vscan function""... $ac_c" 1>&6
-echo "configure:7553: checking if $CXX supports vscan function" >&5
+echo "configure:7755: checking if $CXX supports vscan function" >&5
if eval "test \"`echo '$''{'cf_cv_cpp_vscan_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7562,7 +7764,7 @@
strstream_cast) cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;;
esac
cat > conftest.$ac_ext <<EOF
-#line 7566 "configure"
+#line 7768 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -7602,7 +7804,7 @@
int tmp, foo = scanw("%d", &tmp)
; return 0; }
EOF
-if { (eval echo configure:7606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:7808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_cpp_vscan_func=$cf_vscan_func; break
else
@@ -7703,7 +7905,7 @@
if test "$cf_cv_header_stdbool_h" = 1 ; then
echo $ac_n "checking for size of bool""... $ac_c" 1>&6
-echo "configure:7707: checking for size of bool" >&5
+echo "configure:7909: checking for size of bool" >&5
if eval "test \"`echo '$''{'cf_cv_type_of_bool'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7713,7 +7915,7 @@
cf_cv_type_of_bool=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 7717 "configure"
+#line 7919 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@@ -7757,7 +7959,7 @@
}
EOF
-if { (eval echo configure:7761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_type_of_bool=`cat cf_test.out`
else
@@ -7784,7 +7986,7 @@
else
echo $ac_n "checking for fallback type of bool""...
$ac_c" 1>&6
-echo "configure:7788: checking for fallback type of bool" >&5
+echo "configure:7990: checking for fallback type of bool" >&5
case "$host_cpu" in #(vi
i?86) cf_cv_type_of_bool=char ;; #(vi
*) cf_cv_type_of_bool=int ;;
@@ -7802,7 +8004,7 @@
# Extract the first word of "$cf_ada_make", so it can be a program name with
args.
set dummy $cf_ada_make; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7806: checking for $ac_word" >&5
+echo "configure:8008: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gnat_exists'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7856,7 +8058,7 @@
# Extract the first word of "m4", so it can be a program name with args.
set dummy m4; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7860: checking for $ac_word" >&5
+echo "configure:8062: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_M4_exists'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7889,7 +8091,7 @@
fi
if test "$cf_cv_prog_gnat_correct" = yes; then
echo $ac_n "checking if GNAT works""... $ac_c" 1>&6
-echo "configure:7893: checking if GNAT works" >&5
+echo "configure:8095: checking if GNAT works" >&5
rm -f conftest*
cat >>conftest.ads <<CF_EOF
@@ -8037,7 +8239,7 @@
### Construct the library-subsets, if any, from this set of keywords:
### none, base, ext_funcs, termlib.
echo $ac_n "checking for library subsets""... $ac_c" 1>&6
-echo "configure:8041: checking for library subsets" >&5
+echo "configure:8243: checking for library subsets" >&5
if test "$with_termlib" = yes ; then
LIB_SUBSETS="termlib "
else
@@ -8098,7 +8300,7 @@
### Build up pieces for makefile rules
echo $ac_n "checking default library suffix""... $ac_c" 1>&6
-echo "configure:8102: checking default library suffix" >&5
+echo "configure:8304: checking default library suffix" >&5
case $DFT_LWR_MODEL in
libtool) DFT_ARG_SUFFIX='' ;;
@@ -8111,7 +8313,7 @@
echo "$ac_t""$DFT_ARG_SUFFIX" 1>&6
echo $ac_n "checking default library-dependency suffix""... $ac_c" 1>&6
-echo "configure:8115: checking default library-dependency suffix" >&5
+echo "configure:8317: checking default library-dependency suffix" >&5
case $DFT_LWR_MODEL in
@@ -8138,7 +8340,7 @@
echo "$ac_t""$DFT_DEP_SUFFIX" 1>&6
echo $ac_n "checking default object directory""... $ac_c" 1>&6
-echo "configure:8142: checking default object directory" >&5
+echo "configure:8344: checking default object directory" >&5
case $DFT_LWR_MODEL in
libtool) DFT_OBJ_SUBDIR='obj_lo' ;;
@@ -8157,7 +8359,7 @@
# libtool thinks it can make c++ shared libraries (perhaps only g++)
echo $ac_n "checking c++ library-dependency suffix""... $ac_c" 1>&6
-echo "configure:8161: checking c++ library-dependency suffix" >&5
+echo "configure:8363: checking c++ library-dependency suffix" >&5
if test "$with_libtool" = "yes"; then
CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
else
@@ -8185,7 +8387,7 @@
test "$with_termlib" = yes && SHLIB_LIST="$SHLIB_LIST -ltinfo${LIB_SUFFIX}"
echo $ac_n "checking where we will install curses.h""... $ac_c" 1>&6
-echo "configure:8189: checking where we will install curses.h" >&5
+echo "configure:8391: checking where we will install curses.h" >&5
test "$with_overwrite" = no && \
test "x$includedir" = 'x${prefix}/include' && \
includedir='$(prefix)/include/ncurses'${LIB_SUFFIX}
@@ -8213,7 +8415,7 @@
echo $ac_n "checking for src modules""... $ac_c" 1>&6
-echo "configure:8217: checking for src modules" >&5
+echo "configure:8419: checking for src modules" >&5
# dependencies and linker-arguments for test-programs
TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS"
@@ -8840,6 +9042,7 @@
SRC_SUBDIRS="$SRC_SUBDIRS"
TERMINFO="$TERMINFO"
TINFO_NAME="$TINFO_NAME"
+TRIO_LIBS="$TRIO_LIBS"
WITH_CURSES_H="$with_curses_h"
WITH_ECHO="$with_echo"
WITH_OVERWRITE="$with_overwrite"
--- configure.in.orig Fri Feb 1 15:41:54 2002
+++ configure.in Fri Feb 1 18:37:58 2002
@@ -977,26 +977,30 @@
strstr \
tcgetpgrp \
times \
-vsnprintf \
)
if test "$with_getcap" = "yes" ; then
CF_CGETENT
fi
+# add replacements for vsnprintf and vsscanf if not found
+AC_CHECK_FUNCS(vsnprintf,[
+ AC_DEFINE(HAVE_VSNPRINTF)
+ AC_CHECK_FUNCS(vsscanf,[
+ HAVE_VSSCANF=1],[
+ HAVE_VSSCANF=0
+ AC_DEFINE_UNQUOTED(NEED_TRIO, 1,
+ [Define if we need the trio replacement *printf() functions])
+ AC_CHECK_FUNC(fabs, , AC_CHECK_LIB(m, fabs))])],[
+ AC_DEFINE_UNQUOTED(NEED_TRIO, 1,
+ [Define if we need the trio replacement *printf() functions])
+ AC_CHECK_FUNC(fabs, , AC_CHECK_LIB(m, fabs))])
+AC_SUBST(HAVE_VSSCANF)
+
CF_ISASCII
CF_STRUCT_SIGACTION
CF_FUNC_TERMIOS
-CF_FUNC_VSSCANF
CF_MKSTEMP
-# setup for prototype of fallback for vsscanf()
-if test "$cf_cv_func_vsscanf" = vsscanf ; then
- HAVE_VSSCANF=1
-else
- HAVE_VSSCANF=0
-fi
-AC_SUBST(HAVE_VSSCANF)
-
dnl FIXME (may need this) AC_SYS_RESTARTABLE_SYSCALLS
if test "$cross_compiling" = yes ; then
AC_MSG_WARN(cross compiling: assume setvbuf params not reversed)
- Building 64-bit version of ncurses on Solaris 8, Albert Chin, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Thomas Dickey, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Albert Chin, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Thomas E. Dickey, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Albert Chin, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Thomas Dickey, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Albert Chin, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Thomas Dickey, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Albert Chin, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Thomas Dickey, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8,
Albert Chin <=
- Re: Building 64-bit version of ncurses on Solaris 8, Albert Chin, 2002/02/02
- Re: Building 64-bit version of ncurses on Solaris 8, Daniel Weaver, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Thomas E. Dickey, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Albert Chin, 2002/02/01
- Re: Building 64-bit version of ncurses on Solaris 8, Bjorn Reese, 2002/02/02
- Re: Building 64-bit version of ncurses on Solaris 8, Daniel Stenberg, 2002/02/04
- Re: Building 64-bit version of ncurses on Solaris 8, Albert Chin, 2002/02/01
Re: Building 64-bit version of ncurses on Solaris 8, Thomas Dickey, 2002/02/02