mirror/ncursesw-morphos
2
0
Fork 0
mirror of https://github.com/Aigor44/ncursesw-morphos.git synced 2025-01-12 14:54:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ncurses 5.9 - patch 20111203

Browse Source 
+ modify configure-check for etip.h dependencies, supplying a temporary
  copy of ncurses_dll.h since it is a generated file (prompted by
  Debian #646977).
+ modify CF_CPP_PARAM_INIT "main" function to work with current C++.
This commit is contained in:
Thomas E. Dickey 2011-12-04 02:06:42 +00:00
parent 29b24b6ba4
commit 9d7a689764
4 changed files with 134 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written -- -- sale, use or other dealings in this Software without prior written --
-- authorization. -- -- authorization. --
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- $Id: NEWS,v 1.1825 2011/11/27 01:30:42 tom Exp $ -- $Id: NEWS,v 1.1826 2011/12/03 22:00:24 tom Exp $
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,12 @@ See the AUTHORS file for the corresponding full names.
Changes through 1.9.9e did not credit all contributions; Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information. it is not possible to add this information.
20111203
+ modify configure-check for etip.h dependencies, supplying a temporary
copy of ncurses_dll.h since it is a generated file (prompted by
Debian #646977).
+ modify CF_CPP_PARAM_INIT "main" function to work with current C++.
20111126 20111126
+ correct database iterator's check for duplicate entries + correct database iterator's check for duplicate entries
(cf: 20111001). (cf: 20111001).

16
aclocal.m4 vendored
View File

@ -28,7 +28,7 @@ dnl***************************************************************************
dnl dnl
dnl Author: Thomas E. Dickey 1995-on dnl Author: Thomas E. Dickey 1995-on
dnl dnl
dnl $Id: aclocal.m4,v 1.588 2011/11/26 21:41:37 tom Exp $ dnl $Id: aclocal.m4,v 1.589 2011/12/03 21:59:31 tom Exp $
dnl Macros used in NCURSES auto-configuration script. dnl Macros used in NCURSES auto-configuration script.
dnl dnl
dnl These macros are maintained separately from NCURSES. The copyright on dnl These macros are maintained separately from NCURSES. The copyright on
@ -996,7 +996,7 @@ then
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18 dnl CF_CPP_PARAM_INIT version: 5 updated: 2011/12/03 16:54:03
dnl ----------------- dnl -----------------
dnl Check if the C++ compiler accepts duplicate parameter initialization. This dnl Check if the C++ compiler accepts duplicate parameter initialization. This
dnl is a late feature for the standard and is not in some recent compilers dnl is a late feature for the standard and is not in some recent compilers
@ -1020,7 +1020,7 @@ TEST::TEST(int x = 1) // some compilers do not like second initializer
{ {
value = x; value = x;
} }
void main() { } int main() { }
], ],
[cf_cv_cpp_param_init=yes], [cf_cv_cpp_param_init=yes],
[cf_cv_cpp_param_init=no], [cf_cv_cpp_param_init=no],
@ -1306,7 +1306,7 @@ AC_DEFUN([CF_ERRNO],
CF_CHECK_ERRNO(errno) CF_CHECK_ERRNO(errno)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_ETIP_DEFINES version: 3 updated: 2003/03/22 19:13:43 dnl CF_ETIP_DEFINES version: 4 updated: 2011/12/03 16:54:03
dnl --------------- dnl ---------------
dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between
dnl math.h and builtin.h, only for ncurses dnl math.h and builtin.h, only for ncurses
@ -1315,11 +1315,17 @@ AC_DEFUN([CF_ETIP_DEFINES],
AC_MSG_CHECKING(for special defines needed for etip.h) AC_MSG_CHECKING(for special defines needed for etip.h)
cf_save_CXXFLAGS="$CXXFLAGS" cf_save_CXXFLAGS="$CXXFLAGS"
cf_result="none" cf_result="none"
# etip.h includes ncurses.h which includes ncurses_dll.h
# But ncurses_dll.h is generated - fix here.
test -d include || mkdir include
test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h
for cf_math in "" MATH_H for cf_math in "" MATH_H
do do
for cf_excp in "" MATH_EXCEPTION for cf_excp in "" MATH_EXCEPTION
do do
CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -I${srcdir}/include" CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include"
test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
AC_TRY_COMPILE([ AC_TRY_COMPILE([

222
configure vendored
View File

@ -18586,15 +18586,21 @@ echo "$as_me:18585: checking for special defines needed for etip.h" >&5
echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
cf_save_CXXFLAGS="$CXXFLAGS" cf_save_CXXFLAGS="$CXXFLAGS"
cf_result="none" cf_result="none"
# etip.h includes ncurses.h which includes ncurses_dll.h
# But ncurses_dll.h is generated - fix here.
test -d include || mkdir include
test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h
for cf_math in "" MATH_H for cf_math in "" MATH_H
do do
for cf_excp in "" MATH_EXCEPTION for cf_excp in "" MATH_EXCEPTION
do do
CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -I${srcdir}/include" CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include"
test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line 18597 "configure" #line 18603 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <etip.h.in> #include <etip.h.in>
@ -18608,16 +18614,16 @@ main ()
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
if { (eval echo "$as_me:18611: \"$ac_compile\"") >&5 if { (eval echo "$as_me:18617: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:18614: \$? = $ac_status" >&5 echo "$as_me:18620: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:18617: \"$ac_try\"") >&5 { (eval echo "$as_me:18623: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:18620: \$? = $ac_status" >&5 echo "$as_me:18626: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
test -n "$cf_math" && cat >>confdefs.h <<EOF test -n "$cf_math" && cat >>confdefs.h <<EOF
@ -18638,12 +18644,12 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext rm -f conftest.$ac_objext conftest.$ac_ext
done done
done done
echo "$as_me:18641: result: $cf_result" >&5 echo "$as_me:18647: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6 echo "${ECHO_T}$cf_result" >&6
CXXFLAGS="$cf_save_CXXFLAGS" CXXFLAGS="$cf_save_CXXFLAGS"
if test -n "$CXX"; then if test -n "$CXX"; then
echo "$as_me:18646: checking if $CXX accepts parameter initialization" >&5 echo "$as_me:18652: checking if $CXX accepts parameter initialization" >&5
echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
if test "${cf_cv_cpp_param_init+set}" = set; then if test "${cf_cv_cpp_param_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -18660,7 +18666,7 @@ ac_main_return=return
cf_cv_cpp_param_init=unknown cf_cv_cpp_param_init=unknown
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line 18663 "configure" #line 18669 "configure"
#include "confdefs.h" #include "confdefs.h"
class TEST { class TEST {
@ -18675,19 +18681,19 @@ TEST::TEST(int x = 1) // some compilers do not like second initializer
{ {
value = x; value = x;
} }
void main() { } int main() { }
_ACEOF _ACEOF
rm -f conftest$ac_exeext rm -f conftest$ac_exeext
if { (eval echo "$as_me:18682: \"$ac_link\"") >&5 if { (eval echo "$as_me:18688: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:18685: \$? = $ac_status" >&5 echo "$as_me:18691: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext' (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (eval echo "$as_me:18687: \"$ac_try\"") >&5 { (eval echo "$as_me:18693: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:18690: \$? = $ac_status" >&5 echo "$as_me:18696: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
cf_cv_cpp_param_init=yes cf_cv_cpp_param_init=yes
else else
@ -18706,7 +18712,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return ac_main_return=return
fi fi
echo "$as_me:18709: result: $cf_cv_cpp_param_init" >&5 echo "$as_me:18715: result: $cf_cv_cpp_param_init" >&5
echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
fi fi
test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
@ -18715,7 +18721,7 @@ EOF
if test -n "$CXX"; then if test -n "$CXX"; then
echo "$as_me:18718: checking if $CXX accepts static_cast" >&5 echo "$as_me:18724: checking if $CXX accepts static_cast" >&5
echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
if test "${cf_cv_cpp_static_cast+set}" = set; then if test "${cf_cv_cpp_static_cast+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -18729,7 +18735,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return ac_main_return=return
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line 18732 "configure" #line 18738 "configure"
#include "confdefs.h" #include "confdefs.h"
class NCursesPanel class NCursesPanel
@ -18773,16 +18779,16 @@ main ()
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
if { (eval echo "$as_me:18776: \"$ac_compile\"") >&5 if { (eval echo "$as_me:18782: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:18779: \$? = $ac_status" >&5 echo "$as_me:18785: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:18782: \"$ac_try\"") >&5 { (eval echo "$as_me:18788: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:18785: \$? = $ac_status" >&5 echo "$as_me:18791: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
cf_cv_cpp_static_cast=yes cf_cv_cpp_static_cast=yes
else else
@ -18800,7 +18806,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return ac_main_return=return
fi fi
echo "$as_me:18803: result: $cf_cv_cpp_static_cast" >&5 echo "$as_me:18809: result: $cf_cv_cpp_static_cast" >&5
echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
fi fi
@ -18848,7 +18854,7 @@ else
else else
if test "$cf_cv_header_stdbool_h" = 1 ; then if test "$cf_cv_header_stdbool_h" = 1 ; then
echo "$as_me:18851: checking for size of bool" >&5 echo "$as_me:18857: checking for size of bool" >&5
echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
if test "${cf_cv_type_of_bool+set}" = set; then if test "${cf_cv_type_of_bool+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -18859,7 +18865,7 @@ else
cf_cv_type_of_bool=unknown cf_cv_type_of_bool=unknown
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line 18862 "configure" #line 18868 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
@ -18901,15 +18907,15 @@ main()
_ACEOF _ACEOF
rm -f conftest$ac_exeext rm -f conftest$ac_exeext
if { (eval echo "$as_me:18904: \"$ac_link\"") >&5 if { (eval echo "$as_me:18910: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:18907: \$? = $ac_status" >&5 echo "$as_me:18913: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext' (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (eval echo "$as_me:18909: \"$ac_try\"") >&5 { (eval echo "$as_me:18915: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:18912: \$? = $ac_status" >&5 echo "$as_me:18918: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
cf_cv_type_of_bool=`cat cf_test.out` cf_cv_type_of_bool=`cat cf_test.out`
if test -z "$cf_cv_type_of_bool"; then if test -z "$cf_cv_type_of_bool"; then
@ -18927,25 +18933,25 @@ fi
fi fi
rm -f cf_test.out rm -f cf_test.out
echo "$as_me:18930: result: $cf_cv_type_of_bool" >&5 echo "$as_me:18936: result: $cf_cv_type_of_bool" >&5
echo "${ECHO_T}$cf_cv_type_of_bool" >&6 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
if test "$cf_cv_type_of_bool" = unknown ; then if test "$cf_cv_type_of_bool" = unknown ; then
case .$NCURSES_BOOL in #(vi case .$NCURSES_BOOL in #(vi
.auto|.) NCURSES_BOOL=unsigned;; .auto|.) NCURSES_BOOL=unsigned;;
esac esac
{ echo "$as_me:18936: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 { echo "$as_me:18942: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
cf_cv_type_of_bool=$NCURSES_BOOL cf_cv_type_of_bool=$NCURSES_BOOL
fi fi
else else
echo "$as_me:18942: checking for fallback type of bool" >&5 echo "$as_me:18948: checking for fallback type of bool" >&5
echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
case "$host_cpu" in #(vi case "$host_cpu" in #(vi
i?86) cf_cv_type_of_bool=char ;; #(vi i?86) cf_cv_type_of_bool=char ;; #(vi
*) cf_cv_type_of_bool=int ;; *) cf_cv_type_of_bool=int ;;
esac esac
echo "$as_me:18948: result: $cf_cv_type_of_bool" >&5 echo "$as_me:18954: result: $cf_cv_type_of_bool" >&5
echo "${ECHO_T}$cf_cv_type_of_bool" >&6 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
fi fi
fi fi
@ -18974,7 +18980,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
if test "$cf_with_ada" != "no" ; then if test "$cf_with_ada" != "no" ; then
if test "$with_libtool" != "no"; then if test "$with_libtool" != "no"; then
{ echo "$as_me:18977: WARNING: libtool does not support Ada - disabling feature" >&5 { echo "$as_me:18983: WARNING: libtool does not support Ada - disabling feature" >&5
echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
cf_with_ada=no cf_with_ada=no
fi fi
@ -18985,7 +18991,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
cf_ada_make=gnatmake cf_ada_make=gnatmake
# Extract the first word of "$cf_ada_make", so it can be a program name with args. # Extract the first word of "$cf_ada_make", so it can be a program name with args.
set dummy $cf_ada_make; ac_word=$2 set dummy $cf_ada_make; ac_word=$2
echo "$as_me:18988: checking for $ac_word" >&5 echo "$as_me:18994: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_gnat_exists+set}" = set; then if test "${ac_cv_prog_gnat_exists+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -19000,7 +19006,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue $as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_gnat_exists="yes" ac_cv_prog_gnat_exists="yes"
echo "$as_me:19003: found $ac_dir/$ac_word" >&5 echo "$as_me:19009: found $ac_dir/$ac_word" >&5
break break
done done
@ -19009,10 +19015,10 @@ fi
fi fi
gnat_exists=$ac_cv_prog_gnat_exists gnat_exists=$ac_cv_prog_gnat_exists
if test -n "$gnat_exists"; then if test -n "$gnat_exists"; then
echo "$as_me:19012: result: $gnat_exists" >&5 echo "$as_me:19018: result: $gnat_exists" >&5
echo "${ECHO_T}$gnat_exists" >&6 echo "${ECHO_T}$gnat_exists" >&6
else else
echo "$as_me:19015: result: no" >&5 echo "$as_me:19021: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
@ -19021,12 +19027,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then
cf_cv_prog_gnat_correct=no cf_cv_prog_gnat_correct=no
else else
echo "$as_me:19024: checking for gnat version" >&5 echo "$as_me:19030: checking for gnat version" >&5
echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
grep '[0-9].[0-9][0-9]*' |\ grep '[0-9].[0-9][0-9]*' |\
sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
echo "$as_me:19029: result: $cf_gnat_version" >&5 echo "$as_me:19035: result: $cf_gnat_version" >&5
echo "${ECHO_T}$cf_gnat_version" >&6 echo "${ECHO_T}$cf_gnat_version" >&6
case $cf_gnat_version in #(vi case $cf_gnat_version in #(vi
@ -19034,7 +19040,7 @@ case $cf_gnat_version in #(vi
cf_cv_prog_gnat_correct=yes cf_cv_prog_gnat_correct=yes
;; ;;
*) *)
{ echo "$as_me:19037: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 { echo "$as_me:19043: 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;} 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 cf_cv_prog_gnat_correct=no
;; ;;
@ -19042,7 +19048,7 @@ esac
# Extract the first word of "m4", so it can be a program name with args. # Extract the first word of "m4", so it can be a program name with args.
set dummy m4; ac_word=$2 set dummy m4; ac_word=$2
echo "$as_me:19045: checking for $ac_word" >&5 echo "$as_me:19051: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_M4_exists+set}" = set; then if test "${ac_cv_prog_M4_exists+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -19057,7 +19063,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue $as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_M4_exists="yes" ac_cv_prog_M4_exists="yes"
echo "$as_me:19060: found $ac_dir/$ac_word" >&5 echo "$as_me:19066: found $ac_dir/$ac_word" >&5
break break
done done
@ -19066,10 +19072,10 @@ fi
fi fi
M4_exists=$ac_cv_prog_M4_exists M4_exists=$ac_cv_prog_M4_exists
if test -n "$M4_exists"; then if test -n "$M4_exists"; then
echo "$as_me:19069: result: $M4_exists" >&5 echo "$as_me:19075: result: $M4_exists" >&5
echo "${ECHO_T}$M4_exists" >&6 echo "${ECHO_T}$M4_exists" >&6
else else
echo "$as_me:19072: result: no" >&5 echo "$as_me:19078: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
@ -19078,7 +19084,7 @@ fi
echo Ada95 binding required program m4 not found. Ada95 binding disabled. echo Ada95 binding required program m4 not found. Ada95 binding disabled.
fi fi
if test "$cf_cv_prog_gnat_correct" = yes; then if test "$cf_cv_prog_gnat_correct" = yes; then
echo "$as_me:19081: checking if GNAT works" >&5 echo "$as_me:19087: checking if GNAT works" >&5
echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
rm -rf conftest* *~conftest* rm -rf conftest* *~conftest*
@ -19106,7 +19112,7 @@ else
fi fi
rm -rf conftest* *~conftest* rm -rf conftest* *~conftest*
echo "$as_me:19109: result: $cf_cv_prog_gnat_correct" >&5 echo "$as_me:19115: result: $cf_cv_prog_gnat_correct" >&5
echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
fi fi
fi fi
@ -19131,7 +19137,7 @@ fi
;; ;;
esac esac
echo "$as_me:19134: checking if GNAT supports generics" >&5 echo "$as_me:19140: checking if GNAT supports generics" >&5
echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
case $cf_gnat_version in #(vi case $cf_gnat_version in #(vi
3.[1-9]*|[4-9].*) #(vi 3.[1-9]*|[4-9].*) #(vi
@ -19141,7 +19147,7 @@ case $cf_gnat_version in #(vi
cf_gnat_generics=no cf_gnat_generics=no
;; ;;
esac esac
echo "$as_me:19144: result: $cf_gnat_generics" >&5 echo "$as_me:19150: result: $cf_gnat_generics" >&5
echo "${ECHO_T}$cf_gnat_generics" >&6 echo "${ECHO_T}$cf_gnat_generics" >&6
if test "$cf_gnat_generics" = yes if test "$cf_gnat_generics" = yes
@ -19153,7 +19159,7 @@ else
cf_generic_objects= cf_generic_objects=
fi fi
echo "$as_me:19156: checking if GNAT supports SIGINT" >&5 echo "$as_me:19162: checking if GNAT supports SIGINT" >&5
echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
if test "${cf_cv_gnat_sigint+set}" = set; then if test "${cf_cv_gnat_sigint+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -19201,7 +19207,7 @@ fi
rm -rf conftest* *~conftest* rm -rf conftest* *~conftest*
fi fi
echo "$as_me:19204: result: $cf_cv_gnat_sigint" >&5 echo "$as_me:19210: result: $cf_cv_gnat_sigint" >&5
echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
if test $cf_cv_gnat_sigint = yes ; then if test $cf_cv_gnat_sigint = yes ; then
@ -19210,7 +19216,7 @@ else
USE_GNAT_SIGINT="#" USE_GNAT_SIGINT="#"
fi fi
echo "$as_me:19213: checking if GNAT pragma Unreferenced works" >&5 echo "$as_me:19219: checking if GNAT pragma Unreferenced works" >&5
echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
if test "${cf_cv_pragma_unreferenced+set}" = set; then if test "${cf_cv_pragma_unreferenced+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -19241,7 +19247,7 @@ fi
rm -rf conftest* *~conftest* rm -rf conftest* *~conftest*
fi fi
echo "$as_me:19244: result: $cf_cv_pragma_unreferenced" >&5 echo "$as_me:19250: result: $cf_cv_pragma_unreferenced" >&5
echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
# if the pragma is supported, use it (needed in the Trace code). # if the pragma is supported, use it (needed in the Trace code).
@ -19254,7 +19260,7 @@ fi
cf_gnat_libraries=no cf_gnat_libraries=no
cf_gnat_projects=no cf_gnat_projects=no
echo "$as_me:19257: checking if GNAT supports project files" >&5 echo "$as_me:19263: checking if GNAT supports project files" >&5
echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
case $cf_gnat_version in #(vi case $cf_gnat_version in #(vi
3.[0-9]*) #(vi 3.[0-9]*) #(vi
@ -19322,14 +19328,14 @@ CF_EOF
esac esac
;; ;;
esac esac
echo "$as_me:19325: result: $cf_gnat_projects" >&5 echo "$as_me:19331: result: $cf_gnat_projects" >&5
echo "${ECHO_T}$cf_gnat_projects" >&6 echo "${ECHO_T}$cf_gnat_projects" >&6
if test $cf_gnat_projects = yes if test $cf_gnat_projects = yes
then then
echo "$as_me:19330: checking if GNAT supports libraries" >&5 echo "$as_me:19336: checking if GNAT supports libraries" >&5
echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
echo "$as_me:19332: result: $cf_gnat_libraries" >&5 echo "$as_me:19338: result: $cf_gnat_libraries" >&5
echo "${ECHO_T}$cf_gnat_libraries" >&6 echo "${ECHO_T}$cf_gnat_libraries" >&6
fi fi
@ -19349,7 +19355,7 @@ else
USE_GNAT_LIBRARIES="#" USE_GNAT_LIBRARIES="#"
fi fi
echo "$as_me:19352: checking for ada-compiler" >&5 echo "$as_me:19358: checking for ada-compiler" >&5
echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
# Check whether --with-ada-compiler or --without-ada-compiler was given. # Check whether --with-ada-compiler or --without-ada-compiler was given.
@ -19360,12 +19366,12 @@ else
cf_ada_compiler=gnatmake cf_ada_compiler=gnatmake
fi; fi;
echo "$as_me:19363: result: $cf_ada_compiler" >&5 echo "$as_me:19369: result: $cf_ada_compiler" >&5
echo "${ECHO_T}$cf_ada_compiler" >&6 echo "${ECHO_T}$cf_ada_compiler" >&6
cf_ada_package=terminal_interface cf_ada_package=terminal_interface
echo "$as_me:19368: checking for ada-include" >&5 echo "$as_me:19374: checking for ada-include" >&5
echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
# Check whether --with-ada-include or --without-ada-include was given. # Check whether --with-ada-include or --without-ada-include was given.
@ -19401,7 +19407,7 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;; ;;
*) *)
{ { echo "$as_me:19404: error: expected a pathname, not \"$withval\"" >&5 { { echo "$as_me:19410: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
;; ;;
@ -19410,10 +19416,10 @@ esac
fi fi
ADA_INCLUDE="$withval" ADA_INCLUDE="$withval"
echo "$as_me:19413: result: $ADA_INCLUDE" >&5 echo "$as_me:19419: result: $ADA_INCLUDE" >&5
echo "${ECHO_T}$ADA_INCLUDE" >&6 echo "${ECHO_T}$ADA_INCLUDE" >&6
echo "$as_me:19416: checking for ada-objects" >&5 echo "$as_me:19422: checking for ada-objects" >&5
echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
# Check whether --with-ada-objects or --without-ada-objects was given. # Check whether --with-ada-objects or --without-ada-objects was given.
@ -19449,7 +19455,7 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;; ;;
*) *)
{ { echo "$as_me:19452: error: expected a pathname, not \"$withval\"" >&5 { { echo "$as_me:19458: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
;; ;;
@ -19458,10 +19464,10 @@ esac
fi fi
ADA_OBJECTS="$withval" ADA_OBJECTS="$withval"
echo "$as_me:19461: result: $ADA_OBJECTS" >&5 echo "$as_me:19467: result: $ADA_OBJECTS" >&5
echo "${ECHO_T}$ADA_OBJECTS" >&6 echo "${ECHO_T}$ADA_OBJECTS" >&6
echo "$as_me:19464: checking if an Ada95 shared-library should be built" >&5 echo "$as_me:19470: 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 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. # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@ -19471,7 +19477,7 @@ if test "${with_ada_sharedlib+set}" = set; then
else else
with_ada_sharedlib=no with_ada_sharedlib=no
fi; fi;
echo "$as_me:19474: result: $with_ada_sharedlib" >&5 echo "$as_me:19480: result: $with_ada_sharedlib" >&5
echo "${ECHO_T}$with_ada_sharedlib" >&6 echo "${ECHO_T}$with_ada_sharedlib" >&6
ADA_SHAREDLIB='lib$(LIB_NAME).so.1' ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
@ -19502,7 +19508,7 @@ fi
### chooses to split module lists into libraries. ### chooses to split module lists into libraries.
### ###
### (see CF_LIB_RULES). ### (see CF_LIB_RULES).
echo "$as_me:19505: checking for library subsets" >&5 echo "$as_me:19511: checking for library subsets" >&5
echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
LIB_SUBSETS= LIB_SUBSETS=
@ -19543,7 +19549,7 @@ fi
test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
echo "$as_me:19546: result: $LIB_SUBSETS" >&5 echo "$as_me:19552: result: $LIB_SUBSETS" >&5
echo "${ECHO_T}$LIB_SUBSETS" >&6 echo "${ECHO_T}$LIB_SUBSETS" >&6
### Construct the list of include-directories to be generated ### Construct the list of include-directories to be generated
@ -19581,7 +19587,7 @@ elif test "$includedir" != "/usr/include"; then
fi fi
### Build up pieces for makefile rules ### Build up pieces for makefile rules
echo "$as_me:19584: checking default library suffix" >&5 echo "$as_me:19590: checking default library suffix" >&5
echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in case $DFT_LWR_MODEL in
@ -19592,10 +19598,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
shared) DFT_ARG_SUFFIX='' ;; shared) DFT_ARG_SUFFIX='' ;;
esac esac
test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
echo "$as_me:19595: result: $DFT_ARG_SUFFIX" >&5 echo "$as_me:19601: result: $DFT_ARG_SUFFIX" >&5
echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
echo "$as_me:19598: checking default library-dependency suffix" >&5 echo "$as_me:19604: checking default library-dependency suffix" >&5
echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in #(vi case $DFT_LWR_MODEL in #(vi
@ -19648,10 +19654,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
esac esac
test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
echo "$as_me:19651: result: $DFT_DEP_SUFFIX" >&5 echo "$as_me:19657: result: $DFT_DEP_SUFFIX" >&5
echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
echo "$as_me:19654: checking default object directory" >&5 echo "$as_me:19660: checking default object directory" >&5
echo $ECHO_N "checking default object directory... $ECHO_C" >&6 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
case $DFT_LWR_MODEL in case $DFT_LWR_MODEL in
@ -19667,12 +19673,12 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
DFT_OBJ_SUBDIR='obj_s' ;; DFT_OBJ_SUBDIR='obj_s' ;;
esac esac
esac esac
echo "$as_me:19670: result: $DFT_OBJ_SUBDIR" >&5 echo "$as_me:19676: result: $DFT_OBJ_SUBDIR" >&5
echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
# libtool thinks it can make c++ shared libraries (perhaps only g++) # libtool thinks it can make c++ shared libraries (perhaps only g++)
if test "$cf_with_cxx" = yes ; then if test "$cf_with_cxx" = yes ; then
echo "$as_me:19675: checking c++ library-dependency suffix" >&5 echo "$as_me:19681: checking c++ library-dependency suffix" >&5
echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
if test "$with_libtool" != "no"; then if test "$with_libtool" != "no"; then
CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
@ -19729,7 +19735,7 @@ else
test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_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}" test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
fi fi
echo "$as_me:19732: result: $CXX_LIB_SUFFIX" >&5 echo "$as_me:19738: result: $CXX_LIB_SUFFIX" >&5
echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
fi fi
@ -19888,19 +19894,19 @@ fi
if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
then then
echo "$as_me:19891: checking if linker supports switching between static/dynamic" >&5 echo "$as_me:19897: checking if linker supports switching between static/dynamic" >&5
echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
rm -f libconftest.a rm -f libconftest.a
cat >conftest.$ac_ext <<EOF cat >conftest.$ac_ext <<EOF
#line 19896 "configure" #line 19902 "configure"
#include <stdio.h> #include <stdio.h>
int cf_ldflags_static(FILE *fp) { return fflush(fp); } int cf_ldflags_static(FILE *fp) { return fflush(fp); }
EOF EOF
if { (eval echo "$as_me:19900: \"$ac_compile\"") >&5 if { (eval echo "$as_me:19906: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:19903: \$? = $ac_status" >&5 echo "$as_me:19909: \$? = $ac_status" >&5
(exit $ac_status); } ; then (exit $ac_status); } ; then
( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
( eval $RANLIB libconftest.a ) 2>&5 >/dev/null ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
@ -19911,10 +19917,10 @@ EOF
LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line 19914 "configure" #line 19920 "configure"
#include "confdefs.h" #include "confdefs.h"
#line 19917 "configure" #line 19923 "configure"
#include <stdio.h> #include <stdio.h>
int cf_ldflags_static(FILE *fp); int cf_ldflags_static(FILE *fp);
@ -19929,16 +19935,16 @@ main ()
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:19932: \"$ac_link\"") >&5 if { (eval echo "$as_me:19938: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:19935: \$? = $ac_status" >&5 echo "$as_me:19941: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext' { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:19938: \"$ac_try\"") >&5 { (eval echo "$as_me:19944: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:19941: \$? = $ac_status" >&5 echo "$as_me:19947: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
# some linkers simply ignore the -dynamic # some linkers simply ignore the -dynamic
@ -19961,7 +19967,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
rm -f libconftest.* rm -f libconftest.*
LIBS="$cf_save_LIBS" LIBS="$cf_save_LIBS"
echo "$as_me:19964: result: $cf_ldflags_static" >&5 echo "$as_me:19970: result: $cf_ldflags_static" >&5
echo "${ECHO_T}$cf_ldflags_static" >&6 echo "${ECHO_T}$cf_ldflags_static" >&6
if test $cf_ldflags_static != yes if test $cf_ldflags_static != yes
@ -19977,12 +19983,12 @@ fi
;; ;;
esac esac
echo "$as_me:19980: checking where we will install curses.h" >&5 echo "$as_me:19986: checking where we will install curses.h" >&5
echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
test "$with_overwrite" = no && \ test "$with_overwrite" = no && \
test "x$includedir" = 'x${prefix}/include' && \ test "x$includedir" = 'x${prefix}/include' && \
includedir='${prefix}/include/ncurses'${LIB_SUFFIX} includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
echo "$as_me:19985: result: $includedir" >&5 echo "$as_me:19991: result: $includedir" >&5
echo "${ECHO_T}$includedir" >&6 echo "${ECHO_T}$includedir" >&6
### Resolve a conflict between normal and wide-curses by forcing applications ### Resolve a conflict between normal and wide-curses by forcing applications
@ -19990,7 +19996,7 @@ echo "${ECHO_T}$includedir" >&6
if test "$with_overwrite" != no ; then if test "$with_overwrite" != no ; then
if test "$NCURSES_LIBUTF8" = 1 ; then if test "$NCURSES_LIBUTF8" = 1 ; then
NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
{ echo "$as_me:19993: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 { echo "$as_me:19999: 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;} echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
fi fi
fi fi
@ -20007,7 +20013,7 @@ EOF
### Construct the list of subdirectories for which we'll customize makefiles ### Construct the list of subdirectories for which we'll customize makefiles
### with the appropriate compile-rules. ### with the appropriate compile-rules.
echo "$as_me:20010: checking for src modules" >&5 echo "$as_me:20016: checking for src modules" >&5
echo $ECHO_N "checking for src modules... $ECHO_C" >&6 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
# dependencies and linker-arguments for test-programs # dependencies and linker-arguments for test-programs
@ -20072,7 +20078,7 @@ EOF
fi fi
fi fi
done done
echo "$as_me:20075: result: $cf_cv_src_modules" >&5 echo "$as_me:20081: result: $cf_cv_src_modules" >&5
echo "${ECHO_T}$cf_cv_src_modules" >&6 echo "${ECHO_T}$cf_cv_src_modules" >&6
TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@ -20281,7 +20287,7 @@ fi
# Extract the first word of "tic", so it can be a program name with args. # Extract the first word of "tic", so it can be a program name with args.
set dummy tic; ac_word=$2 set dummy tic; ac_word=$2
echo "$as_me:20284: checking for $ac_word" >&5 echo "$as_me:20290: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_TIC_PATH+set}" = set; then if test "${ac_cv_path_TIC_PATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -20298,7 +20304,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_TIC_PATH="$ac_dir/$ac_word" ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
echo "$as_me:20301: found $ac_dir/$ac_word" >&5 echo "$as_me:20307: found $ac_dir/$ac_word" >&5
break break
fi fi
done done
@ -20310,10 +20316,10 @@ fi
TIC_PATH=$ac_cv_path_TIC_PATH TIC_PATH=$ac_cv_path_TIC_PATH
if test -n "$TIC_PATH"; then if test -n "$TIC_PATH"; then
echo "$as_me:20313: result: $TIC_PATH" >&5 echo "$as_me:20319: result: $TIC_PATH" >&5
echo "${ECHO_T}$TIC_PATH" >&6 echo "${ECHO_T}$TIC_PATH" >&6
else else
echo "$as_me:20316: result: no" >&5 echo "$as_me:20322: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
@ -20321,7 +20327,7 @@ if test -n "$FALLBACK_LIST"
then then
if test "$TIC_PATH" = unknown if test "$TIC_PATH" = unknown
then then
{ echo "$as_me:20324: WARNING: no tic program found for fallbacks" >&5 { echo "$as_me:20330: WARNING: no tic program found for fallbacks" >&5
echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
fi fi
fi fi
@ -20422,7 +20428,7 @@ DEFS=-DHAVE_CONFIG_H
: ${CONFIG_STATUS=./config.status} : ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS" ac_clean_files="$ac_clean_files $CONFIG_STATUS"
{ echo "$as_me:20425: creating $CONFIG_STATUS" >&5 { echo "$as_me:20431: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;} echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL #! $SHELL
@ -20598,7 +20604,7 @@ cat >>$CONFIG_STATUS <<\EOF
echo "$ac_cs_version"; exit 0 ;; echo "$ac_cs_version"; exit 0 ;;
--he | --h) --he | --h)
# Conflict between --help and --header # Conflict between --help and --header
{ { echo "$as_me:20601: error: ambiguous option: $1 { { echo "$as_me:20607: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5 Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1 echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;} Try \`$0 --help' for more information." >&2;}
@ -20617,7 +20623,7 @@ Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;; ac_need_defaults=false;;
# This is an error. # This is an error.
-*) { { echo "$as_me:20620: error: unrecognized option: $1 -*) { { echo "$as_me:20626: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5 Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1 echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;} Try \`$0 --help' for more information." >&2;}
@ -20724,7 +20730,7 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
*) { { echo "$as_me:20727: error: invalid argument: $ac_config_target" >&5 *) { { echo "$as_me:20733: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;} echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };; { (exit 1); exit 1; }; };;
esac esac
@ -21138,7 +21144,7 @@ done; }
esac esac
if test x"$ac_file" != x-; then if test x"$ac_file" != x-; then
{ echo "$as_me:21141: creating $ac_file" >&5 { echo "$as_me:21147: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;} echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file" rm -f "$ac_file"
fi fi
@ -21156,7 +21162,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;; -) echo $tmp/stdin ;;
[\\/$]*) [\\/$]*)
# Absolute (can't be DOS-style, as IFS=:) # Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:21159: error: cannot find input file: $f" >&5 test -f "$f" || { { echo "$as_me:21165: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;} echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
echo $f;; echo $f;;
@ -21169,7 +21175,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f echo $srcdir/$f
else else
# /dev/null tree # /dev/null tree
{ { echo "$as_me:21172: error: cannot find input file: $f" >&5 { { echo "$as_me:21178: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;} echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi;; fi;;
@ -21235,7 +21241,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
* ) ac_file_in=$ac_file.in ;; * ) ac_file_in=$ac_file.in ;;
esac esac
test x"$ac_file" != x- && { echo "$as_me:21238: creating $ac_file" >&5 test x"$ac_file" != x- && { echo "$as_me:21244: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;} echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the # First look for the input files in the build tree, otherwise in the
@ -21246,7 +21252,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;; -) echo $tmp/stdin ;;
[\\/$]*) [\\/$]*)
# Absolute (can't be DOS-style, as IFS=:) # Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:21249: error: cannot find input file: $f" >&5 test -f "$f" || { { echo "$as_me:21255: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;} echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
echo $f;; echo $f;;
@ -21259,7 +21265,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f echo $srcdir/$f
else else
# /dev/null tree # /dev/null tree
{ { echo "$as_me:21262: error: cannot find input file: $f" >&5 { { echo "$as_me:21268: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;} echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi;; fi;;
@ -21317,7 +21323,7 @@ cat >>$CONFIG_STATUS <<\EOF
rm -f $tmp/in rm -f $tmp/in
if test x"$ac_file" != x-; then if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
{ echo "$as_me:21320: $ac_file is unchanged" >&5 { echo "$as_me:21326: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;} echo "$as_me: $ac_file is unchanged" >&6;}
else else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

4
dist.mk
View File

@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written # # use or other dealings in this Software without prior written #
# authorization. # # authorization. #
############################################################################## ##############################################################################
# $Id: dist.mk,v 1.845 2011/11/26 18:22:21 tom Exp $ # $Id: dist.mk,v 1.846 2011/12/03 21:00:14 tom Exp $
# Makefile for creating ncurses distributions. # Makefile for creating ncurses distributions.
# #
# This only needs to be used directly as a makefile by developers, but # This only needs to be used directly as a makefile by developers, but
@ -37,7 +37,7 @@ SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses. # These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5 NCURSES_MAJOR = 5
NCURSES_MINOR = 9 NCURSES_MINOR = 9
NCURSES_PATCH = 20111126 NCURSES_PATCH = 20111203
# We don't append the patch to the version, since this only applies to releases # We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)