+ compiler warning fixes for test programs.
+ various build-fixes for test-programs with pdcurses.
+ updated configure checks for X packages in test/configure from xterm
#267 changes.
+ add configure check to gnatmake, to accommodate cygwin.
dnl
dnl Author: Thomas E. Dickey
dnl
-dnl $Id: aclocal.m4,v 1.17 2010/10/23 20:21:59 tom Exp $
+dnl $Id: aclocal.m4,v 1.18 2010/11/13 19:19:59 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
AC_SUBST(EXTRA_CFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_GNAT_GENERICS version: 1 updated: 2010/11/13 14:15:18
+dnl ----------------
+AC_DEFUN([CF_GNAT_GENERICS],
+[
+AC_MSG_CHECKING(if GNAT supports generics)
+case $cf_gnat_version in #(vi
+3.[[1-9]]*|[[4-9]].*) #(vi
+ cf_gnat_generics=yes
+ ;;
+*)
+ cf_gnat_generics=no
+ ;;
+esac
+AC_MSG_RESULT($cf_gnat_generics)
+
+if test "$cf_gnat_generics" = yes
+then
+ cf_compile_generics=generics
+ cf_generic_objects="\${GENOBJS}"
+else
+ cf_compile_generics=
+ cf_generic_objects=
+fi
+
+AC_SUBST(cf_compile_generics)
+AC_SUBST(cf_generic_objects)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_GNAT_PRAGMA_UNREF version: 1 updated: 2010/06/19 15:22:18
dnl --------------------
dnl Check if the gnat pragma "Unreferenced" works.
AC_SUBST(PRAGMA_UNREF)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_GNAT_PROJECTS version: 1 updated: 2010/11/13 14:15:18
+dnl ----------------
+AC_DEFUN([CF_GNAT_PROJECTS],
+[
+AC_MSG_CHECKING(if GNAT supports project files)
+case $cf_gnat_version in #(vi
+3.[[0-9]]*) #(vi
+ cf_gnat_projects=no
+ ;;
+*)
+ case $cf_cv_system_name in #(vi
+ cygwin*) #(vi
+ cf_gnat_projects=no
+ ;;
+ *)
+ cf_gnat_projects=yes
+ ;;
+ esac
+ ;;
+esac
+AC_MSG_RESULT($cf_gnat_projects)
+
+if test "$cf_gnat_projects" = yes
+then
+ USE_OLD_MAKERULES="#"
+ USE_GNAT_PROJECTS=""
+else
+ USE_OLD_MAKERULES=""
+ USE_GNAT_PROJECTS="#"
+fi
+
+AC_SUBST(USE_OLD_MAKERULES)
+AC_SUBST(USE_GNAT_PROJECTS)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_GNAT_TRY_LINK version: 2 updated: 2010/08/14 18:25:37
dnl ----------------
dnl Verify that a test program compiles/links with GNAT.
rm -rf conftest*
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_VERSION version: 15 updated: 2010/10/23 15:52:32
+dnl CF_GNAT_VERSION version: 16 updated: 2010/11/13 14:15:18
dnl ---------------
dnl Verify version of GNAT.
AC_DEFUN([CF_GNAT_VERSION],
[
AC_MSG_CHECKING(for gnat version)
-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | grep '[[0-9]].[[0-9]][[0-9]]*' |\
- sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'`
+cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
+ grep '[[0-9]].[[0-9]][[0-9]]*' |\
+ sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'`
AC_MSG_RESULT($cf_gnat_version)
-case $cf_gnat_version in
- 3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*)
- cf_cv_prog_gnat_correct=yes
- ;;
- *) echo Unsupported GNAT version $cf_gnat_version. Required is 3.11 or better. Disabling Ada95 binding.
- cf_cv_prog_gnat_correct=no
- ;;
-esac
-
-case $cf_gnat_version in
- 3.[[1-9]]*|[[4-9]].*)
- cf_compile_generics=generics
- cf_generic_objects="\${GENOBJS}"
- ;;
- *) cf_compile_generics=
- cf_generic_objects=
- ;;
-esac
-
-case $cf_gnat_version in
- 3.[[0-9]]*)
- USE_OLD_MAKERULES=""
- USE_GNAT_PROJECTS="#"
- ;;
- *)
- USE_OLD_MAKERULES="#"
- USE_GNAT_PROJECTS=""
- ;;
+case $cf_gnat_version in #(vi
+3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*) #(vi
+ cf_cv_prog_gnat_correct=yes
+ ;;
+*)
+ AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.)
+ cf_cv_prog_gnat_correct=no
+ ;;
esac
-AC_SUBST(cf_compile_generics)
-AC_SUBST(cf_generic_objects)
-
-AC_SUBST(USE_OLD_MAKERULES)
-AC_SUBST(USE_GNAT_PROJECTS)
+CF_GNAT_GENERICS
+CF_GNAT_PROJECTS
])
dnl ---------------------------------------------------------------------------
dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
echo "$as_me:10625: checking for gnat version" >&5
echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
- sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
-echo "$as_me:10629: result: $cf_gnat_version" >&5
+cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
+ grep '[0-9].[0-9][0-9]*' |\
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+echo "$as_me:10630: result: $cf_gnat_version" >&5
echo "${ECHO_T}$cf_gnat_version" >&6
-case $cf_gnat_version in
- 3.1[1-9]*|3.[2-9]*|[4-9].*)
- cf_cv_prog_gnat_correct=yes
- ;;
- *) echo Unsupported GNAT version $cf_gnat_version. Required is 3.11 or better. Disabling Ada95 binding.
- cf_cv_prog_gnat_correct=no
- ;;
+case $cf_gnat_version in #(vi
+3.1[1-9]*|3.[2-9]*|[4-9].*) #(vi
+ cf_cv_prog_gnat_correct=yes
+ ;;
+*)
+ { echo "$as_me:10638: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ cf_cv_prog_gnat_correct=no
+ ;;
esac
-case $cf_gnat_version in
- 3.[1-9]*|[4-9].*)
- cf_compile_generics=generics
- cf_generic_objects="\${GENOBJS}"
- ;;
- *) cf_compile_generics=
- cf_generic_objects=
- ;;
+echo "$as_me:10644: checking if GNAT supports generics" >&5
+echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+case $cf_gnat_version in #(vi
+3.[1-9]*|[4-9].*) #(vi
+ cf_gnat_generics=yes
+ ;;
+*)
+ cf_gnat_generics=no
+ ;;
esac
+echo "$as_me:10654: result: $cf_gnat_generics" >&5
+echo "${ECHO_T}$cf_gnat_generics" >&6
-case $cf_gnat_version in
- 3.[0-9]*)
- USE_OLD_MAKERULES=""
- USE_GNAT_PROJECTS="#"
- ;;
- *)
- USE_OLD_MAKERULES="#"
- USE_GNAT_PROJECTS=""
- ;;
+if test "$cf_gnat_generics" = yes
+then
+ cf_compile_generics=generics
+ cf_generic_objects="\${GENOBJS}"
+else
+ cf_compile_generics=
+ cf_generic_objects=
+fi
+
+echo "$as_me:10666: checking if GNAT supports project files" >&5
+echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+case $cf_gnat_version in #(vi
+3.[0-9]*) #(vi
+ cf_gnat_projects=no
+ ;;
+*)
+ case $cf_cv_system_name in #(vi
+ cygwin*) #(vi
+ cf_gnat_projects=no
+ ;;
+ *)
+ cf_gnat_projects=yes
+ ;;
+ esac
+ ;;
esac
+echo "$as_me:10683: result: $cf_gnat_projects" >&5
+echo "${ECHO_T}$cf_gnat_projects" >&6
+
+if test "$cf_gnat_projects" = yes
+then
+ USE_OLD_MAKERULES="#"
+ USE_GNAT_PROJECTS=""
+else
+ USE_OLD_MAKERULES=""
+ USE_GNAT_PROJECTS="#"
+fi
# Extract the first word of "m4", so it can be a program name with args.
set dummy m4; ac_word=$2
-echo "$as_me:10664: checking for $ac_word" >&5
+echo "$as_me:10697: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_M4_exists+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_M4_exists="yes"
-echo "$as_me:10679: found $ac_dir/$ac_word" >&5
+echo "$as_me:10712: found $ac_dir/$ac_word" >&5
break
done
fi
M4_exists=$ac_cv_prog_M4_exists
if test -n "$M4_exists"; then
- echo "$as_me:10688: result: $M4_exists" >&5
+ echo "$as_me:10721: result: $M4_exists" >&5
echo "${ECHO_T}$M4_exists" >&6
else
- echo "$as_me:10691: result: no" >&5
+ echo "$as_me:10724: result: no" >&5
echo "${ECHO_T}no" >&6
fi
echo Ada95 binding required program m4 not found. Ada95 binding disabled.
fi
if test "$cf_cv_prog_gnat_correct" = yes; then
- echo "$as_me:10700: checking if GNAT works" >&5
+ echo "$as_me:10733: checking if GNAT works" >&5
echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
rm -rf conftest*
fi
rm -rf conftest*
- echo "$as_me:10728: result: $cf_cv_prog_gnat_correct" >&5
+ echo "$as_me:10761: result: $cf_cv_prog_gnat_correct" >&5
echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
fi
fi
ADAFLAGS="$ADAFLAGS -O3 -gnatpn"
-echo "$as_me:10737: checking if GNAT pragma Unreferenced works" >&5
+echo "$as_me:10770: checking if GNAT pragma Unreferenced works" >&5
echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
if test "${cf_cv_pragma_unreferenced+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
rm -rf conftest*
fi
-echo "$as_me:10768: result: $cf_cv_pragma_unreferenced" >&5
+echo "$as_me:10801: result: $cf_cv_pragma_unreferenced" >&5
echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
# if the pragma is supported, use it (needed in the Trace code).
PRAGMA_UNREF=FALSE
fi
-echo "$as_me:10778: checking for ada-compiler" >&5
+echo "$as_me:10811: checking for ada-compiler" >&5
echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
# Check whether --with-ada-compiler or --without-ada-compiler was given.
cf_ada_compiler=gnatmake
fi;
-echo "$as_me:10789: result: $cf_ada_compiler" >&5
+echo "$as_me:10822: result: $cf_ada_compiler" >&5
echo "${ECHO_T}$cf_ada_compiler" >&6
cf_ada_package=terminal_interface
-echo "$as_me:10794: checking for ada-include" >&5
+echo "$as_me:10827: checking for ada-include" >&5
echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
# Check whether --with-ada-include or --without-ada-include was given.
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:10830: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:10863: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
fi
ADA_INCLUDE="$withval"
-echo "$as_me:10839: result: $ADA_INCLUDE" >&5
+echo "$as_me:10872: result: $ADA_INCLUDE" >&5
echo "${ECHO_T}$ADA_INCLUDE" >&6
-echo "$as_me:10842: checking for ada-objects" >&5
+echo "$as_me:10875: checking for ada-objects" >&5
echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
# Check whether --with-ada-objects or --without-ada-objects was given.
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:10878: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:10911: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
fi
ADA_OBJECTS="$withval"
-echo "$as_me:10887: result: $ADA_OBJECTS" >&5
+echo "$as_me:10920: result: $ADA_OBJECTS" >&5
echo "${ECHO_T}$ADA_OBJECTS" >&6
-echo "$as_me:10890: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:10923: checking if an Ada95 shared-library should be built" >&5
echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
# Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
else
with_ada_sharedlib=no
fi;
-echo "$as_me:10900: result: $with_ada_sharedlib" >&5
+echo "$as_me:10933: result: $with_ada_sharedlib" >&5
echo "${ECHO_T}$with_ada_sharedlib" >&6
ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
fi
### Build up pieces for makefile rules
-echo "$as_me:10958: checking default library suffix" >&5
+echo "$as_me:10991: checking default library suffix" >&5
echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in
shared) DFT_ARG_SUFFIX='' ;;
esac
test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:10969: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:11002: result: $DFT_ARG_SUFFIX" >&5
echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
-echo "$as_me:10972: checking default library-dependency suffix" >&5
+echo "$as_me:11005: checking default library-dependency suffix" >&5
echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in #(vi
esac
test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
-echo "$as_me:11025: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:11058: result: $DFT_DEP_SUFFIX" >&5
echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
-echo "$as_me:11028: checking default object directory" >&5
+echo "$as_me:11061: checking default object directory" >&5
echo $ECHO_N "checking default object directory... $ECHO_C" >&6
case $DFT_LWR_MODEL in
DFT_OBJ_SUBDIR='obj_s' ;;
esac
esac
-echo "$as_me:11044: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:11077: result: $DFT_OBJ_SUBDIR" >&5
echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
### Set up low-level terminfo dependencies for makefiles.
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:11257: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:11290: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:11433: error: ambiguous option: $1
+ { { echo "$as_me:11466: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:11452: error: unrecognized option: $1
+ -*) { { echo "$as_me:11485: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
- *) { { echo "$as_me:11522: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:11555: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:11833: creating $ac_file" >&5
+ { echo "$as_me:11866: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:11851: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:11884: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:11864: error: cannot find input file: $f" >&5
+ { { echo "$as_me:11897: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:11930: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:11963: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:11941: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:11974: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:11954: error: cannot find input file: $f" >&5
+ { { echo "$as_me:11987: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:12012: $ac_file is unchanged" >&5
+ { echo "$as_me:12045: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1607 2010/11/06 22:12:59 tom Exp $
+-- $Id: NEWS,v 1.1610 2010/11/13 20:23:02 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20101113
+ + compiler warning fixes for test programs.
+ + various build-fixes for test-programs with pdcurses.
+ + updated configure checks for X packages in test/configure from xterm
+ #267 changes.
+ + add configure check to gnatmake, to accommodate cygwin.
+
20101106
+ correct list of sub-directories needed in Ada95 tree for building as
a separate package.
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.546 2010/10/23 20:14:30 tom Exp $
+dnl $Id: aclocal.m4,v 1.547 2010/11/13 19:17:50 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
AC_SUBST(EXTRA_CFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_GNAT_GENERICS version: 1 updated: 2010/11/13 14:15:18
+dnl ----------------
+AC_DEFUN([CF_GNAT_GENERICS],
+[
+AC_MSG_CHECKING(if GNAT supports generics)
+case $cf_gnat_version in #(vi
+3.[[1-9]]*|[[4-9]].*) #(vi
+ cf_gnat_generics=yes
+ ;;
+*)
+ cf_gnat_generics=no
+ ;;
+esac
+AC_MSG_RESULT($cf_gnat_generics)
+
+if test "$cf_gnat_generics" = yes
+then
+ cf_compile_generics=generics
+ cf_generic_objects="\${GENOBJS}"
+else
+ cf_compile_generics=
+ cf_generic_objects=
+fi
+
+AC_SUBST(cf_compile_generics)
+AC_SUBST(cf_generic_objects)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_GNAT_PRAGMA_UNREF version: 1 updated: 2010/06/19 15:22:18
dnl --------------------
dnl Check if the gnat pragma "Unreferenced" works.
AC_SUBST(PRAGMA_UNREF)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_GNAT_PROJECTS version: 1 updated: 2010/11/13 14:15:18
+dnl ----------------
+AC_DEFUN([CF_GNAT_PROJECTS],
+[
+AC_MSG_CHECKING(if GNAT supports project files)
+case $cf_gnat_version in #(vi
+3.[[0-9]]*) #(vi
+ cf_gnat_projects=no
+ ;;
+*)
+ case $cf_cv_system_name in #(vi
+ cygwin*) #(vi
+ cf_gnat_projects=no
+ ;;
+ *)
+ cf_gnat_projects=yes
+ ;;
+ esac
+ ;;
+esac
+AC_MSG_RESULT($cf_gnat_projects)
+
+if test "$cf_gnat_projects" = yes
+then
+ USE_OLD_MAKERULES="#"
+ USE_GNAT_PROJECTS=""
+else
+ USE_OLD_MAKERULES=""
+ USE_GNAT_PROJECTS="#"
+fi
+
+AC_SUBST(USE_OLD_MAKERULES)
+AC_SUBST(USE_GNAT_PROJECTS)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_GNAT_TRY_LINK version: 2 updated: 2010/08/14 18:25:37
dnl ----------------
dnl Verify that a test program compiles/links with GNAT.
rm -rf conftest*
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_VERSION version: 15 updated: 2010/10/23 15:52:32
+dnl CF_GNAT_VERSION version: 16 updated: 2010/11/13 14:15:18
dnl ---------------
dnl Verify version of GNAT.
AC_DEFUN([CF_GNAT_VERSION],
[
AC_MSG_CHECKING(for gnat version)
-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | grep '[[0-9]].[[0-9]][[0-9]]*' |\
- sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'`
+cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
+ grep '[[0-9]].[[0-9]][[0-9]]*' |\
+ sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'`
AC_MSG_RESULT($cf_gnat_version)
-case $cf_gnat_version in
- 3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*)
- cf_cv_prog_gnat_correct=yes
- ;;
- *) echo Unsupported GNAT version $cf_gnat_version. Required is 3.11 or better. Disabling Ada95 binding.
- cf_cv_prog_gnat_correct=no
- ;;
-esac
-
-case $cf_gnat_version in
- 3.[[1-9]]*|[[4-9]].*)
- cf_compile_generics=generics
- cf_generic_objects="\${GENOBJS}"
- ;;
- *) cf_compile_generics=
- cf_generic_objects=
- ;;
-esac
-
-case $cf_gnat_version in
- 3.[[0-9]]*)
- USE_OLD_MAKERULES=""
- USE_GNAT_PROJECTS="#"
- ;;
- *)
- USE_OLD_MAKERULES="#"
- USE_GNAT_PROJECTS=""
- ;;
+case $cf_gnat_version in #(vi
+3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*) #(vi
+ cf_cv_prog_gnat_correct=yes
+ ;;
+*)
+ AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.)
+ cf_cv_prog_gnat_correct=no
+ ;;
esac
-AC_SUBST(cf_compile_generics)
-AC_SUBST(cf_generic_objects)
-
-AC_SUBST(USE_OLD_MAKERULES)
-AC_SUBST(USE_GNAT_PROJECTS)
+CF_GNAT_GENERICS
+CF_GNAT_PROJECTS
])
dnl ---------------------------------------------------------------------------
dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
echo "$as_me:17984: checking for gnat version" >&5
echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
- sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
-echo "$as_me:17988: result: $cf_gnat_version" >&5
+cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
+ grep '[0-9].[0-9][0-9]*' |\
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+echo "$as_me:17989: result: $cf_gnat_version" >&5
echo "${ECHO_T}$cf_gnat_version" >&6
-case $cf_gnat_version in
- 3.1[1-9]*|3.[2-9]*|[4-9].*)
- cf_cv_prog_gnat_correct=yes
- ;;
- *) echo Unsupported GNAT version $cf_gnat_version. Required is 3.11 or better. Disabling Ada95 binding.
- cf_cv_prog_gnat_correct=no
- ;;
+case $cf_gnat_version in #(vi
+3.1[1-9]*|3.[2-9]*|[4-9].*) #(vi
+ cf_cv_prog_gnat_correct=yes
+ ;;
+*)
+ { echo "$as_me:17997: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ cf_cv_prog_gnat_correct=no
+ ;;
esac
-case $cf_gnat_version in
- 3.[1-9]*|[4-9].*)
- cf_compile_generics=generics
- cf_generic_objects="\${GENOBJS}"
- ;;
- *) cf_compile_generics=
- cf_generic_objects=
- ;;
+echo "$as_me:18003: checking if GNAT supports generics" >&5
+echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+case $cf_gnat_version in #(vi
+3.[1-9]*|[4-9].*) #(vi
+ cf_gnat_generics=yes
+ ;;
+*)
+ cf_gnat_generics=no
+ ;;
esac
+echo "$as_me:18013: result: $cf_gnat_generics" >&5
+echo "${ECHO_T}$cf_gnat_generics" >&6
-case $cf_gnat_version in
- 3.[0-9]*)
- USE_OLD_MAKERULES=""
- USE_GNAT_PROJECTS="#"
- ;;
- *)
- USE_OLD_MAKERULES="#"
- USE_GNAT_PROJECTS=""
- ;;
+if test "$cf_gnat_generics" = yes
+then
+ cf_compile_generics=generics
+ cf_generic_objects="\${GENOBJS}"
+else
+ cf_compile_generics=
+ cf_generic_objects=
+fi
+
+echo "$as_me:18025: checking if GNAT supports project files" >&5
+echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+case $cf_gnat_version in #(vi
+3.[0-9]*) #(vi
+ cf_gnat_projects=no
+ ;;
+*)
+ case $cf_cv_system_name in #(vi
+ cygwin*) #(vi
+ cf_gnat_projects=no
+ ;;
+ *)
+ cf_gnat_projects=yes
+ ;;
+ esac
+ ;;
esac
+echo "$as_me:18042: result: $cf_gnat_projects" >&5
+echo "${ECHO_T}$cf_gnat_projects" >&6
+
+if test "$cf_gnat_projects" = yes
+then
+ USE_OLD_MAKERULES="#"
+ USE_GNAT_PROJECTS=""
+else
+ USE_OLD_MAKERULES=""
+ USE_GNAT_PROJECTS="#"
+fi
# Extract the first word of "m4", so it can be a program name with args.
set dummy m4; ac_word=$2
-echo "$as_me:18023: checking for $ac_word" >&5
+echo "$as_me:18056: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_M4_exists+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_M4_exists="yes"
-echo "$as_me:18038: found $ac_dir/$ac_word" >&5
+echo "$as_me:18071: found $ac_dir/$ac_word" >&5
break
done
fi
M4_exists=$ac_cv_prog_M4_exists
if test -n "$M4_exists"; then
- echo "$as_me:18047: result: $M4_exists" >&5
+ echo "$as_me:18080: result: $M4_exists" >&5
echo "${ECHO_T}$M4_exists" >&6
else
- echo "$as_me:18050: result: no" >&5
+ echo "$as_me:18083: result: no" >&5
echo "${ECHO_T}no" >&6
fi
echo Ada95 binding required program m4 not found. Ada95 binding disabled.
fi
if test "$cf_cv_prog_gnat_correct" = yes; then
- echo "$as_me:18059: checking if GNAT works" >&5
+ echo "$as_me:18092: checking if GNAT works" >&5
echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
rm -rf conftest*
fi
rm -rf conftest*
- echo "$as_me:18087: result: $cf_cv_prog_gnat_correct" >&5
+ echo "$as_me:18120: result: $cf_cv_prog_gnat_correct" >&5
echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
fi
fi
ADAFLAGS="$ADAFLAGS -O3 -gnatpn"
-echo "$as_me:18096: checking if GNAT pragma Unreferenced works" >&5
+echo "$as_me:18129: checking if GNAT pragma Unreferenced works" >&5
echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
if test "${cf_cv_pragma_unreferenced+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
rm -rf conftest*
fi
-echo "$as_me:18127: result: $cf_cv_pragma_unreferenced" >&5
+echo "$as_me:18160: result: $cf_cv_pragma_unreferenced" >&5
echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
# if the pragma is supported, use it (needed in the Trace code).
PRAGMA_UNREF=FALSE
fi
-echo "$as_me:18137: checking for ada-compiler" >&5
+echo "$as_me:18170: checking for ada-compiler" >&5
echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
# Check whether --with-ada-compiler or --without-ada-compiler was given.
cf_ada_compiler=gnatmake
fi;
-echo "$as_me:18148: result: $cf_ada_compiler" >&5
+echo "$as_me:18181: result: $cf_ada_compiler" >&5
echo "${ECHO_T}$cf_ada_compiler" >&6
cf_ada_package=terminal_interface
-echo "$as_me:18153: checking for ada-include" >&5
+echo "$as_me:18186: checking for ada-include" >&5
echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
# Check whether --with-ada-include or --without-ada-include was given.
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:18189: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:18222: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
fi
ADA_INCLUDE="$withval"
-echo "$as_me:18198: result: $ADA_INCLUDE" >&5
+echo "$as_me:18231: result: $ADA_INCLUDE" >&5
echo "${ECHO_T}$ADA_INCLUDE" >&6
-echo "$as_me:18201: checking for ada-objects" >&5
+echo "$as_me:18234: checking for ada-objects" >&5
echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
# Check whether --with-ada-objects or --without-ada-objects was given.
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:18237: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:18270: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
fi
ADA_OBJECTS="$withval"
-echo "$as_me:18246: result: $ADA_OBJECTS" >&5
+echo "$as_me:18279: result: $ADA_OBJECTS" >&5
echo "${ECHO_T}$ADA_OBJECTS" >&6
-echo "$as_me:18249: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:18282: checking if an Ada95 shared-library should be built" >&5
echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
# Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
else
with_ada_sharedlib=no
fi;
-echo "$as_me:18259: result: $with_ada_sharedlib" >&5
+echo "$as_me:18292: result: $with_ada_sharedlib" >&5
echo "${ECHO_T}$with_ada_sharedlib" >&6
ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
### chooses to split module lists into libraries.
###
### (see CF_LIB_RULES).
-echo "$as_me:18290: checking for library subsets" >&5
+echo "$as_me:18323: checking for library subsets" >&5
echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
LIB_SUBSETS=
test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
-echo "$as_me:18331: result: $LIB_SUBSETS" >&5
+echo "$as_me:18364: result: $LIB_SUBSETS" >&5
echo "${ECHO_T}$LIB_SUBSETS" >&6
### Construct the list of include-directories to be generated
fi
### Build up pieces for makefile rules
-echo "$as_me:18369: checking default library suffix" >&5
+echo "$as_me:18402: checking default library suffix" >&5
echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in
shared) DFT_ARG_SUFFIX='' ;;
esac
test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:18380: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18413: result: $DFT_ARG_SUFFIX" >&5
echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
-echo "$as_me:18383: checking default library-dependency suffix" >&5
+echo "$as_me:18416: checking default library-dependency suffix" >&5
echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in #(vi
esac
test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
-echo "$as_me:18436: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:18469: result: $DFT_DEP_SUFFIX" >&5
echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
-echo "$as_me:18439: checking default object directory" >&5
+echo "$as_me:18472: checking default object directory" >&5
echo $ECHO_N "checking default object directory... $ECHO_C" >&6
case $DFT_LWR_MODEL in
DFT_OBJ_SUBDIR='obj_s' ;;
esac
esac
-echo "$as_me:18455: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:18488: result: $DFT_OBJ_SUBDIR" >&5
echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
# libtool thinks it can make c++ shared libraries (perhaps only g++)
if test "$cf_with_cxx" = yes ; then
-echo "$as_me:18460: checking c++ library-dependency suffix" >&5
+echo "$as_me:18493: checking c++ library-dependency suffix" >&5
echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
if test "$with_libtool" != "no"; then
CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
fi
-echo "$as_me:18517: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:18550: result: $CXX_LIB_SUFFIX" >&5
echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
fi
if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
then
- echo "$as_me:18671: checking if linker supports switching between static/dynamic" >&5
+ echo "$as_me:18704: checking if linker supports switching between static/dynamic" >&5
echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
rm -f libconftest.a
cat >conftest.$ac_ext <<EOF
-#line 18676 "configure"
+#line 18709 "configure"
#include <stdio.h>
int cf_ldflags_static(FILE *fp) { return fflush(fp); }
EOF
- if { (eval echo "$as_me:18680: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:18713: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:18683: \$? = $ac_status" >&5
+ echo "$as_me:18716: \$? = $ac_status" >&5
(exit $ac_status); } ; then
( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 18694 "configure"
+#line 18727 "configure"
#include "confdefs.h"
-#line 18697 "configure"
+#line 18730 "configure"
#include <stdio.h>
int cf_ldflags_static(FILE *fp);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18745: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18715: \$? = $ac_status" >&5
+ echo "$as_me:18748: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18718: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18751: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18721: \$? = $ac_status" >&5
+ echo "$as_me:18754: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_ldflags_static=yes
else
rm -f libconftest.*
LIBS="$cf_save_LIBS"
- echo "$as_me:18734: result: $cf_ldflags_static" >&5
+ echo "$as_me:18767: result: $cf_ldflags_static" >&5
echo "${ECHO_T}$cf_ldflags_static" >&6
if test $cf_ldflags_static != yes
;;
esac
-echo "$as_me:18750: checking where we will install curses.h" >&5
+echo "$as_me:18783: checking where we will install curses.h" >&5
echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
test "$with_overwrite" = no && \
test "x$includedir" = 'x${prefix}/include' && \
includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
-echo "$as_me:18755: result: $includedir" >&5
+echo "$as_me:18788: result: $includedir" >&5
echo "${ECHO_T}$includedir" >&6
### Resolve a conflict between normal and wide-curses by forcing applications
if test "$with_overwrite" != no ; then
if test "$NCURSES_LIBUTF8" = 1 ; then
NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
- { echo "$as_me:18763: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ { echo "$as_me:18796: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
fi
fi
### Construct the list of subdirectories for which we'll customize makefiles
### with the appropriate compile-rules.
-echo "$as_me:18780: checking for src modules" >&5
+echo "$as_me:18813: checking for src modules" >&5
echo $ECHO_N "checking for src modules... $ECHO_C" >&6
# dependencies and linker-arguments for test-programs
fi
fi
done
-echo "$as_me:18843: result: $cf_cv_src_modules" >&5
+echo "$as_me:18876: result: $cf_cv_src_modules" >&5
echo "${ECHO_T}$cf_cv_src_modules" >&6
TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
# Extract the first word of "tic", so it can be a program name with args.
set dummy tic; ac_word=$2
-echo "$as_me:19049: checking for $ac_word" >&5
+echo "$as_me:19082: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_TIC_PATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
- echo "$as_me:19066: found $ac_dir/$ac_word" >&5
+ echo "$as_me:19099: found $ac_dir/$ac_word" >&5
break
fi
done
TIC_PATH=$ac_cv_path_TIC_PATH
if test -n "$TIC_PATH"; then
- echo "$as_me:19078: result: $TIC_PATH" >&5
+ echo "$as_me:19111: result: $TIC_PATH" >&5
echo "${ECHO_T}$TIC_PATH" >&6
else
- echo "$as_me:19081: result: no" >&5
+ echo "$as_me:19114: result: no" >&5
echo "${ECHO_T}no" >&6
fi
then
if test "$TIC_PATH" = unknown
then
- { echo "$as_me:19089: WARNING: no tic program found for fallbacks" >&5
+ { echo "$as_me:19122: WARNING: no tic program found for fallbacks" >&5
echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
fi
fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:19188: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:19221: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:19364: error: ambiguous option: $1
+ { { echo "$as_me:19397: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:19383: error: unrecognized option: $1
+ -*) { { echo "$as_me:19416: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
- *) { { echo "$as_me:19489: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:19522: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:19895: creating $ac_file" >&5
+ { echo "$as_me:19928: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:19913: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:19946: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:19926: error: cannot find input file: $f" >&5
+ { { echo "$as_me:19959: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:19992: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:20025: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:20003: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:20036: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:20016: error: cannot find input file: $f" >&5
+ { { echo "$as_me:20049: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:20074: $ac_file is unchanged" >&5
+ { echo "$as_me:20107: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.779 2010/11/06 13:46:35 tom Exp $
+# $Id: dist.mk,v 1.780 2010/11/13 16:26:43 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 7
-NCURSES_PATCH = 20101106
+NCURSES_PATCH = 20101113
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
dnl authorization. *
dnl***************************************************************************
dnl
-dnl $Id: aclocal.m4,v 1.42 2010/11/06 19:25:57 tom Exp $
+dnl $Id: aclocal.m4,v 1.44 2010/11/14 00:44:52 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $2 = variable to update (default $LIBS)
AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIB_AFTER version: 2 updated: 2010/11/08 20:33:46
+dnl ----------------
+dnl Add a given library after another, e.g., following the one it satisfies a
+dnl dependency for.
+dnl
+dnl $1 = the first library
+dnl $2 = its dependency
+AC_DEFUN([CF_ADD_LIB_AFTER],[
+CF_VERBOSE(...before $LIBS)
+LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s,$1 ,$1 $2 ," -e 's/ / /g'`
+CF_VERBOSE(...after $LIBS)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12
dnl ------------------
dnl Append to a search-list for a nonstandard header/lib-file
CF_NCURSES_VERSION
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_EXT_FUNCS version: 2 updated: 2010/10/23 15:54:49
+dnl CF_NCURSES_EXT_FUNCS version: 3 updated: 2010/11/13 19:43:23
dnl --------------------
dnl Since 2007/11/17, ncurses has defined NCURSES_EXT_FUNCS; earlier versions
dnl may provide these functions. Define the symbol if it is not defined, and
[cf_cv_ncurses_ext_funcs=no])
])
])
-test "$cf_cv_ncurses_ext_funcs" == yes && AC_DEFINE(NCURSES_EXT_FUNCS)
+test "$cf_cv_ncurses_ext_funcs" = yes && AC_DEFINE(NCURSES_EXT_FUNCS)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_NCURSES_HEADER version: 2 updated: 2008/03/23 14:48:54
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA version: 17 updated: 2010/10/23 15:52:32
+dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02
dnl -----------
dnl Check for Xaw (Athena) libraries
dnl
cf_x_athena_lib="$cf_pkgconfig_libs"
CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
+
+AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[
+AC_TRY_LINK([
+#include <X11/Xmu/CharSet.h>
+],[
+int check = XmuCompareISOLatin1("big", "small")
+],[cf_cv_xaw_compat=yes],[cf_cv_xaw_compat=no])])
+
+ if test "$cf_cv_xaw_compat" = no
+ then
+ # workaround for broken ".pc" files...
+ case "$cf_x_athena_lib" in #(vi
+ *-lXmu*) #(vi
+ ;;
+ *)
+ CF_VERBOSE(work around broken package)
+ CF_TRY_PKG_CONFIG(xmu,,[CF_ADD_LIB_AFTER(-lXt,-lXmu)])
+ ;;
+ esac
+ fi
+
break])
done
fi
[CF_ADD_LIB(Xext)])])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_X_TOOLKIT version: 15 updated: 2010/06/14 17:42:30
+dnl CF_X_TOOLKIT version: 19 updated: 2010/11/09 05:18:02
dnl ------------
dnl Check for X Toolkit libraries
dnl
CF_TRY_PKG_CONFIG(xt,[
- # workaround for broken ".pc" files used for X Toolkit.
- case "x$X_PRE_LIBS" in #(vi
- *-lICE*)
- case "x$LIBS" in #(vi
- *-lICE*) #(vi
- ;;
- *)
- CF_VERBOSE(work around broken package)
- CF_VERBOSE(...before $LIBS)
- LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/ / /g'`
- CF_VERBOSE(...after $LIBS)
+AC_CACHE_CHECK(for usable X Toolkit package,cf_cv_xt_compat,[
+AC_TRY_LINK([
+#include <X11/Shell.h>
+],[int num = IceConnectionNumber(0)
+],[cf_cv_xt_compat=no],[cf_cv_xt_compat=no])])
+
+ if test "$cf_cv_xt_compat" = no
+ then
+ # workaround for broken ".pc" files used for X Toolkit.
+ case "x$X_PRE_LIBS" in #(vi
+ *-lICE*)
+ case "x$LIBS" in #(vi
+ *-lICE*) #(vi
+ ;;
+ *)
+ CF_VERBOSE(work around broken package)
+ CF_TRY_PKG_CONFIG(ice,
+ [CF_TRY_PKG_CONFIG(sm)],
+ [CF_ADD_LIB_AFTER(-lXt,$X_PRE_LIBS)])
+ ;;
+ esac
;;
esac
- ;;
- esac
+ fi
cf_have_X_LIBS=yes
],[
* v2.0 featuring strict ANSI/POSIX conformance, November 1993.
* v2.1 with ncurses mouse support, September 1995
*
- * $Id: bs.c,v 1.51 2010/05/01 19:12:26 tom Exp $
+ * $Id: bs.c,v 1.52 2010/11/13 20:07:52 tom Exp $
*/
#include <test.priv.h>
MvAddStr(CYBASE + BDEPTH, CXBASE - 3, numbers);
MvPrintw(HYBASE, HXBASE,
- "To position your ships: move the cursor to a spot, then");
+ "To position your ships: move the cursor to a spot, then");
MvPrintw(HYBASE + 1, HXBASE,
- "type the first letter of a ship type to select it, then");
+ "type the first letter of a ship type to select it, then");
MvPrintw(HYBASE + 2, HXBASE,
- "type a direction ([hjkl] or [4862]), indicating how the");
+ "type a direction ([hjkl] or [4862]), indicating how the");
MvPrintw(HYBASE + 3, HXBASE,
- "ship should be pointed. You may also type a ship letter");
+ "ship should be pointed. You may also type a ship letter");
MvPrintw(HYBASE + 4, HXBASE,
- "followed by `r' to position it randomly, or type `R' to");
+ "followed by `r' to position it randomly, or type `R' to");
MvPrintw(HYBASE + 5, HXBASE,
- "place all remaining ships randomly.");
+ "place all remaining ships randomly.");
MvAddStr(MYBASE, MXBASE, "Aiming keys:");
MvAddStr(SYBASE, SXBASE, "y k u 7 8 9");
turn = rnd(2);
MvPrintw(HYBASE, HXBASE,
- "To fire, move the cursor to your chosen aiming point ");
+ "To fire, move the cursor to your chosen aiming point ");
MvPrintw(HYBASE + 1, HXBASE,
- "and strike any key other than a motion key. ");
+ "and strike any key other than a motion key. ");
MvPrintw(HYBASE + 2, HXBASE,
- " ");
+ " ");
MvPrintw(HYBASE + 3, HXBASE,
- " ");
+ " ");
MvPrintw(HYBASE + 4, HXBASE,
- " ");
+ " ");
MvPrintw(HYBASE + 5, HXBASE,
- " ");
+ " ");
(void) prompt(0, "Press any key to start...", "");
(void) getch();
for (;;) {
if (atcpu) {
MvPrintw(CYBASE + BDEPTH + 1, CXBASE + 11, "(%d, %c)",
- curx, 'A' + cury);
+ curx, 'A' + cury);
cgoto(cury, curx);
} else {
MvPrintw(PYBASE + BDEPTH + 1, PXBASE + 11, "(%d, %c)",
- curx, 'A' + cury);
+ curx, 'A' + cury);
pgoto(cury, curx);
}
hit = board[PLAYER][x][y] ? MARK_HIT : MARK_MISS;
hits[COMPUTER][x][y] = (char) hit;
MvPrintw(PROMPTLINE, 0,
- "I shoot at %c%d. I %s!", y + 'A', x, hit ? "hit" :
- "miss");
+ "I shoot at %c%d. I %s!", y + 'A', x, hit ? "hit" :
+ "miss");
if ((sunk = (hit && (ss = hitship(x, y)))) != 0)
(void) printw(" I've sunk your %s", ss->name);
(void) clrtoeol();
}
#ifdef DEBUG
MvPrintw(PROMPTLINE + 2, 0,
- "New state %d, x=%d, y=%d, d=%d",
- next, x, y, d);
+ "New state %d, x=%d, y=%d, d=%d",
+ next, x, y, d);
#endif /* DEBUG */
return ((hit) ? TRUE : FALSE);
}
if (cpuwon >= 10)
++j;
MvPrintw(1, (COLWIDTH - j) / 2,
- "%s: %d Computer: %d", name, plywon, cpuwon);
+ "%s: %d Computer: %d", name, plywon, cpuwon);
prompt(2, (awinna())? "Want to be humiliated again, %s [yn]? "
: "Going to give me a chance for revenge, %s [yn]? ", name);
/*
* Author: Thomas E. Dickey
*
- * $Id: cardfile.c,v 1.37 2010/05/01 22:19:02 tom Exp $
+ * $Id: cardfile.c,v 1.38 2010/11/14 00:58:45 tom Exp $
*
* File format: text beginning in column 1 is a title; other text is content.
*/
static void
trim(char *buffer)
{
- unsigned n = strlen(buffer);
+ size_t n = strlen(buffer);
while (n-- && isspace(UChar(buffer[n])))
buffer[n] = 0;
}
static void
add_content(CARD * card, const char *content)
{
- unsigned total, offset;
+ size_t total, offset;
content = skip(content);
if ((total = strlen(content)) != 0) {
* authorization. *
****************************************************************************/
/*
- * $Id: clip_printw.c,v 1.6 2010/05/01 19:13:46 tom Exp $
+ * $Id: clip_printw.c,v 1.7 2010/11/13 20:48:48 tom Exp $
*
* demonstrate how to use printw without wrapping.
*/
unsigned v;
int status;
int pair;
- unsigned attr;
+ attr_t attr;
int count;
int ch;
const char *c_msg;
start_color();
for (n = 0; n < SIZEOF(table); ++n) {
- init_pair(table[n].pair, table[n].fg, table[n].bg);
+ init_pair((short) table[n].pair,
+ (short) table[n].fg,
+ (short) table[n].bg);
}
}
if (state < SIZEOF(table)) {
}
static const char *
-video_params(unsigned state, unsigned *attr)
+video_params(unsigned state, attr_t *attr)
{
/* *INDENT-OFF* */
static struct {
- unsigned attr;
+ attr_t attr;
const char *msg;
} table[] = {
{ A_NORMAL, "normal" },
do {
switch (st.ch) {
case '.': /* change from current position */
- (void) wattrset(win, st.attr | COLOR_PAIR(st.pair));
+ (void) wattrset(win, st.attr | (chtype) COLOR_PAIR(st.pair));
if (st.count > 0) {
- need = st.count + 1;
+ need = (unsigned) st.count + 1;
sprintf(fmt, "%%c%%%ds%%c", st.count);
} else {
- need = getmaxx(win) - 1;
+ need = (unsigned) getmaxx(win) - 1;
strcpy(fmt, "%c%s%c");
}
if ((buffer = typeMalloc(char, need)) != 0) {
#define $cf_x_athena_LIBS 1
EOF
+echo "$as_me:9732: checking for usable $cf_x_athena/Xmu package" >&5
+echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+if test "${cf_cv_xaw_compat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 9739 "configure"
+#include "confdefs.h"
+
+#include <X11/Xmu/CharSet.h>
+
+int
+main ()
+{
+
+int check = XmuCompareISOLatin1("big", "small")
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9755: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:9758: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:9761: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:9764: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xaw_compat=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_xaw_compat=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:9774: result: $cf_cv_xaw_compat" >&5
+echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+
+ if test "$cf_cv_xaw_compat" = no
+ then
+ # workaround for broken ".pc" files...
+ case "$cf_x_athena_lib" in #(vi
+ *-lXmu*) #(vi
+ ;;
+ *)
+ test -n "$verbose" && echo " work around broken package" 1>&6
+
+echo "${as_me:-configure}:9786: testing work around broken package ..." 1>&5
+
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
+ test -n "$verbose" && echo " found package xmu" 1>&6
+
+echo "${as_me:-configure}:9791: testing found package xmu ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`"
+ test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+echo "${as_me:-configure}:9797: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+
+echo "${as_me:-configure}:9801: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+ case $cf_add_cflags in #(vi
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+ case $cf_add_cflags in
+ -D*)
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=yes
+
+ if test $cf_fix_cppflags = yes ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ elif test "${cf_tst_cflags}" = "\"'" ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ fi
+ ;;
+ esac
+ case "$CPPFLAGS" in
+ *$cf_add_cflags) #(vi
+ ;;
+ *) #(vi
+ case $cf_add_cflags in #(vi
+ -D*)
+ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
+
+ ;;
+ esac
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+ *)
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+yes)
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=no
+ ;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+ LIBS="$cf_pkgconfig_libs $LIBS"
+ :
+else
+
+test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+echo "${as_me:-configure}:9887: testing ...before $LIBS ..." 1>&5
+
+LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/ / /g'`
+test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+echo "${as_me:-configure}:9892: testing ...after $LIBS ..." 1>&5
+
+fi
+
+ ;;
+ esac
+ fi
+
break
else
:
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
test -n "$verbose" && echo " found package Xext" 1>&6
-echo "${as_me:-configure}:9745: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:9913: testing found package Xext ..." 1>&5
cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`"
test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
-echo "${as_me:-configure}:9751: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:9919: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6
-echo "${as_me:-configure}:9755: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:9923: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
:
else
- echo "$as_me:9839: checking for XextCreateExtension in -lXext" >&5
+ echo "$as_me:10007: checking for XextCreateExtension in -lXext" >&5
echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXext $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9847 "configure"
+#line 10015 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10034: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9869: \$? = $ac_status" >&5
+ echo "$as_me:10037: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9872: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10040: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9875: \$? = $ac_status" >&5
+ echo "$as_me:10043: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xext_XextCreateExtension=yes
else
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9886: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:10054: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
LIBS="-lXext $LIBS"
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
test -n "$verbose" && echo " found package xt" 1>&6
-echo "${as_me:-configure}:9899: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:10067: testing found package xt ..." 1>&5
cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`"
test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
-echo "${as_me:-configure}:9905: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10073: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6
-echo "${as_me:-configure}:9909: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10077: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
LIBS="$cf_pkgconfig_libs $LIBS"
- # workaround for broken ".pc" files used for X Toolkit.
- case "x$X_PRE_LIBS" in #(vi
- *-lICE*)
- case "x$LIBS" in #(vi
- *-lICE*) #(vi
+echo "$as_me:10159: checking for usable X Toolkit package" >&5
+echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+if test "${cf_cv_xt_compat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 10166 "configure"
+#include "confdefs.h"
+
+#include <X11/Shell.h>
+
+int
+main ()
+{
+int num = IceConnectionNumber(0)
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:10181: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:10184: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:10187: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:10190: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xt_compat=no
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_xt_compat=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:10200: result: $cf_cv_xt_compat" >&5
+echo "${ECHO_T}$cf_cv_xt_compat" >&6
+
+ if test "$cf_cv_xt_compat" = no
+ then
+ # workaround for broken ".pc" files used for X Toolkit.
+ case "x$X_PRE_LIBS" in #(vi
+ *-lICE*)
+ case "x$LIBS" in #(vi
+ *-lICE*) #(vi
+ ;;
+ *)
+ test -n "$verbose" && echo " work around broken package" 1>&6
+
+echo "${as_me:-configure}:10214: testing work around broken package ..." 1>&5
+
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+ test -n "$verbose" && echo " found package ice" 1>&6
+
+echo "${as_me:-configure}:10219: testing found package ice ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`"
+ test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+echo "${as_me:-configure}:10225: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6
+
+echo "${as_me:-configure}:10229: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+ case $cf_add_cflags in #(vi
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+ case $cf_add_cflags in
+ -D*)
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=yes
+
+ if test $cf_fix_cppflags = yes ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ elif test "${cf_tst_cflags}" = "\"'" ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ fi
+ ;;
+ esac
+ case "$CPPFLAGS" in
+ *$cf_add_cflags) #(vi
+ ;;
+ *) #(vi
+ case $cf_add_cflags in #(vi
+ -D*)
+ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
+
+ ;;
+ esac
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
;;
- *)
- test -n "$verbose" && echo " work around broken package" 1>&6
+ esac
+ ;;
+ *)
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+yes)
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=no
+ ;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
-echo "${as_me:-configure}:10000: testing work around broken package ..." 1>&5
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
- test -n "$verbose" && echo " ...before $LIBS" 1>&6
+ LIBS="$cf_pkgconfig_libs $LIBS"
-echo "${as_me:-configure}:10004: testing ...before $LIBS ..." 1>&5
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ test -n "$verbose" && echo " found package sm" 1>&6
- LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/ / /g'`
- test -n "$verbose" && echo " ...after $LIBS" 1>&6
+echo "${as_me:-configure}:10314: testing found package sm ..." 1>&5
-echo "${as_me:-configure}:10009: testing ...after $LIBS ..." 1>&5
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`"
+ test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+echo "${as_me:-configure}:10320: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6
+
+echo "${as_me:-configure}:10324: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+ case $cf_add_cflags in #(vi
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+ case $cf_add_cflags in
+ -D*)
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=yes
+
+ if test $cf_fix_cppflags = yes ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ elif test "${cf_tst_cflags}" = "\"'" ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ fi
+ ;;
+ esac
+ case "$CPPFLAGS" in
+ *$cf_add_cflags) #(vi
+ ;;
+ *) #(vi
+ case $cf_add_cflags in #(vi
+ -D*)
+ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
+
+ ;;
+ esac
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
;;
esac
;;
+ *)
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+ ;;
esac
+ ;;
+yes)
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=no
+ ;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+ LIBS="$cf_pkgconfig_libs $LIBS"
+ :
+else
+ :
+fi
+
+else
+
+test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+echo "${as_me:-configure}:10414: testing ...before $LIBS ..." 1>&5
+
+LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/ / /g'`
+test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+echo "${as_me:-configure}:10419: testing ...after $LIBS ..." 1>&5
+
+fi
+
+ ;;
+ esac
+ ;;
+ esac
+ fi
cf_have_X_LIBS=yes
test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
-echo "${as_me:-configure}:10024: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10437: testing checking additions to CFLAGS ..." 1>&5
cf_check_cflags="$CFLAGS"
cf_check_cppflags="$CPPFLAGS"
if test -n "$cf_new_cflags" ; then
test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
-echo "${as_me:-configure}:10095: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10508: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
CFLAGS="$CFLAGS $cf_new_cflags"
fi
if test -n "$cf_new_cppflags" ; then
test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
-echo "${as_me:-configure}:10103: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10516: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi
if test -n "$cf_new_extra_cppflags" ; then
test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
-echo "${as_me:-configure}:10111: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10524: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
if test "$cf_check_cflags" != "$CFLAGS" ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 10118 "configure"
+#line 10531 "configure"
#include "confdefs.h"
#include <stdio.h>
int
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10130: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10543: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10133: \$? = $ac_status" >&5
+ echo "$as_me:10546: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10136: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10549: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10139: \$? = $ac_status" >&5
+ echo "$as_me:10552: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
cat conftest.$ac_ext >&5
test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
-echo "${as_me:-configure}:10147: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10560: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
-echo "${as_me:-configure}:10152: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:10565: testing but keeping change to \$CPPFLAGS ..." 1>&5
fi
CFLAGS="$cf_check_flags"
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
- echo "$as_me:10160: checking for XOpenDisplay" >&5
+ echo "$as_me:10573: checking for XOpenDisplay" >&5
echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
if test "${ac_cv_func_XOpenDisplay+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10166 "configure"
+#line 10579 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char XOpenDisplay (); below. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10610: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10200: \$? = $ac_status" >&5
+ echo "$as_me:10613: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10203: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10616: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10206: \$? = $ac_status" >&5
+ echo "$as_me:10619: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_XOpenDisplay=yes
else
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10216: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:10629: result: $ac_cv_func_XOpenDisplay" >&5
echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
if test $ac_cv_func_XOpenDisplay = yes; then
:
else
- echo "$as_me:10222: checking for XOpenDisplay in -lX11" >&5
+ echo "$as_me:10635: checking for XOpenDisplay in -lX11" >&5
echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10230 "configure"
+#line 10643 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10662: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10252: \$? = $ac_status" >&5
+ echo "$as_me:10665: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10255: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10668: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10258: \$? = $ac_status" >&5
+ echo "$as_me:10671: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_X11_XOpenDisplay=yes
else
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10269: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:10682: result: $ac_cv_lib_X11_XOpenDisplay" >&5
echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
if test $ac_cv_lib_X11_XOpenDisplay = yes; then
LIBS="-lX11 $LIBS"
fi
- echo "$as_me:10277: checking for XtAppInitialize" >&5
+ echo "$as_me:10690: checking for XtAppInitialize" >&5
echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
if test "${ac_cv_func_XtAppInitialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10283 "configure"
+#line 10696 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char XtAppInitialize (); below. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10727: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10317: \$? = $ac_status" >&5
+ echo "$as_me:10730: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10320: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10733: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10323: \$? = $ac_status" >&5
+ echo "$as_me:10736: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_XtAppInitialize=yes
else
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10333: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:10746: result: $ac_cv_func_XtAppInitialize" >&5
echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
if test $ac_cv_func_XtAppInitialize = yes; then
:
else
- echo "$as_me:10339: checking for XtAppInitialize in -lXt" >&5
+ echo "$as_me:10752: checking for XtAppInitialize in -lXt" >&5
echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10347 "configure"
+#line 10760 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10366: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10779: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10369: \$? = $ac_status" >&5
+ echo "$as_me:10782: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10372: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10785: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10375: \$? = $ac_status" >&5
+ echo "$as_me:10788: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xt_XtAppInitialize=yes
else
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10386: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:10799: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
cat >>confdefs.h <<\EOF
fi
if test $cf_have_X_LIBS = no ; then
- { echo "$as_me:10402: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ { echo "$as_me:10815: WARNING: Unable to successfully link X Toolkit library (-lXt) with
test program. You will have to check and add the proper libraries by hand
to makefile." >&5
echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
cf_test=X11/$cf_x_athena_root/SimpleMenu.h
if test $cf_path != default ; then
CPPFLAGS="$cf_save -I$cf_path/include"
- echo "$as_me:10424: checking for $cf_test in $cf_path" >&5
+ echo "$as_me:10837: checking for $cf_test in $cf_path" >&5
echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
else
- echo "$as_me:10427: checking for $cf_test" >&5
+ echo "$as_me:10840: checking for $cf_test" >&5
echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
fi
cat >conftest.$ac_ext <<_ACEOF
-#line 10431 "configure"
+#line 10844 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10445: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10858: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10448: \$? = $ac_status" >&5
+ echo "$as_me:10861: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10451: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10864: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10454: \$? = $ac_status" >&5
+ echo "$as_me:10867: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:10463: result: $cf_result" >&5
+ echo "$as_me:10876: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
cf_x_athena_inc=$cf_path
done
if test -z "$cf_x_athena_inc" ; then
- { echo "$as_me:10475: WARNING: Unable to successfully find Athena header files with test program" >&5
+ { echo "$as_me:10888: WARNING: Unable to successfully find Athena header files with test program" >&5
echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
elif test "$cf_x_athena_inc" != default ; then
CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
cf_test=XawSimpleMenuAddGlobalActions
if test $cf_path != default ; then
LIBS="-L$cf_path/lib $cf_lib $LIBS"
- echo "$as_me:10500: checking for $cf_lib in $cf_path" >&5
+ echo "$as_me:10913: checking for $cf_lib in $cf_path" >&5
echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
else
LIBS="$cf_lib $LIBS"
- echo "$as_me:10504: checking for $cf_test in $cf_lib" >&5
+ echo "$as_me:10917: checking for $cf_test in $cf_lib" >&5
echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
fi
cat >conftest.$ac_ext <<_ACEOF
-#line 10508 "configure"
+#line 10921 "configure"
#include "confdefs.h"
int
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10933: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10523: \$? = $ac_status" >&5
+ echo "$as_me:10936: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10526: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10939: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10529: \$? = $ac_status" >&5
+ echo "$as_me:10942: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:10538: result: $cf_result" >&5
+ echo "$as_me:10951: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
cf_x_athena_lib="$cf_lib"
done
if test -z "$cf_x_athena_lib" ; then
- { { echo "$as_me:10550: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ { { echo "$as_me:10963: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
{ (exit 1); exit 1; }; }
fi
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:10567: checking for $ac_word" >&5
+echo "$as_me:10980: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:10584: found $ac_dir/$ac_word" >&5
+ echo "$as_me:10997: found $ac_dir/$ac_word" >&5
break
fi
done
XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
if test -n "$XCURSES_CONFIG"; then
- echo "$as_me:10595: result: $XCURSES_CONFIG" >&5
+ echo "$as_me:11008: result: $XCURSES_CONFIG" >&5
echo "${ECHO_T}$XCURSES_CONFIG" >&6
else
- echo "$as_me:10598: result: no" >&5
+ echo "$as_me:11011: result: no" >&5
echo "${ECHO_T}no" >&6
fi
test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
-echo "${as_me:-configure}:10619: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11032: testing checking additions to CFLAGS ..." 1>&5
cf_check_cflags="$CFLAGS"
cf_check_cppflags="$CPPFLAGS"
if test -n "$cf_new_cflags" ; then
test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
-echo "${as_me:-configure}:10690: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11103: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
CFLAGS="$CFLAGS $cf_new_cflags"
fi
if test -n "$cf_new_cppflags" ; then
test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
-echo "${as_me:-configure}:10698: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11111: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi
if test -n "$cf_new_extra_cppflags" ; then
test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
-echo "${as_me:-configure}:10706: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11119: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
if test "$cf_check_cflags" != "$CFLAGS" ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 10713 "configure"
+#line 11126 "configure"
#include "confdefs.h"
#include <stdio.h>
int
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11138: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10728: \$? = $ac_status" >&5
+ echo "$as_me:11141: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10731: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11144: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10734: \$? = $ac_status" >&5
+ echo "$as_me:11147: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
cat conftest.$ac_ext >&5
test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
-echo "${as_me:-configure}:10742: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11155: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
-echo "${as_me:-configure}:10747: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11160: testing but keeping change to \$CPPFLAGS ..." 1>&5
fi
CFLAGS="$cf_check_flags"
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10755: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:11168: checking for XOpenDisplay in -lX11" >&5
echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10763 "configure"
+#line 11176 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10782: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11195: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10785: \$? = $ac_status" >&5
+ echo "$as_me:11198: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10788: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11201: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10791: \$? = $ac_status" >&5
+ echo "$as_me:11204: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_X11_XOpenDisplay=yes
else
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10802: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:11215: result: $ac_cv_lib_X11_XOpenDisplay" >&5
echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
if test $ac_cv_lib_X11_XOpenDisplay = yes; then
LIBS="-lX11 $LIBS"
fi
-echo "$as_me:10808: checking for XCurses library" >&5
+echo "$as_me:11221: checking for XCurses library" >&5
echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
if test "${cf_cv_lib_XCurses+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
LIBS="-lXCurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10816 "configure"
+#line 11229 "configure"
#include "confdefs.h"
#include <xcurses.h>
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11244: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10834: \$? = $ac_status" >&5
+ echo "$as_me:11247: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10837: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11250: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10840: \$? = $ac_status" >&5
+ echo "$as_me:11253: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_lib_XCurses=yes
else
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10851: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:11264: result: $cf_cv_lib_XCurses" >&5
echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
fi
EOF
else
- { { echo "$as_me:10870: error: Cannot link with XCurses" >&5
+ { { echo "$as_me:11283: error: Cannot link with XCurses" >&5
echo "$as_me: error: Cannot link with XCurses" >&2;}
{ (exit 1); exit 1; }; }
fi
# look for curses-related libraries
as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
-echo "$as_me:10885: checking for new_panel in -lpanel$cf_cv_libtype" >&5
+echo "$as_me:11298: checking for new_panel in -lpanel$cf_cv_libtype" >&5
echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
if eval "test \"\${$as_ac_Lib+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpanel$cf_cv_libtype $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10893 "configure"
+#line 11306 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11325: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10915: \$? = $ac_status" >&5
+ echo "$as_me:11328: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10918: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11331: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10921: \$? = $ac_status" >&5
+ echo "$as_me:11334: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10932: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:11345: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
cat >>confdefs.h <<EOF
fi
as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
-echo "$as_me:10944: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
+echo "$as_me:11357: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
if eval "test \"\${$as_ac_Lib+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmenu$cf_cv_libtype $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10952 "configure"
+#line 11365 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11384: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10974: \$? = $ac_status" >&5
+ echo "$as_me:11387: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10977: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11390: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10980: \$? = $ac_status" >&5
+ echo "$as_me:11393: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10991: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:11404: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
cat >>confdefs.h <<EOF
fi
as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
-echo "$as_me:11003: checking for form_driver in -lform$cf_cv_libtype" >&5
+echo "$as_me:11416: checking for form_driver in -lform$cf_cv_libtype" >&5
echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
if eval "test \"\${$as_ac_Lib+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
ac_check_lib_save_LIBS=$LIBS
LIBS="-lform$cf_cv_libtype $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11011 "configure"
+#line 11424 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11443: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11033: \$? = $ac_status" >&5
+ echo "$as_me:11446: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11036: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11449: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11039: \$? = $ac_status" >&5
+ echo "$as_me:11452: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11050: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:11463: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
cat >>confdefs.h <<EOF
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11072: checking for $ac_header" >&5
+echo "$as_me:11485: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11078 "configure"
+#line 11491 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:11082: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11495: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:11088: \$? = $ac_status" >&5
+ echo "$as_me:11501: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:11107: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11520: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
;;
esac
-echo "$as_me:11120: checking return type of signal handlers" >&5
+echo "$as_me:11533: checking return type of signal handlers" >&5
echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
if test "${ac_cv_type_signal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11126 "configure"
+#line 11539 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11148: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11561: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11151: \$? = $ac_status" >&5
+ echo "$as_me:11564: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11154: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11567: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11157: \$? = $ac_status" >&5
+ echo "$as_me:11570: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_signal=void
else
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11167: result: $ac_cv_type_signal" >&5
+echo "$as_me:11580: result: $ac_cv_type_signal" >&5
echo "${ECHO_T}$ac_cv_type_signal" >&6
cat >>confdefs.h <<EOF
#define RETSIGTYPE $ac_cv_type_signal
EOF
-echo "$as_me:11174: checking for ANSI C header files" >&5
+echo "$as_me:11587: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11180 "configure"
+#line 11593 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:11188: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11601: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:11194: \$? = $ac_status" >&5
+ echo "$as_me:11607: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 11216 "configure"
+#line 11629 "configure"
#include "confdefs.h"
#include <string.h>
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 <<_ACEOF
-#line 11234 "configure"
+#line 11647 "configure"
#include "confdefs.h"
#include <stdlib.h>
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11255 "configure"
+#line 11668 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11281: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11694: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11284: \$? = $ac_status" >&5
+ echo "$as_me:11697: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:11286: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11699: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11289: \$? = $ac_status" >&5
+ echo "$as_me:11702: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
fi
fi
fi
-echo "$as_me:11302: result: $ac_cv_header_stdc" >&5
+echo "$as_me:11715: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
fi
-echo "$as_me:11312: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:11725: checking whether time.h and sys/time.h may both be included" >&5
echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11318 "configure"
+#line 11731 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11747: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11337: \$? = $ac_status" >&5
+ echo "$as_me:11750: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11340: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11753: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11343: \$? = $ac_status" >&5
+ echo "$as_me:11756: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_header_time=yes
else
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11353: result: $ac_cv_header_time" >&5
+echo "$as_me:11766: result: $ac_cv_header_time" >&5
echo "${ECHO_T}$ac_cv_header_time" >&6
if test $ac_cv_header_time = yes; then
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11375: checking for $ac_header" >&5
+echo "$as_me:11788: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11381 "configure"
+#line 11794 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:11385: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11798: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:11391: \$? = $ac_status" >&5
+ echo "$as_me:11804: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:11410: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11823: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11434: checking for $ac_func" >&5
+echo "$as_me:11847: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11440 "configure"
+#line 11853 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11884: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11474: \$? = $ac_status" >&5
+ echo "$as_me:11887: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11477: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11890: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11480: \$? = $ac_status" >&5
+ echo "$as_me:11893: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11490: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11903: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
fi
done
-echo "$as_me:11500: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:11913: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
if test "${cf_cv_need_xopen_extension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11507 "configure"
+#line 11920 "configure"
#include "confdefs.h"
#include <stdlib.h>
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11942: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11532: \$? = $ac_status" >&5
+ echo "$as_me:11945: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11535: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11948: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11538: \$? = $ac_status" >&5
+ echo "$as_me:11951: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_xopen_extension=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 11545 "configure"
+#line 11958 "configure"
#include "confdefs.h"
#define _XOPEN_SOURCE_EXTENDED
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11980: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11570: \$? = $ac_status" >&5
+ echo "$as_me:11983: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11573: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11986: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11576: \$? = $ac_status" >&5
+ echo "$as_me:11989: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_xopen_extension=yes
else
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11588: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:12001: result: $cf_cv_need_xopen_extension" >&5
echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
-echo "$as_me:11592: checking for term.h" >&5
+echo "$as_me:12005: checking for term.h" >&5
echo $ECHO_N "checking for term.h... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
term.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 11605 "configure"
+#line 12018 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12032: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11622: \$? = $ac_status" >&5
+ echo "$as_me:12035: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11625: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12038: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11628: \$? = $ac_status" >&5
+ echo "$as_me:12041: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header=$cf_header
break
for cf_header in ncurses/term.h ncursesw/term.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 11647 "configure"
+#line 12060 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12078: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11668: \$? = $ac_status" >&5
+ echo "$as_me:12081: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11671: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12084: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11674: \$? = $ac_status" >&5
+ echo "$as_me:12087: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header=$cf_header
break
esac
fi
-echo "$as_me:11689: result: $cf_cv_term_header" >&5
+echo "$as_me:12102: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
case $cf_cv_term_header in #(vi
cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- echo "$as_me:11749: checking for ${cf_func}" >&5
+ echo "$as_me:12162: checking for ${cf_func}" >&5
echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
-echo "${as_me:-configure}:11752: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:12165: testing ${cf_func} ..." 1>&5
if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
eval cf_result='$ac_cv_func_'$cf_func
if test ".$cf_result" != ".no"; then
cat >conftest.$ac_ext <<_ACEOF
-#line 11761 "configure"
+#line 12174 "configure"
#include "confdefs.h"
#ifdef HAVE_XCURSES
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12205: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11795: \$? = $ac_status" >&5
+ echo "$as_me:12208: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11798: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12211: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11801: \$? = $ac_status" >&5
+ echo "$as_me:12214: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
# use the computed/retrieved cache-value:
eval 'cf_result=$cf_cv_func_'$cf_func
- echo "$as_me:11817: result: $cf_result" >&5
+ echo "$as_me:12230: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result != no; then
cat >>confdefs.h <<EOF
fi
done
-echo "$as_me:11827: checking for ncurses extended functions" >&5
+echo "$as_me:12240: checking for ncurses extended functions" >&5
echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11834 "configure"
+#line 12247 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12262: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11852: \$? = $ac_status" >&5
+ echo "$as_me:12265: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11855: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12268: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11858: \$? = $ac_status" >&5
+ echo "$as_me:12271: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_ext_funcs=defined
else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 11866 "configure"
+#line 12279 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12304: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11894: \$? = $ac_status" >&5
+ echo "$as_me:12307: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11897: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12310: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11900: \$? = $ac_status" >&5
+ echo "$as_me:12313: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_ext_funcs=yes
else
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11914: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:12327: result: $cf_cv_ncurses_ext_funcs" >&5
echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
-test "$cf_cv_ncurses_ext_funcs" == yes && cat >>confdefs.h <<\EOF
+test "$cf_cv_ncurses_ext_funcs" = yes && cat >>confdefs.h <<\EOF
#define NCURSES_EXT_FUNCS 1
EOF
-echo "$as_me:11920: checking for wide-character functions" >&5
+echo "$as_me:12333: checking for wide-character functions" >&5
echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
if test "${cf_cv_widechar_funcs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11927 "configure"
+#line 12340 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12357: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11947: \$? = $ac_status" >&5
+ echo "$as_me:12360: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11950: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12363: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11953: \$? = $ac_status" >&5
+ echo "$as_me:12366: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_widechar_funcs=yes
else
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11964: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:12377: result: $cf_cv_widechar_funcs" >&5
echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
if test "$cf_cv_widechar_funcs" != no ; then
cat >>confdefs.h <<\EOF
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11984: checking for $ac_header" >&5
+echo "$as_me:12397: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11990 "configure"
+#line 12403 "configure"
#include "confdefs.h"
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12409: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11999: \$? = $ac_status" >&5
+ echo "$as_me:12412: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12002: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12415: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12005: \$? = $ac_status" >&5
+ echo "$as_me:12418: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12015: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12428: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
fi
done
-echo "$as_me:12025: checking for pid_t" >&5
+echo "$as_me:12438: checking for pid_t" >&5
echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
if test "${ac_cv_type_pid_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12031 "configure"
+#line 12444 "configure"
#include "confdefs.h"
$ac_includes_default
int
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12459: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12049: \$? = $ac_status" >&5
+ echo "$as_me:12462: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12052: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12465: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12055: \$? = $ac_status" >&5
+ echo "$as_me:12468: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_pid_t=yes
else
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12065: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:12478: result: $ac_cv_type_pid_t" >&5
echo "${ECHO_T}$ac_cv_type_pid_t" >&6
if test $ac_cv_type_pid_t = yes; then
:
for ac_header in unistd.h vfork.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12080: checking for $ac_header" >&5
+echo "$as_me:12493: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12086 "configure"
+#line 12499 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:12090: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12503: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:12096: \$? = $ac_status" >&5
+ echo "$as_me:12509: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:12115: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12528: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
for ac_func in fork vfork
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12128: checking for $ac_func" >&5
+echo "$as_me:12541: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12134 "configure"
+#line 12547 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12578: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12168: \$? = $ac_status" >&5
+ echo "$as_me:12581: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12171: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12584: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12174: \$? = $ac_status" >&5
+ echo "$as_me:12587: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12184: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12597: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
ac_cv_func_fork_works=$ac_cv_func_fork
if test "x$ac_cv_func_fork" = xyes; then
- echo "$as_me:12196: checking for working fork" >&5
+ echo "$as_me:12609: checking for working fork" >&5
echo $ECHO_N "checking for working fork... $ECHO_C" >&6
if test "${ac_cv_func_fork_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12632: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12222: \$? = $ac_status" >&5
+ echo "$as_me:12635: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:12224: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12637: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12227: \$? = $ac_status" >&5
+ echo "$as_me:12640: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_fork_works=yes
else
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:12239: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:12652: result: $ac_cv_func_fork_works" >&5
echo "${ECHO_T}$ac_cv_func_fork_works" >&6
fi
ac_cv_func_fork_works=yes
;;
esac
- { echo "$as_me:12253: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+ { echo "$as_me:12666: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
if test "x$ac_cv_func_vfork" = xyes; then
- echo "$as_me:12258: checking for working vfork" >&5
+ echo "$as_me:12671: checking for working vfork" >&5
echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
if test "${ac_cv_func_vfork_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
ac_cv_func_vfork_works=cross
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12267 "configure"
+#line 12680 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12777: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12367: \$? = $ac_status" >&5
+ echo "$as_me:12780: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:12369: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12782: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12372: \$? = $ac_status" >&5
+ echo "$as_me:12785: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_vfork_works=yes
else
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:12384: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:12797: result: $ac_cv_func_vfork_works" >&5
echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
fi;
if test "x$ac_cv_func_fork_works" = xcross; then
ac_cv_func_vfork_works=ac_cv_func_vfork
- { echo "$as_me:12390: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+ { echo "$as_me:12803: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
fi
fi
-echo "$as_me:12415: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:12828: checking if sys/time.h works with sys/select.h" >&5
echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
if test "${cf_cv_sys_time_select+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12422 "configure"
+#line 12835 "configure"
#include "confdefs.h"
#include <sys/types.h>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12855: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12445: \$? = $ac_status" >&5
+ echo "$as_me:12858: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12448: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12861: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12451: \$? = $ac_status" >&5
+ echo "$as_me:12864: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_sys_time_select=yes
else
fi
-echo "$as_me:12463: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:12876: result: $cf_cv_sys_time_select" >&5
echo "${ECHO_T}$cf_cv_sys_time_select" >&6
test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
#define HAVE_SYS_TIME_SELECT 1
EOF
-echo "$as_me:12469: checking for function curses_version" >&5
+echo "$as_me:12882: checking for function curses_version" >&5
echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
if test "${cf_cv_func_curses_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
cf_cv_func_curses_version=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12479 "configure"
+#line 12892 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12905: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12495: \$? = $ac_status" >&5
+ echo "$as_me:12908: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:12497: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12910: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12500: \$? = $ac_status" >&5
+ echo "$as_me:12913: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_curses_version=yes
fi
rm -f core
fi
-echo "$as_me:12515: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:12928: result: $cf_cv_func_curses_version" >&5
echo "${ECHO_T}$cf_cv_func_curses_version" >&6
test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF
#define HAVE_CURSES_VERSION 1
EOF
-echo "$as_me:12521: checking for ncurses wrap-prefix" >&5
+echo "$as_me:12934: checking for ncurses wrap-prefix" >&5
echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
# Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
else
NCURSES_WRAP_PREFIX=_nc_
fi;
-echo "$as_me:12531: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:12944: result: $NCURSES_WRAP_PREFIX" >&5
echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
-echo "$as_me:12534: checking for alternate character set array" >&5
+echo "$as_me:12947: checking for alternate character set array" >&5
echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
if test "${cf_cv_curses_acs_map+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12544 "configure"
+#line 12957 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12973: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12563: \$? = $ac_status" >&5
+ echo "$as_me:12976: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12566: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12979: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12569: \$? = $ac_status" >&5
+ echo "$as_me:12982: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curses_acs_map=$name; break
else
done
fi
-echo "$as_me:12580: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:12993: result: $cf_cv_curses_acs_map" >&5
echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
test "$cf_cv_curses_acs_map" != unknown && cat >>confdefs.h <<EOF
#define CURSES_ACS_ARRAY $cf_cv_curses_acs_map
EOF
-echo "$as_me:12587: checking for wide alternate character set array" >&5
+echo "$as_me:13000: checking for wide alternate character set array" >&5
echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
if test "${cf_cv_curses_wacs_map+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
for name in wacs_map _wacs_map __wacs_map _nc_wacs
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12597 "configure"
+#line 13010 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13026: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12616: \$? = $ac_status" >&5
+ echo "$as_me:13029: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12619: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13032: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12622: \$? = $ac_status" >&5
+ echo "$as_me:13035: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curses_wacs_map=$name
break
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
done
fi
-echo "$as_me:12633: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:13046: result: $cf_cv_curses_wacs_map" >&5
echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
-echo "$as_me:12636: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:13049: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 12639 "configure"
+#line 13052 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13070: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12660: \$? = $ac_status" >&5
+ echo "$as_me:13073: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12663: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13076: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12666: \$? = $ac_status" >&5
+ echo "$as_me:13079: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:12675: result: $cf_result" >&5
+echo "$as_me:13088: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result = yes ; then
fi
# This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:12693: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13106: checking if we must include wchar.h to declare mbstate_t" >&5
echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
if test "${cf_cv_mbstate_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12700 "configure"
+#line 13113 "configure"
#include "confdefs.h"
#include <stdlib.h>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12718: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13131: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12721: \$? = $ac_status" >&5
+ echo "$as_me:13134: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12724: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13137: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12727: \$? = $ac_status" >&5
+ echo "$as_me:13140: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_mbstate_t=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12734 "configure"
+#line 13147 "configure"
#include "confdefs.h"
#include <stdlib.h>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13166: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12756: \$? = $ac_status" >&5
+ echo "$as_me:13169: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12759: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13172: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12762: \$? = $ac_status" >&5
+ echo "$as_me:13175: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_mbstate_t=yes
else
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12774: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13187: result: $cf_cv_mbstate_t" >&5
echo "${ECHO_T}$cf_cv_mbstate_t" >&6
if test "$cf_cv_mbstate_t" = yes ; then
fi
# This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:12796: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13209: checking if we must include wchar.h to declare wchar_t" >&5
echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
if test "${cf_cv_wchar_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12803 "configure"
+#line 13216 "configure"
#include "confdefs.h"
#include <stdlib.h>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13234: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12824: \$? = $ac_status" >&5
+ echo "$as_me:13237: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12827: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13240: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12830: \$? = $ac_status" >&5
+ echo "$as_me:13243: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_wchar_t=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12837 "configure"
+#line 13250 "configure"
#include "confdefs.h"
#include <stdlib.h>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13269: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12859: \$? = $ac_status" >&5
+ echo "$as_me:13272: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12862: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13275: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12865: \$? = $ac_status" >&5
+ echo "$as_me:13278: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_wchar_t=yes
else
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12877: result: $cf_cv_wchar_t" >&5
+echo "$as_me:13290: result: $cf_cv_wchar_t" >&5
echo "${ECHO_T}$cf_cv_wchar_t" >&6
if test "$cf_cv_wchar_t" = yes ; then
fi
# This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:12899: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:13312: checking if we must include wchar.h to declare wint_t" >&5
echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
if test "${cf_cv_wint_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12906 "configure"
+#line 13319 "configure"
#include "confdefs.h"
#include <stdlib.h>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12924: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13337: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12927: \$? = $ac_status" >&5
+ echo "$as_me:13340: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12930: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13343: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12933: \$? = $ac_status" >&5
+ echo "$as_me:13346: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_wint_t=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12940 "configure"
+#line 13353 "configure"
#include "confdefs.h"
#include <stdlib.h>
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12959: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13372: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12962: \$? = $ac_status" >&5
+ echo "$as_me:13375: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12965: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13378: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12968: \$? = $ac_status" >&5
+ echo "$as_me:13381: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_wint_t=yes
else
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12980: result: $cf_cv_wint_t" >&5
+echo "$as_me:13393: result: $cf_cv_wint_t" >&5
echo "${ECHO_T}$cf_cv_wint_t" >&6
if test "$cf_cv_wint_t" = yes ; then
if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
-echo "$as_me:13003: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:13416: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 13006 "configure"
+#line 13419 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13024: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13437: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13027: \$? = $ac_status" >&5
+ echo "$as_me:13440: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13030: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13443: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13033: \$? = $ac_status" >&5
+ echo "$as_me:13446: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:13042: result: $cf_result" >&5
+echo "$as_me:13455: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result = yes ; then
if test "$NCURSES_OK_WCHAR_T" = 0 ; then
-echo "$as_me:13063: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:13476: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 13066 "configure"
+#line 13479 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13084: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13497: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13087: \$? = $ac_status" >&5
+ echo "$as_me:13500: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13090: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13503: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13093: \$? = $ac_status" >&5
+ echo "$as_me:13506: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:13102: result: $cf_result" >&5
+echo "$as_me:13515: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result = yes ; then
if test "$NCURSES_OK_WINT_T" = 0 ; then
-echo "$as_me:13123: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:13536: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 13126 "configure"
+#line 13539 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13557: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13147: \$? = $ac_status" >&5
+ echo "$as_me:13560: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13150: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13563: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13153: \$? = $ac_status" >&5
+ echo "$as_me:13566: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:13162: result: $cf_result" >&5
+echo "$as_me:13575: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result = yes ; then
fi
-echo "$as_me:13181: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:13594: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 13184 "configure"
+#line 13597 "configure"
#include "confdefs.h"
#ifdef HAVE_XCURSES
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13212: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13625: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13215: \$? = $ac_status" >&5
+ echo "$as_me:13628: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13218: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13631: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13221: \$? = $ac_status" >&5
+ echo "$as_me:13634: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:13230: result: $cf_result" >&5
+echo "$as_me:13643: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result = yes ; then
EOF
else
- echo "$as_me:13241: checking for data boolnames in library" >&5
+ echo "$as_me:13654: checking for data boolnames in library" >&5
echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 13244 "configure"
+#line 13657 "configure"
#include "confdefs.h"
#ifdef HAVE_XCURSES
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13689: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13279: \$? = $ac_status" >&5
+ echo "$as_me:13692: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13282: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13695: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13285: \$? = $ac_status" >&5
+ echo "$as_me:13698: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:13294: result: $cf_result" >&5
+ echo "$as_me:13707: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result = yes ; then
fi
fi
-echo "$as_me:13307: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:13720: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 13310 "configure"
+#line 13723 "configure"
#include "confdefs.h"
#ifdef HAVE_XCURSES
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13338: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13341: \$? = $ac_status" >&5
+ echo "$as_me:13754: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13344: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13757: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13347: \$? = $ac_status" >&5
+ echo "$as_me:13760: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:13356: result: $cf_result" >&5
+echo "$as_me:13769: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result = yes ; then
EOF
else
- echo "$as_me:13367: checking for data boolfnames in library" >&5
+ echo "$as_me:13780: checking for data boolfnames in library" >&5
echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 13370 "configure"
+#line 13783 "configure"
#include "confdefs.h"
#ifdef HAVE_XCURSES
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13402: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13815: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13405: \$? = $ac_status" >&5
+ echo "$as_me:13818: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13408: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13821: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13411: \$? = $ac_status" >&5
+ echo "$as_me:13824: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:13420: result: $cf_result" >&5
+ echo "$as_me:13833: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result = yes ; then
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:13517: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:13930: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:13693: error: ambiguous option: $1
+ { { echo "$as_me:14106: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:13712: error: unrecognized option: $1
+ -*) { { echo "$as_me:14125: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
- *) { { echo "$as_me:13760: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:14173: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:14022: creating $ac_file" >&5
+ { echo "$as_me:14435: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:14040: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:14453: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:14053: error: cannot find input file: $f" >&5
+ { { echo "$as_me:14466: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:14119: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:14532: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:14130: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:14543: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:14143: error: cannot find input file: $f" >&5
+ { { echo "$as_me:14556: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:14201: $ac_file is unchanged" >&5
+ { echo "$as_me:14614: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
* authorization. *
****************************************************************************/
/*
- * $Id: demo_altkeys.c,v 1.8 2008/04/12 22:06:22 tom Exp $
+ * $Id: demo_altkeys.c,v 1.9 2010/11/14 00:59:26 tom Exp $
*
* Demonstrate the define_key() function.
* Thomas Dickey - 2005/10/22
#if HAVE_GETTIMEOFDAY
gettimeofday(¤t, 0);
- secs = current.tv_sec - previous.tv_sec;
- msecs = (current.tv_usec - previous.tv_usec) / 1000;
+ secs = (int) (current.tv_sec - previous.tv_sec);
+ msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000);
if (msecs < 0) {
msecs += 1000;
--secs;
* authorization. *
****************************************************************************/
/*
- * $Id: demo_defkey.c,v 1.19 2008/08/04 16:24:47 tom Exp $
+ * $Id: demo_defkey.c,v 1.20 2010/11/14 00:59:35 tom Exp $
*
* Demonstrate the define_key() function.
* Thomas Dickey - 2002/11/23
visible(const char *string)
{
char *result = 0;
- unsigned need = 1;
+ size_t need = 1;
int pass;
int n;
* authorization. *
****************************************************************************/
/*
- * $Id: demo_forms.c,v 1.35 2010/05/01 21:56:10 tom Exp $
+ * $Id: demo_forms.c,v 1.36 2010/11/13 20:49:50 tom Exp $
*
* Demonstrate a variety of functions from the form library.
* Thomas Dickey - 2003/4/26
if (f) {
set_field_buffer(f, 0, label);
- set_field_opts(f, (int) (field_opts(f) & ~O_ACTIVE));
+ set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE));
}
return (f);
}
case MY_EDT_MODE:
if ((field = current_field(form)) != 0) {
set_current_field(form, another_field(form, field));
- if (field_opts(field) & O_EDIT) {
+ if ((unsigned) field_opts(field) & O_EDIT) {
field_opts_off(field, O_EDIT);
set_field_status(field, 0);
} else {
waddstr(win, "other");
}
- if (field_opts(field) & O_EDIT)
+ if ((unsigned) field_opts(field) & O_EDIT)
waddstr(win, " editable");
else
waddstr(win, " readonly");
* authorization. *
****************************************************************************/
/*
- * $Id: demo_menus.c,v 1.30 2010/05/01 19:12:26 tom Exp $
+ * $Id: demo_menus.c,v 1.31 2010/11/13 20:06:46 tom Exp $
*
* Demonstrate a variety of functions from the menu library.
* Thomas Dickey - 2005/4/9
Trace(("trace level interactively set to %s", tracetrace(_nc_tracing)));
MvPrintw(LINES - 2, 0,
- "Trace level is %s\n", tracetrace(_nc_tracing));
+ "Trace level is %s\n", tracetrace(_nc_tracing));
refresh();
}
}
/****************************************************************************
- * Copyright (c) 2009 Free Software Foundation, Inc. *
+ * Copyright (c) 2009,2010 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
/*
* Author: Thomas E. Dickey
*
- * $Id: demo_terminfo.c,v 1.6 2009/07/17 01:02:08 tom Exp $
+ * $Id: demo_terminfo.c,v 1.8 2010/11/13 20:51:50 tom Exp $
*
* A simple demo of the terminfo interface.
*/
#endif
#endif
+#if HAVE_TIGETSTR
#if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES)
static bool b_opt = FALSE;
|| (NUM_NUMBERS(term) != NUMCOUNT)
|| (NUM_STRINGS(term) != STRCOUNT))) {
for (n = BOOLCOUNT; n < NUM_BOOLEANS(term); ++n) {
- dumpit(ExtBoolname(term, n, boolnames));
+ dumpit(ExtBoolname(term, (int) n, boolnames));
}
for (n = NUMCOUNT; n < NUM_NUMBERS(term); ++n) {
- dumpit(ExtNumname(term, n, numnames));
+ dumpit(ExtNumname(term, (int) n, numnames));
}
for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
- dumpit(ExtStrname(term, n, strnames));
+ dumpit(ExtStrname(term, (int) n, strnames));
}
}
#endif
ExitProgram(EXIT_FAILURE);
}
#endif
+#else /* !HAVE_TIGETSTR */
+int
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+{
+ printf("This program requires the terminfo functions such as tigetstr\n");
+ ExitProgram(EXIT_FAILURE);
+}
+#endif /* HAVE_TIGETSTR */
/*
* Author: Thomas E. Dickey (1998-on)
*
- * $Id: ditto.c,v 1.39 2010/07/03 19:41:04 tom Exp $
+ * $Id: ditto.c,v 1.40 2010/11/14 01:06:47 tom Exp $
*
* The program illustrates how to set up multiple screens from a single
* program.
{
int n;
+ (void) data;
for (n = 0; n < count; n++) {
ddata->target = n;
USING_SCREEN(data[n].screen, write_screen, (void *) ddata);
/*
* Author: Thomas E. Dickey <dickey@clark.net> 1999
*
- * $Id: dots.c,v 1.20 2010/05/01 22:04:08 tom Exp $
+ * $Id: dots.c,v 1.22 2010/11/14 01:00:02 tom Exp $
*
* A simple demo of the terminfo interface.
*/
printf("\n\n%ld total chars, rate %.2f/sec\n",
total_chars,
- ((double) (total_chars) / (time((time_t *) 0) - started)));
+ ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
}
static void
interrupted = TRUE;
}
-static float
+static double
ranf(void)
{
long r = (rand() & 077777);
- return ((float) r / 32768.);
+ return ((double) r / 32768.);
}
int
-main(
- int argc GCC_UNUSED,
- char *argv[]GCC_UNUSED)
+main(int argc GCC_UNUSED,
+ char *argv[]GCC_UNUSED)
{
int x, y, z, p;
- float r;
- float c;
+ double r;
+ double c;
CATCHALL(onsig);
max_colors = -1;
}
- r = (float) (lines - 4);
- c = (float) (columns - 4);
+ r = (double) (lines - 4);
+ c = (double) (columns - 4);
started = time((time_t *) 0);
while (!interrupted) {
/*
* Author: Thomas E. Dickey - 2007
*
- * $Id: dots_mvcur.c,v 1.4 2009/10/10 16:14:24 tom Exp $
+ * $Id: dots_mvcur.c,v 1.6 2010/11/14 01:00:44 tom Exp $
*
* A simple demo of the terminfo interface, and mvcur.
*/
printf("\n\n%ld total chars, rate %.2f/sec\n",
total_chars,
- ((double) (total_chars) / (time((time_t *) 0) - started)));
+ ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
}
static void
interrupted = TRUE;
}
-static float
+static double
ranf(void)
{
long r = (rand() & 077777);
- return ((float) r / 32768.);
+ return ((double) r / 32768.);
}
int
-main(
- int argc GCC_UNUSED,
- char *argv[]GCC_UNUSED)
+main(int argc GCC_UNUSED,
+ char *argv[]GCC_UNUSED)
{
int x0 = 1, y0 = 1;
int x, y, z, p;
- float r;
- float c;
+ double r;
+ double c;
SCREEN *sp;
CATCHALL(onsig);
max_colors = -1;
}
- r = (float) (lines - 4);
- c = (float) (columns - 4);
+ r = (double) (lines - 4);
+ c = (double) (columns - 4);
started = time((time_t *) 0);
while (!interrupted) {
/****************************************************************************
- * Copyright (c) 2006-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 2006-2008,2010 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
* authorization. *
****************************************************************************/
/*
- * $Id: echochar.c,v 1.6 2008/04/12 22:06:04 tom Exp $
+ * $Id: echochar.c,v 1.8 2010/11/14 01:00:44 tom Exp $
*
* Demonstrate the echochar function (compare to dots.c).
* Thomas Dickey - 2006/11/4
printf("\n\n%ld total chars, rate %.2f/sec\n",
total_chars,
- ((double) (total_chars) / (time((time_t *) 0) - started)));
+ ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
}
static void
interrupted = TRUE;
}
-static float
+static double
ranf(void)
{
long r = (rand() & 077777);
- return ((float) r / 32768.);
+ return ((double) r / 32768.);
}
static void
{
int pair = (fg * COLORS) + bg;
if (!my_pairs[pair]) {
- init_pair(pair, fg, bg);
+ init_pair((short) pair,
+ (short) fg,
+ (short) bg);
}
attron(COLOR_PAIR(pair));
}
int
-main(
- int argc GCC_UNUSED,
- char *argv[]GCC_UNUSED)
+main(int argc GCC_UNUSED,
+ char *argv[]GCC_UNUSED)
{
int ch, x, y, z, p;
- float r;
- float c;
+ double r;
+ double c;
bool use_colors;
bool opt_r = FALSE;
char *my_pairs = 0;
if (use_colors) {
start_color();
if (COLOR_PAIRS > 0) {
- my_pairs = typeCalloc(char, COLOR_PAIRS);
+ my_pairs = typeCalloc(char, (size_t) COLOR_PAIRS);
}
use_colors = (my_pairs != 0);
}
curs_set(0);
- r = (float) (LINES - 4);
- c = (float) (COLS - 4);
+ r = (double) (LINES - 4);
+ c = (double) (COLS - 4);
started = time((time_t *) 0);
while (!interrupted) {
/****************************************************************************
- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
/*
* Author: Thomas E. Dickey <dickey@clark.net> 1998
*
- * $Id: filter.c,v 1.12 2008/12/06 21:59:27 tom Exp $
+ * $Id: filter.c,v 1.13 2010/11/13 20:55:54 tom Exp $
*/
#include <test.priv.h>
if (use_default_colors() != ERR)
background = -1;
#endif
- init_pair(1, COLOR_CYAN, background);
+ init_pair(1, COLOR_CYAN, (short) background);
underline = COLOR_PAIR(1);
} else {
underline = A_UNDERLINE;
* authorization. *
****************************************************************************/
/*
- * $Id: firework.c,v 1.26 2010/05/01 19:12:26 tom Exp $
+ * $Id: firework.c,v 1.27 2010/11/13 20:58:25 tom Exp $
*/
#include <test.priv.h>
#include <time.h>
-static int my_bg = COLOR_BLACK;
+static short my_bg = COLOR_BLACK;
static void
cleanup(void)
}
}
-static int
+static short
get_colour(chtype *bold)
{
int attr;
*bold = A_BOLD;
attr &= 7;
}
- return (attr);
+ return (short) (attr);
}
static
}
curs_set(0);
- seed = time((time_t *) 0);
+ seed = (unsigned) time((time_t *) 0);
srand(seed);
for (;;) {
do {
showit();
flag = 0;
}
- seed = time((time_t *) 0);
+ seed = (unsigned) time((time_t *) 0);
srand(seed);
explode(LINES - row, start + (diff * direction));
erase();
/*
* Author: Thomas E. Dickey, 2006
*
- * $Id: foldkeys.c,v 1.3 2006/12/09 16:54:07 tom Exp $
+ * $Id: foldkeys.c,v 1.4 2010/11/14 01:00:53 tom Exp $
*
* Demonstrate a method for altering key definitions at runtime.
*
#if HAVE_GETTIMEOFDAY
gettimeofday(¤t, 0);
- secs = current.tv_sec - previous.tv_sec;
- msecs = (current.tv_usec - previous.tv_usec) / 1000;
+ secs = (int) (current.tv_sec - previous.tv_sec);
+ msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000);
if (msecs < 0) {
msecs += 1000;
--secs;
* modified 10-18-89 for curses (jrl)
* 10-18-89 added signal handling
*
- * $Id: gdc.c,v 1.33 2010/05/01 19:12:26 tom Exp $
+ * $Id: gdc.c,v 1.34 2010/11/13 21:01:23 tom Exp $
*/
#include <test.priv.h>
hascolor = has_colors();
if (hascolor) {
- int bg = COLOR_BLACK;
+ short bg = COLOR_BLACK;
start_color();
#if HAVE_USE_DEFAULT_COLORS
if (use_default_colors() == OK)
*
* Date: 05.Nov.90
*
- * $Id: hanoi.c,v 1.29 2010/05/01 19:12:26 tom Exp $
+ * $Id: hanoi.c,v 1.31 2010/11/14 01:01:07 tom Exp $
*/
#include <test.priv.h>
static struct Peg Pegs[NPEGS];
static int PegPos[] =
-{LEFTPEG, MIDPEG, RIGHTPEG};
-static int TileColour[] =
+{
+ LEFTPEG,
+ MIDPEG,
+ RIGHTPEG
+};
+static short TileColour[] =
{
COLOR_GREEN, /* Length 3 */
COLOR_MAGENTA, /* Length 5 */
initscr();
if (has_colors()) {
int i;
- int bg = COLOR_BLACK;
+ short bg = COLOR_BLACK;
start_color();
#if HAVE_USE_DEFAULT_COLORS
if (use_default_colors() == OK)
bg = -1;
#endif
for (i = 0; i < 9; i++)
- init_pair(i + 1, bg, TileColour[i]);
+ init_pair((short) (i + 1), bg, TileColour[i]);
}
cbreak();
if (LINES < 24) {
int Size, SlotNo;
for (Size = NTiles * 2 + 1, SlotNo = 0; Size >= 3; Size -= 2)
- Pegs[0].Length[SlotNo++] = Size;
+ Pegs[0].Length[SlotNo++] = (size_t) Size;
Pegs[0].Count = NTiles;
Pegs[1].Count = 0;
/* Draw tiles */
for (peg = 0; peg < NPEGS; peg++) {
for (SlotNo = 0; SlotNo < Pegs[peg].Count; SlotNo++) {
- unsigned len = Pegs[peg].Length[SlotNo];
- if (len < sizeof(TileBuf) - 1 && len < (unsigned) PegPos[peg]) {
+ size_t len = Pegs[peg].Length[SlotNo];
+ if (len < sizeof(TileBuf) - 1 && len < (size_t) PegPos[peg]) {
memset(TileBuf, ' ', len);
TileBuf[len] = '\0';
if (has_colors())
else
(void) attrset(A_REVERSE);
MvAddStr(BASELINE - (SlotNo + 1),
- (int) (PegPos[peg] - len / 2),
+ (PegPos[peg] - (int) len / 2),
TileBuf);
}
}
/****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
*
* Generate timing statistics for vertical-motion optimization.
*
- * $Id: hashtest.c,v 1.30 2009/10/10 16:14:53 tom Exp $
+ * $Id: hashtest.c,v 1.31 2010/11/13 23:43:15 tom Exp $
*/
#include <test.priv.h>
move(head_lines, 0);
for (i = head_lines; i < LINES - foot_lines; i++) {
- chtype c = (base - LO_CHAR + i) % (HI_CHAR - LO_CHAR + 1) + LO_CHAR;
+ chtype c = (chtype) ((base - LO_CHAR + i) % (HI_CHAR - LO_CHAR + 1)
+ + LO_CHAR);
int hi = (extend_corner || (i < LINES - 1)) ? COLS : COLS - 1;
for (j = 0; j < hi; j++)
addch(c);
* authorization. *
****************************************************************************/
/*
- * $Id: inchs.c,v 1.10 2010/05/01 19:13:46 tom Exp $
+ * $Id: inchs.c,v 1.11 2010/11/13 23:41:23 tom Exp $
*
* Author: Thomas E Dickey
*/
if (txtwin != stdscr) {
wmove(txtwin, txt_y, txt_x);
- if ((ch = winch(txtwin)) != ERR) {
+ if ((ch = (int) winch(txtwin)) != ERR) {
if (waddch(chrwin, (chtype) ch) != ERR) {
for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
- if ((ch = mvwinch(txtwin, txt_y, j)) != ERR) {
+ if ((ch = (int) mvwinch(txtwin, txt_y, j)) != ERR) {
if (waddch(chrwin, (chtype) ch) == ERR) {
break;
}
} else {
move(txt_y, txt_x);
- if ((ch = inch()) != ERR) {
+ if ((ch = (int) inch()) != ERR) {
if (waddch(chrwin, (chtype) ch) != ERR) {
for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
- if ((ch = mvinch(txt_y, j)) != ERR) {
+ if ((ch = (int) mvinch(txt_y, j)) != ERR) {
if (waddch(chrwin, (chtype) ch) == ERR) {
break;
}
* authorization. *
****************************************************************************/
/*
- * $Id: ins_wide.c,v 1.12 2010/05/01 19:12:26 tom Exp $
+ * $Id: ins_wide.c,v 1.13 2010/11/13 23:40:32 tom Exp $
*
* Demonstrate the wins_wstr() and wins_wch functions.
* Thomas Dickey - 2002/11/23
{
wchar_t tmp_wchar[2];
- tmp_wchar[0] = source;
+ tmp_wchar[0] = (wchar_t) source;
tmp_wchar[1] = 0;
if (setcchar(target, tmp_wchar, A_NORMAL, 0, (void *) 0) == ERR) {
beep();
switch (option) {
case oDefault:
if (move(limit + row, col) != ERR) {
- InsCh(ch);
+ InsCh((chtype) ch);
}
break;
case oMove:
- MvInsCh(limit + row, col, ch);
+ MvInsCh(limit + row, col, (chtype) ch);
break;
case oWindow:
if (wmove(work, limit + row, col) != ERR) {
- WInsCh(work, ch);
+ WInsCh(work, (chtype) ch);
}
break;
case oMoveWindow:
- MvWInsCh(work, limit + row, col, ch);
+ MvWInsCh(work, limit + row, col, (chtype) ch);
break;
}
* authorization. *
****************************************************************************/
/*
- * $Id: insdelln.c,v 1.4 2010/05/01 19:11:55 tom Exp $
+ * $Id: insdelln.c,v 1.5 2010/11/13 23:39:38 tom Exp $
*
* test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
*/
{
/* *INDENT-OFF* */
static struct {
- int pair;
- int fg, bg;
+ short pair;
+ short fg, bg;
const char *msg;
} table[] = {
{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
init_status(win, &st);
do {
- (void) wattrset(win, st.attr | COLOR_PAIR(st.pair));
+ (void) wattrset(win, st.attr | (attr_t) COLOR_PAIR(st.pair));
switch (st.ch) {
case 'i':
for (n = 0; n < st.count; ++n)
init_status(stdscr, &st);
do {
- (void) attrset(st.attr | COLOR_PAIR(st.pair));
+ (void) attrset(st.attr | (attr_t) COLOR_PAIR(st.pair));
switch (st.ch) {
case 'i':
for (n = 0; n < st.count; ++n)
* Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995. Mouse support
* added September 20th 1995.
*
- * $Id: knight.c,v 1.29 2010/05/01 19:11:55 tom Exp $
+ * $Id: knight.c,v 1.31 2010/11/13 20:44:21 tom Exp $
*/
#include <test.priv.h>
bg = -1;
#endif
- (void) init_pair(TRAIL_COLOR, COLOR_CYAN, bg);
- (void) init_pair(PLUS_COLOR, COLOR_RED, bg);
- (void) init_pair(MINUS_COLOR, COLOR_GREEN, bg);
+ (void) init_pair(TRAIL_COLOR, (short) COLOR_CYAN, (short) bg);
+ (void) init_pair(PLUS_COLOR, (short) COLOR_RED, (short) bg);
+ (void) init_pair(MINUS_COLOR, (short) COLOR_GREEN, (short) bg);
trail |= COLOR_PAIR(TRAIL_COLOR);
plus |= COLOR_PAIR(PLUS_COLOR);
(void) waddstr(helpwin, "of legal moves.\n\n");
MvWAddStr(helpwin, NOTIFYY - INSTRY, 0,
- "Press `?' to go to keystroke help.");
+ "Press `?' to go to keystroke help.");
}
static void
(void) waddstr(helpwin, "center key. Use F/B to review the path.\n");
MvWAddStr(helpwin, NOTIFYY - INSTRY, 0,
- "Press `?' to go to game explanation");
+ "Press `?' to go to game explanation");
}
static void
newx = oldx + offsets[k].x;
if (chksqr(newy, newx)) {
if (first < 0)
- first = k;
+ first = (int) k;
if (newy == *y
&& newx == *x) {
- found = k;
+ found = (int) k;
} else if (found >= 0) {
- next = k;
+ next = (int) k;
break;
}
}
history[movecount - 1].y,
history[movecount - 1].x,
rw, col);
- history[movecount].y = rw;
- history[movecount].x = col;
+ history[movecount].y = (short) rw;
+ history[movecount].x = (short) col;
movecount++;
trialcount++;
/****************************************************************************
- * Copyright (c) 2009 Free Software Foundation, Inc. *
+ * Copyright (c) 2009,2010 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
continue;
}
} else if (code != ERR) {
- result = ch;
+ result = (int) ch;
break;
} else {
break;
* authorization. *
****************************************************************************/
/*
- * $Id: movewindow.c,v 1.23 2010/05/01 19:11:55 tom Exp $
+ * $Id: movewindow.c,v 1.24 2010/11/13 23:34:55 tom Exp $
*
* Demonstrate move functions for windows and derived windows from the curses
* library.
int n = window2num(win);
if (n++ >= 0) {
- result = all_windows[n % num_windows].child;
+ result = all_windows[(unsigned) n % num_windows].child;
wmove(result, 0, 0);
wrefresh(result);
}
if (n-- >= 0) {
if (n < 0)
- n = num_windows - 1;
- result = all_windows[n % num_windows].child;
+ n = (int) (num_windows - 1);
+ result = all_windows[(unsigned) n % num_windows].child;
wmove(result, 0, 0);
wrefresh(result);
}
Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
Thomas E. Dickey (beginning revision 1.27 in 1996).
-$Id: ncurses.c,v 1.360 2010/07/24 18:04:58 tom Exp $
+$Id: ncurses.c,v 1.362 2010/11/14 01:04:13 tom Exp $
***************************************************************************/
if (init_pair(pair, fg, bg) == ERR) {
beep();
} else {
- normal |= COLOR_PAIR(pair);
+ normal |= (chtype) COLOR_PAIR(pair);
}
}
if (tx >= 0) {
if (init_pair(pair, tx, bg) == ERR) {
beep();
} else {
- extras |= COLOR_PAIR(pair);
+ extras |= (chtype) COLOR_PAIR(pair);
}
}
}
for (j = 0; j < SIZEOF(attrs_to_test); ++j) {
row = wide_show_attr(row, n, j == k,
- ac |
- attrs_to_test[j].attr |
- attrs_to_test[k].attr,
+ ((attr_t) ac |
+ attrs_to_test[j].attr |
+ attrs_to_test[k].attr),
extras,
attrs_to_test[j].name);
}
(i == current ? '>' : ' '),
(i < (int) SIZEOF(the_color_names)
? the_color_names[i] : numeric));
- (void) attrset(COLOR_PAIR(i));
+ (void) attrset((attr_t) COLOR_PAIR(i));
addstr(" ");
(void) attrset(A_NORMAL);
#if HAVE_SLK_COLOR
static void
-call_slk_color(short fg, short bg)
+call_slk_color(int fg, int bg)
{
- init_pair(1, bg, fg);
+ init_pair(1, (short) bg, (short) fg);
slk_color(1);
MvPrintw(SLK_WORK, 0, "Colors %d/%d\n", fg, bg);
clrtoeol();
show_box_chars(int repeat, attr_t attr, short pair)
{
(void) repeat;
- attr |= COLOR_PAIR(pair);
+
+ attr |= (attr_t) COLOR_PAIR(pair);
erase();
attron(A_BOLD);
{
int n;
-#define BOTH(name) #name, colored_chtype(name, attr, pair)
+#define BOTH(name) #name, colored_chtype(name, attr, (chtype) pair)
erase();
attron(A_BOLD);
* Mark them with reverse-video to make them simpler to find on
* the display.
*/
- if (wcwidth(code) == 0)
- addch(space | (A_REVERSE ^ attr) | COLOR_PAIR(pair));
+ if (wcwidth(code) == 0) {
+ addch((chtype) space |
+ (A_REVERSE ^ attr) |
+ (attr_t) COLOR_PAIR(pair));
+ }
/*
* This could use add_wch(), but is done for comparison with the
* normal 'f' test (and to make a test-case for echo_wchar()).
short bg = color;
init_pair(color, fg, bg);
- wbkgdset(win, (chtype) (COLOR_PAIR(color) | ' '));
+ wbkgdset(win, (attr_t) (COLOR_PAIR(color) | ' '));
} else {
wbkgdset(win, A_BOLD | ' ');
}
doupdate();
#if HAVE_GETTIMEOFDAY
+#define TIMEVAL2S(data) ((double) data.tv_sec + ((double) data.tv_usec / 1.0e6))
if (timing) {
double elapsed;
gettimeofday(&after, 0);
- elapsed = (after.tv_sec + after.tv_usec / 1.0e6)
- - (before.tv_sec + before.tv_usec / 1.0e6);
+ elapsed = (TIMEVAL2S(after) - TIMEVAL2S(before));
move(LINES - 1, COLS - 12);
printw("Secs: %2.03f", elapsed);
refresh();
if (f) {
set_field_buffer(f, 0, label);
- set_field_opts(f, (int) (field_opts(f) & ~O_ACTIVE));
+ set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE));
}
return (f);
}
break;
case 2:
init_pair(cpair, COLOR_BLUE, COLOR_WHITE);
- (void) wattrset(win, COLOR_PAIR(cpair) | A_NORMAL);
+ (void) wattrset(win, (attr_t) COLOR_PAIR(cpair) | A_NORMAL);
break;
case 3:
init_pair(cpair, COLOR_WHITE, COLOR_BLUE);
- (void) wattrset(win, COLOR_PAIR(cpair) | A_BOLD);
+ (void) wattrset(win, (attr_t) COLOR_PAIR(cpair) | A_BOLD);
break;
}
}
break;
#if USE_LIBPANEL
case 's':
- nap_msec = atol(optarg);
+ nap_msec = (int) atol(optarg);
break;
#endif
#ifdef TRACE
* newdemo.c - A demo program using PDCurses. The program illustrate
* the use of colours for text output.
*
- * $Id: newdemo.c,v 1.33 2010/05/01 19:07:34 tom Exp $
+ * $Id: newdemo.c,v 1.34 2010/11/13 23:33:42 tom Exp $
*/
#include <test.priv.h>
nodelay(win, TRUE);
t = time((time_t *) 0);
while (1) {
- if ((int) (key = wgetch(win)) != ERR) {
+ if ((int) (key = (chtype) wgetch(win)) != ERR) {
if (key == 'q' || key == 'Q')
return 1;
else
if (has_colors()) {
if (pair > COLOR_PAIRS)
pair = COLOR_PAIRS;
- init_pair(pair, foreground, background);
- (void) wattrset(win, COLOR_PAIR(pair));
+ init_pair((short) pair, (short) foreground, (short) background);
+ (void) wattrset(win, (attr_t) COLOR_PAIR(pair));
}
}
if (has_colors()) {
if (pair > COLOR_PAIRS)
pair = COLOR_PAIRS;
- attrs |= COLOR_PAIR(pair);
+ attrs |= (chtype) COLOR_PAIR(pair);
}
(void) wattrset(win, attrs);
return attrs;
set_colors(win, 7, COLOR_RED, COLOR_GREEN);
memset(save, ' ', sizeof(save));
for (i = 2; i < width - 4; ++i) {
- k = mvwinch(win, 4, i);
+ k = (int) mvwinch(win, 4, i);
if (k == ERR)
break;
- save[j++] = c = k;
+ save[j++] = c = (chtype) k;
c &= A_CHARTEXT;
MvWAddCh(win, 4, i, c);
}
* authorization. *
****************************************************************************/
/*
- * $Id: rain.c,v 1.37 2010/09/25 22:16:12 juergen Exp $
+ * $Id: rain.c,v 1.38 2010/11/13 20:11:46 tom Exp $
*/
#include <test.priv.h>
ExitProgram(EXIT_FAILURE);
}
-static float
+static double
ranf(void)
{
long r = (rand() & 077777);
- return ((float) r / 32768.);
+ return ((double) r / 32768.);
}
static int
random_x(void)
{
- return (((float) (COLS - 4) * ranf()) + 2);
+ return (int) (((double) (COLS - 4) * ranf()) + 2);
}
static int
random_y(void)
{
- return (((float) (LINES - 4) * ranf()) + 2);
+ return (int) (((double) (LINES - 4) * ranf()) + 2);
}
static int
--j;
if (has_colors()) {
int z = (int) (3 * ranf());
- chtype color = COLOR_PAIR(z);
+ chtype color = (chtype) COLOR_PAIR(z);
if (z)
color |= A_BOLD;
(void) attrset(color);
if (use_default_colors() == OK)
bg = -1;
#endif
- init_pair(1, COLOR_BLUE, bg);
- init_pair(2, COLOR_CYAN, bg);
+ init_pair(1, COLOR_BLUE, (short) bg);
+ init_pair(2, COLOR_CYAN, (short) bg);
}
nl();
noecho();
* authorization. *
****************************************************************************/
/*
- * $Id: savescreen.c,v 1.12 2010/05/01 22:04:08 tom Exp $
+ * $Id: savescreen.c,v 1.13 2010/11/13 21:18:00 tom Exp $
*
* Demonstrate save/restore functions from the curses library.
* Thomas Dickey - 2007/7/14
if (has_colors()) {
start_color();
for (ch = 0; ch < COLOR_PAIRS; ++ch) {
- short pair = ch % COLOR_PAIRS;
- init_pair(pair, COLOR_WHITE, ch % COLORS);
+ short pair = (short) (ch % COLOR_PAIRS);
+ init_pair(pair, COLOR_WHITE, (short) (ch % COLORS));
}
}
}
++which;
if (has_colors()) {
- short pair = which % COLOR_PAIRS;
- bkgd(COLOR_PAIR(pair));
+ short pair = (short) (which % COLOR_PAIRS);
+ bkgd((chtype) COLOR_PAIR(pair));
}
} else {
beep();
-/* $Id: tclock.c,v 1.27 2010/05/01 18:47:19 tom Exp $ */
+/* $Id: tclock.c,v 1.29 2010/11/14 01:04:52 tom Exp $ */
#include <test.priv.h>
int d;
if (has_colors())
- (void) attrset(COLOR_PAIR(pair));
+ (void) attrset((attr_t) COLOR_PAIR(pair));
dx = x2 - from_x;
dy = y2 - from_y;
struct tm *t;
char szChar[10];
char *text;
- int my_bg = COLOR_BLACK;
+ short my_bg = COLOR_BLACK;
#if HAVE_GETTIMEOFDAY
struct timeval current;
double fraction = 0.0;
#if HAVE_GETTIMEOFDAY
gettimeofday(¤t, 0);
- fraction = (current.tv_usec / 1.0e6);
+ fraction = ((double) current.tv_usec / 1.0e6);
#endif
sangle = ((t->tm_sec + fraction) * (2.0 * PI) / 60.0);
sdx = A2X(sangle, sradius);
/****************************************************************************
* Author: Thomas E. Dickey 1996-on *
****************************************************************************/
-/* $Id: test.priv.h,v 1.95 2010/05/01 19:03:04 tom Exp $ */
+/* $Id: test.priv.h,v 1.97 2010/11/13 20:33:36 tom Exp $ */
#ifndef __TEST_PRIV_H
#define __TEST_PRIV_H 1
#define HAVE_TYPEAHEAD 0
#endif
-#ifndef HAVE_TIGETSTR
-#define HAVE_TIGETSTR 0
-#endif
-
#ifndef HAVE_WINSSTR
#define HAVE_WINSSTR 0
#endif
#include <unistd.h>
#endif
-#include <signal.h> /* include before curses.h to work around glibc bug */
+#include <signal.h> /* include before curses.h to work around glibc bug */
#if NEED_WCHAR_H
#include <wchar.h>
#if HAVE_LOCALE_H
#include <locale.h>
#else
-#define setlocale(name,string) /* nothing */
+#define setlocale(name,string) /* nothing */
#endif
#include <assert.h>
#include <ctype.h>
#ifndef GCC_NORETURN
-#define GCC_NORETURN /* nothing */
+#define GCC_NORETURN /* nothing */
#endif
#ifndef GCC_PRINTFLIKE
-#define GCC_PRINTFLIKE(a,b) /* nothing */
+#define GCC_PRINTFLIKE(a,b) /* nothing */
#endif
#ifndef GCC_UNUSED
-#define GCC_UNUSED /* nothing */
+#define GCC_UNUSED /* nothing */
#endif
#ifndef HAVE_GETNSTR
#define ESCAPE CTRL('[')
#ifndef KEY_MIN
-#define KEY_MIN 256 /* not defined in Solaris 8 */
+#define KEY_MIN 256 /* not defined in Solaris 8 */
#endif
#ifdef DECL_CURSES_DATA_BOOLNAMES
-extern char *boolnames[], *boolcodes[], *boolfnames[],
- *numnames[], *numcodes[], *numfnames[],
- *strnames[], *strcodes[], *strfnames[];
+extern char *boolnames[], *boolcodes[], *boolfnames[];
+extern char *numnames[], *numcodes[], *numfnames[];
+extern char *strnames[], *strcodes[], *strfnames[];
#endif
#define colored_chtype(ch, attr, pair) \
- ((ch) | (attr) | COLOR_PAIR(pair))
+ ((chtype) (ch) | (chtype) (attr) | (chtype) COLOR_PAIR(pair))
/*
* Workaround for HPUX
* that XSI shows.
*/
#ifndef NCURSES_CONST
-#define NCURSES_CONST /* nothing */
+#define NCURSES_CONST /* nothing */
#endif
/* out-of-band values for representing absent capabilities */
#define CANCELLED_NUMERIC (-2)
#define CANCELLED_STRING (char *)(-1)
-#define VALID_BOOLEAN(s) ((unsigned char)(s) <= 1) /* reject "-1" */
+#define VALID_BOOLEAN(s) ((unsigned char)(s) <= 1) /* reject "-1" */
#define VALID_NUMERIC(s) ((s) >= 0)
#define VALID_STRING(s) ((s) != CANCELLED_STRING && (s) != ABSENT_STRING)
#ifdef NCURSES_VERSION
#define CONST_MENUS const
#else
-#define CONST_MENUS /* nothing */
+#define CONST_MENUS /* nothing */
#endif
#ifndef HAVE_USE_WINDOW
*/
#if !HAVE_USE_WINDOW
-typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
-typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
+typedef int (*NCURSES_WINDOW_CB) (WINDOW *, void *);
+typedef int (*NCURSES_SCREEN_CB) (SCREEN *, void *);
#endif
#if HAVE_USE_WINDOW
* authorization. *
****************************************************************************/
/*
- * $Id: test_add_wchstr.c,v 1.8 2010/05/01 19:13:46 tom Exp $
+ * $Id: test_add_wchstr.c,v 1.9 2010/11/13 21:14:50 tom Exp $
*
* Demonstrate the waddwchstr() and wadd_wch functions.
* Thomas Dickey - 2009/9/12
{
wchar_t tmp_wchar[2];
- tmp_wchar[0] = source;
+ tmp_wchar[0] = (wchar_t) source;
tmp_wchar[1] = 0;
if (setcchar(target, tmp_wchar, A_NORMAL, 0, (void *) 0) == ERR) {
beep();
switch (option) {
case oDefault:
if (move(limit + row, col) != ERR) {
- AddCh(ch);
+ AddCh((chtype) ch);
}
break;
case oMove:
- MvAddCh(limit + row, col, ch);
+ MvAddCh(limit + row, col, (chtype) ch);
break;
case oWindow:
if (wmove(work, limit + row, col) != ERR) {
- WAddCh(work, ch);
+ WAddCh(work, (chtype) ch);
}
break;
case oMoveWindow:
- MvWAddCh(work, limit + row, col, ch);
+ MvWAddCh(work, limit + row, col, (chtype) ch);
break;
}
* authorization. *
****************************************************************************/
/*
- * $Id: test_addwstr.c,v 1.3 2010/05/01 19:13:46 tom Exp $
+ * $Id: test_addwstr.c,v 1.4 2010/11/13 21:13:53 tom Exp $
*
* Demonstrate the waddwstr() and wadd_wch functions.
* Thomas Dickey - 2009/9/12
{
wchar_t tmp_wchar[2];
- tmp_wchar[0] = source;
+ tmp_wchar[0] = (wchar_t) source;
tmp_wchar[1] = 0;
if (setcchar(target, tmp_wchar, A_NORMAL, 0, (void *) 0) == ERR) {
beep();
switch (option) {
case oDefault:
if (move(limit + row, col) != ERR) {
- AddCh(ch);
+ AddCh((chtype) ch);
}
break;
case oMove:
- MvAddCh(limit + row, col, ch);
+ MvAddCh(limit + row, col, (chtype) ch);
break;
case oWindow:
if (wmove(work, limit + row, col) != ERR) {
- WAddCh(work, ch);
+ WAddCh(work, (chtype) ch);
}
break;
case oMoveWindow:
- MvWAddCh(work, limit + row, col, ch);
+ MvWAddCh(work, limit + row, col, (chtype) ch);
break;
}
* authorization. *
****************************************************************************/
/*
- * $Id: test_arrays.c,v 1.4 2009/07/17 00:09:00 tom Exp $
+ * $Id: test_arrays.c,v 1.5 2010/11/13 19:57:57 tom Exp $
*
* Author: Thomas E Dickey
*
#define USE_TINFO
#include <test.priv.h>
+#if HAVE_TIGETSTR
#if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES)
#define DUMP(name) dump_array(#name, name)
ExitProgram(EXIT_FAILURE);
}
#endif
+#else /* !HAVE_TIGETSTR */
+int
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+{
+ printf("This program requires the terminfo functions such as tigetstr\n");
+ ExitProgram(EXIT_FAILURE);
+}
+#endif /* HAVE_TIGETSTR */
/*
- *
* This is a test program for the PDCurses screen package for IBM PC type
* machines.
*
* wrs(5/28/93) -- modified to be consistent (perform identically) with either
* PDCurses or under Unix System V, R4
*
- * $Id: testcurs.c,v 1.42 2010/05/01 19:23:19 tom Exp $
+ * $Id: testcurs.c,v 1.43 2010/11/13 21:02:28 tom Exp $
*/
#include <test.priv.h>
"%d %[][a-zA-Z]s",
"%d %[^0-9]"
};
- const char *format = fmt[repeat % SIZEOF(fmt)];
+ const char *format = fmt[(unsigned) repeat % SIZEOF(fmt)];
wclear(win);
MvWAddStr(win, 3, 2, "The window should have moved");
* scroll operation worked, and the refresh() code only had to do a
* partial repaint.
*
- * $Id: view.c,v 1.79 2010/05/01 21:56:10 tom Exp $
+ * $Id: view.c,v 1.81 2010/11/14 01:06:02 tom Exp $
*/
#include <test.priv.h>
static NCURSES_CH_T *
ch_dup(char *src)
{
- unsigned len = strlen(src);
+ unsigned len = (unsigned) strlen(src);
NCURSES_CH_T *dst = typeMalloc(NCURSES_CH_T, len + 1);
unsigned j, k;
#if USE_WIDEC_SUPPORT
#endif
for (j = k = 0; j < len; j++) {
#if USE_WIDEC_SUPPORT
- rc = check_mbytes(wch, src + j, len - j, state);
+ rc = (size_t) check_mbytes(wch, src + j, len - j, state);
if (rc == (size_t) -1 || rc == (size_t) -2)
break;
j += rc - 1;
wstr[l++] = L' ';
wstr[l++] = wch;
#else
- dst[k++] = src[j];
+ dst[k++] = (chtype) UChar(src[j]);
#endif
}
#if USE_WIDEC_SUPPORT
if (optind + 1 != argc)
usage();
- if ((vec_lines = typeCalloc(NCURSES_CH_T *, MAXLINES + 2)) == 0)
+ if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) MAXLINES + 2)) == 0)
usage();
assert(vec_lines != 0);
} else {
sprintf(d, "\\%03o", UChar(*s));
d += strlen(d);
- col = (d - temp);
+ col = (int) (d - temp);
}
#endif
}
*lptr = ch_dup(temp);
}
(void) fclose(fp);
- num_lines = lptr - vec_lines;
+ num_lines = (int) (lptr - vec_lines);
(void) initscr(); /* initialize the curses library */
keypad(stdscr, TRUE); /* enable keyboard mapping */
lptr++;
else
break;
- scrl(lptr - olptr);
+ scrl((int) (lptr - olptr));
break;
case KEY_UP:
lptr--;
else
break;
- scrl(lptr - olptr);
+ scrl((int) (lptr - olptr));
break;
case 'h':
#if CAN_RESIZE
sprintf(temp, "%.20s (%3dx%3d) col %d ", tag, LINES, COLS, shift);
- i = strlen(temp);
- if ((i + 7) < (int) sizeof(temp))
- sprintf(temp + i, "view %.*s", (int) (sizeof(temp) - 7 - i), fname);
+ i = (int) strlen(temp);
+ if ((i + 7) < (int) sizeof(temp)) {
+ sprintf(temp + i, "view %.*s",
+ (int) (sizeof(temp) - 7 - (size_t) i),
+ fname);
+ }
#else
(void) tag;
sprintf(temp, "view %.*s", (int) sizeof(temp) - 7, fname);
clrtoeol();
this_time = time((time_t *) 0);
strcpy(temp, ctime(&this_time));
- if ((i = strlen(temp)) != 0) {
+ if ((i = (int) strlen(temp)) != 0) {
temp[--i] = 0;
if (move(0, COLS - i - 2) != ERR)
printw(" %s", temp);
traces will be dumped. The program stops and waits for one character of
input at the beginning and end of the interval.
- $Id: worm.c,v 1.59 2008/11/16 00:19:59 juergen Exp $
+ $Id: worm.c,v 1.60 2010/11/13 20:21:21 tom Exp $
*/
#include <test.priv.h>
{
'O', '*', '#', '$', '%', '0', '@',
};
-static const short xinc[] =
+static const int xinc[] =
{
1, 1, 1, 0, -1, -1, -1, 0
}, yinc[] =
typedef struct worm {
int orientation;
int head;
- short *xpos;
- short *ypos;
+ int *xpos;
+ int *ypos;
chtype attrs;
#ifdef USE_PTHREADS
pthread_t thread;
static bool quitting = FALSE;
static WORM worm[MAX_WORMS];
-static short **refs;
+static int **refs;
static int last_x, last_y;
static const char *field;
ExitProgram(EXIT_FAILURE);
}
-static float
+static double
ranf(void)
{
long r = (rand() & 077777);
- return ((float) r / 32768.);
+ return ((double) r / 32768.);
}
static int
{
WORM *w = (WORM *) data;
const struct options *op;
- unsigned mask = ~(1 << (w - worm));
+ unsigned mask = (unsigned) (~(1 << (w - worm)));
chtype attrs = w->attrs | ((mask & pending) ? A_REVERSE : 0);
int x;
w->orientation = op->opts[0];
break;
default:
- w->orientation = op->opts[(int) (ranf() * (float) op->nopts)];
+ w->orientation = op->opts[(int) (ranf() * (double) op->nopts)];
break;
}
(void) win;
if (last_x != COLS - 1) {
for (y = 0; y <= last_y; y++) {
- refs[y] = typeRealloc(short, COLS, refs[y]);
+ refs[y] = typeRealloc(int, (size_t) COLS, refs[y]);
for (x = last_x + 1; x < COLS; x++)
refs[y][x] = 0;
}
if (last_y != LINES - 1) {
for (y = LINES; y <= last_y; y++)
free(refs[y]);
- refs = typeRealloc(short *, LINES, refs);
+ refs = typeRealloc(int *, (size_t) LINES, refs);
for (y = last_y + 1; y < LINES; y++) {
- refs[y] = typeMalloc(short, COLS);
+ refs[y] = typeMalloc(int, (size_t) COLS);
for (x = 0; x < COLS; x++)
refs[y][x] = 0;
}
int x, y;
int n;
struct worm *w;
- short *ip;
+ int *ip;
bool done = FALSE;
setlocale(LC_ALL, "");
#endif
#define SET_COLOR(num, fg) \
- init_pair(num+1, fg, bg); \
+ init_pair(num+1, (short) fg, (short) bg); \
flavor[num] |= COLOR_PAIR(num+1) | A_BOLD
SET_COLOR(0, COLOR_GREEN);
}
#endif /* A_COLOR */
- refs = typeMalloc(short *, LINES);
+ refs = typeMalloc(int *, (size_t) LINES);
for (y = 0; y < LINES; y++) {
- refs[y] = typeMalloc(short, COLS);
+ refs[y] = typeMalloc(int, (size_t) COLS);
for (x = 0; x < COLS; x++) {
refs[y][x] = 0;
}
#endif /* BADCORNER */
for (n = number, w = &worm[0]; --n >= 0; w++) {
- w->attrs = flavor[n % SIZEOF(flavor)];
+ w->attrs = flavor[(unsigned) n % SIZEOF(flavor)];
w->orientation = 0;
w->head = 0;
- if (!(ip = typeMalloc(short, (length + 1)))) {
+ if (!(ip = typeMalloc(int, (size_t) (length + 1)))) {
fprintf(stderr, "%s: out of memory\n", *argv);
ExitProgram(EXIT_FAILURE);
}
w->xpos = ip;
for (x = length; --x >= 0;)
*ip++ = -1;
- if (!(ip = typeMalloc(short, (length + 1)))) {
+ if (!(ip = typeMalloc(int, (size_t) (length + 1)))) {
fprintf(stderr, "%s: out of memory\n", *argv);
ExitProgram(EXIT_FAILURE);
}
/******************************************************************************/
/*
- * $Id: xmas.c,v 1.26 2010/05/01 18:29:50 tom Exp $
+ * $Id: xmas.c,v 1.27 2010/11/13 20:24:10 tom Exp $
*/
#include <test.priv.h>
set_color(WINDOW *win, chtype color)
{
if (has_colors()) {
- int n = (color + 1);
+ int n = (int) (color + 1);
if (my_pairs == 0)
- my_pairs = typeCalloc(bool, COLORS + 1);
+ my_pairs = typeCalloc(bool, (size_t) (COLORS + 1));
if (!my_pairs[n]) {
- init_pair(n, color, my_bg);
+ init_pair((short) n, (short) color, (short) my_bg);
my_pairs[n] = TRUE;
}
wattroff(win, A_COLOR);
projects / ncurses.git / commitdiff