mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2024-12-21 07:39:06 +08:00
ncurses 6.1 - patch 20180818
+ build-fix for PDCurses with ncurses-examples. + improved CF_CC_ENV_FLAGS. + modify configure scripts to reduce relinking/ranlib during library install (Debian #903790): + use "install -p" when available, to avoid need for ranlib of static libraries. + modify scripts which use "--disable-relink" to add a 1-second sleep to work around tools which use whole-second timestamps, e.g., in utime() rather than the actual file system resolution. + add "--disable-touching" option for using "install -p" option during the install, e.g., so that header-files have a predictable timestamp.
This commit is contained in:
Thomas E. Dickey
parent
99e9dbb684
commit
df51c7005b
159
Ada95/aclocal.m4
vendored
159
Ada95/aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
|||||||
dnl
|
dnl
|
||||||
dnl Author: Thomas E. Dickey
|
dnl Author: Thomas E. Dickey
|
||||||
dnl
|
dnl
|
||||||
dnl $Id: aclocal.m4,v 1.134 2018/07/21 23:14:07 tom Exp $
|
dnl $Id: aclocal.m4,v 1.136 2018/08/18 20:38:26 tom Exp $
|
||||||
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
dnl Macros used in NCURSES Ada95 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
|
||||||
@ -524,7 +524,7 @@ AC_SUBST(BUILD_EXEEXT)
|
|||||||
AC_SUBST(BUILD_OBJEXT)
|
AC_SUBST(BUILD_OBJEXT)
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_CC_ENV_FLAGS version: 8 updated: 2017/09/23 08:50:24
|
dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
||||||
dnl into CC. This will not help with broken scripts that wrap the compiler
|
dnl into CC. This will not help with broken scripts that wrap the compiler
|
||||||
@ -541,11 +541,28 @@ AC_DEFUN([CF_CC_ENV_FLAGS],
|
|||||||
# This should have been defined by AC_PROG_CC
|
# This should have been defined by AC_PROG_CC
|
||||||
: ${CC:=cc}
|
: ${CC:=cc}
|
||||||
|
|
||||||
|
AC_MSG_CHECKING(\$CFLAGS variable)
|
||||||
|
case "x$CFLAGS" in
|
||||||
|
(*-[[IUD]]*)
|
||||||
|
AC_MSG_RESULT(broken)
|
||||||
|
AC_MSG_WARN(your environment uses the CFLAGS variable to hold CPPFLAGS options)
|
||||||
|
cf_flags="$CFLAGS"
|
||||||
|
CFLAGS=
|
||||||
|
for cf_arg in $cf_flags
|
||||||
|
do
|
||||||
|
CF_ADD_CFLAGS($cf_arg)
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
(*)
|
||||||
|
AC_MSG_RESULT(ok)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
AC_MSG_CHECKING(\$CC variable)
|
AC_MSG_CHECKING(\$CC variable)
|
||||||
case "$CC" in
|
case "$CC" in
|
||||||
(*[[\ \ ]]-*)
|
(*[[\ \ ]]-*)
|
||||||
AC_MSG_RESULT(broken)
|
AC_MSG_RESULT(broken)
|
||||||
AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
|
AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options)
|
||||||
# humor him...
|
# humor him...
|
||||||
cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
|
cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
|
||||||
cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'`
|
cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'`
|
||||||
@ -1667,12 +1684,13 @@ CPPFLAGS="-I. $CPPFLAGS"
|
|||||||
AC_SUBST(CPPFLAGS)
|
AC_SUBST(CPPFLAGS)
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_INSTALL_OPTS version: 1 updated: 2014/07/21 18:19:51
|
dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl prompt for/fill-in useful install-program options
|
dnl prompt for/fill-in useful install-program options
|
||||||
AC_DEFUN([CF_INSTALL_OPTS],
|
AC_DEFUN([CF_INSTALL_OPTS],
|
||||||
[
|
[
|
||||||
CF_INSTALL_OPT_S
|
CF_INSTALL_OPT_S
|
||||||
|
CF_INSTALL_OPT_P
|
||||||
CF_INSTALL_OPT_O
|
CF_INSTALL_OPT_O
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
@ -1703,7 +1721,42 @@ fi
|
|||||||
AC_SUBST(INSTALL_OPT_O)
|
AC_SUBST(INSTALL_OPT_O)
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_INSTALL_OPT_S version: 1 updated: 2014/07/21 18:19:51
|
dnl CF_INSTALL_OPT_P version: 1 updated: 2018/08/18 12:19:21
|
||||||
|
dnl ----------------
|
||||||
|
dnl Some install-programs accept a "-p" option to preserve file modification
|
||||||
|
dnl timestamps. That can be useful as an install option, as well as a way to
|
||||||
|
dnl avoid the need for ranlib after copying a static archive.
|
||||||
|
AC_DEFUN([CF_INSTALL_OPT_P],
|
||||||
|
[
|
||||||
|
: ${INSTALL:=install}
|
||||||
|
AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
|
||||||
|
rm -rf conftest*
|
||||||
|
date >conftest.in
|
||||||
|
mkdir conftest.out
|
||||||
|
sleep 3
|
||||||
|
if $INSTALL -p conftest.in conftest.out 2>/dev/null
|
||||||
|
then
|
||||||
|
if test -f conftest.out/conftest.in
|
||||||
|
then
|
||||||
|
test conftest.in -nt conftest.out/conftest.in 2>conftest.err && \
|
||||||
|
test conftest.out/conftest.in -nt conftest.in 2>conftest.err
|
||||||
|
if test -s conftest.err
|
||||||
|
then
|
||||||
|
cf_cv_install_p=no
|
||||||
|
else
|
||||||
|
cf_cv_install_p=yes
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
cf_cv_install_p=no
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
cf_cv_install_p=no
|
||||||
|
fi
|
||||||
|
rm -rf conftest*
|
||||||
|
])
|
||||||
|
])dnl
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl CF_INSTALL_OPT_S version: 2 updated: 2018/08/18 12:19:21
|
||||||
dnl ----------------
|
dnl ----------------
|
||||||
dnl By default, we should strip executables which are installed, but leave the
|
dnl By default, we should strip executables which are installed, but leave the
|
||||||
dnl ability to suppress that for unit-testing.
|
dnl ability to suppress that for unit-testing.
|
||||||
@ -1711,7 +1764,7 @@ AC_DEFUN([CF_INSTALL_OPT_S],
|
|||||||
[
|
[
|
||||||
AC_MSG_CHECKING(if you want to install stripped executables)
|
AC_MSG_CHECKING(if you want to install stripped executables)
|
||||||
CF_ARG_DISABLE(stripping,
|
CF_ARG_DISABLE(stripping,
|
||||||
[ --disable-stripping do not strip installed executables],
|
[ --disable-stripping do not strip (debug info) installed executables],
|
||||||
[with_stripping=no],
|
[with_stripping=no],
|
||||||
[with_stripping=yes])
|
[with_stripping=yes])
|
||||||
AC_MSG_RESULT($with_stripping)
|
AC_MSG_RESULT($with_stripping)
|
||||||
@ -1812,7 +1865,7 @@ ifdef([AC_FUNC_FSEEKO],[
|
|||||||
])
|
])
|
||||||
])
|
])
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_LD_RPATH_OPT version: 7 updated: 2016/02/20 18:01:19
|
dnl CF_LD_RPATH_OPT version: 8 updated: 2018/08/18 16:36:35
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl For the given system and compiler, find the compiler flags to pass to the
|
dnl For the given system and compiler, find the compiler flags to pass to the
|
||||||
dnl loader to use the "rpath" feature.
|
dnl loader to use the "rpath" feature.
|
||||||
@ -1821,49 +1874,52 @@ AC_DEFUN([CF_LD_RPATH_OPT],
|
|||||||
AC_REQUIRE([CF_CHECK_CACHE])
|
AC_REQUIRE([CF_CHECK_CACHE])
|
||||||
|
|
||||||
LD_RPATH_OPT=
|
LD_RPATH_OPT=
|
||||||
AC_MSG_CHECKING(for an rpath option)
|
if test "x$cf_cv_enable_rpath" != xno
|
||||||
case $cf_cv_system_name in
|
then
|
||||||
(irix*)
|
AC_MSG_CHECKING(for an rpath option)
|
||||||
if test "$GCC" = yes; then
|
case $cf_cv_system_name in
|
||||||
|
(irix*)
|
||||||
|
if test "$GCC" = yes; then
|
||||||
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
|
else
|
||||||
|
LD_RPATH_OPT="-rpath "
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
(linux*|gnu*|k*bsd*-gnu|freebsd*)
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
else
|
;;
|
||||||
|
(openbsd[[2-9]].*|mirbsd*)
|
||||||
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
|
;;
|
||||||
|
(dragonfly*)
|
||||||
LD_RPATH_OPT="-rpath "
|
LD_RPATH_OPT="-rpath "
|
||||||
fi
|
;;
|
||||||
;;
|
(netbsd*)
|
||||||
(linux*|gnu*|k*bsd*-gnu|freebsd*)
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
;;
|
||||||
;;
|
(osf*|mls+*)
|
||||||
(openbsd[[2-9]].*|mirbsd*)
|
LD_RPATH_OPT="-rpath "
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
;;
|
||||||
;;
|
(solaris2*)
|
||||||
(dragonfly*)
|
LD_RPATH_OPT="-R"
|
||||||
LD_RPATH_OPT="-rpath "
|
;;
|
||||||
;;
|
(*)
|
||||||
(netbsd*)
|
;;
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
esac
|
||||||
;;
|
AC_MSG_RESULT($LD_RPATH_OPT)
|
||||||
(osf*|mls+*)
|
|
||||||
LD_RPATH_OPT="-rpath "
|
|
||||||
;;
|
|
||||||
(solaris2*)
|
|
||||||
LD_RPATH_OPT="-R"
|
|
||||||
;;
|
|
||||||
(*)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
AC_MSG_RESULT($LD_RPATH_OPT)
|
|
||||||
|
|
||||||
case "x$LD_RPATH_OPT" in
|
case "x$LD_RPATH_OPT" in
|
||||||
(x-R*)
|
(x-R*)
|
||||||
AC_MSG_CHECKING(if we need a space after rpath option)
|
AC_MSG_CHECKING(if we need a space after rpath option)
|
||||||
cf_save_LIBS="$LIBS"
|
cf_save_LIBS="$LIBS"
|
||||||
CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
|
CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
|
||||||
AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
|
AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
|
||||||
LIBS="$cf_save_LIBS"
|
LIBS="$cf_save_LIBS"
|
||||||
AC_MSG_RESULT($cf_rpath_space)
|
AC_MSG_RESULT($cf_rpath_space)
|
||||||
test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
|
test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
fi
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
|
dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
|
||||||
@ -3137,7 +3193,7 @@ define([CF_REMOVE_LIB],
|
|||||||
$1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
|
$1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_SHARED_OPTS version: 92 updated: 2017/12/30 17:26:05
|
dnl CF_SHARED_OPTS version: 93 updated: 2018/08/18 16:36:35
|
||||||
dnl --------------
|
dnl --------------
|
||||||
dnl --------------
|
dnl --------------
|
||||||
dnl Attempt to determine the appropriate CC/LD options for creating a shared
|
dnl Attempt to determine the appropriate CC/LD options for creating a shared
|
||||||
@ -3165,6 +3221,7 @@ dnl Some loaders leave 'so_locations' lying around. It's nice to clean up.
|
|||||||
AC_DEFUN([CF_SHARED_OPTS],
|
AC_DEFUN([CF_SHARED_OPTS],
|
||||||
[
|
[
|
||||||
AC_REQUIRE([CF_LD_RPATH_OPT])
|
AC_REQUIRE([CF_LD_RPATH_OPT])
|
||||||
|
|
||||||
RM_SHARED_OPTS=
|
RM_SHARED_OPTS=
|
||||||
LOCAL_LDFLAGS=
|
LOCAL_LDFLAGS=
|
||||||
LOCAL_LDFLAGS2=
|
LOCAL_LDFLAGS2=
|
||||||
@ -3352,7 +3409,7 @@ CF_EOF
|
|||||||
cf_cv_rm_so_locs=yes
|
cf_cv_rm_so_locs=yes
|
||||||
;;
|
;;
|
||||||
(linux*|gnu*|k*bsd*-gnu)
|
(linux*|gnu*|k*bsd*-gnu)
|
||||||
if test "$DFT_LWR_MODEL" = "shared" ; then
|
if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then
|
||||||
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
||||||
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
||||||
fi
|
fi
|
||||||
@ -3390,7 +3447,7 @@ CF_EOF
|
|||||||
chmod +x mk_shared_lib.sh
|
chmod +x mk_shared_lib.sh
|
||||||
;;
|
;;
|
||||||
(openbsd[[2-9]].*|mirbsd*)
|
(openbsd[[2-9]].*|mirbsd*)
|
||||||
if test "$DFT_LWR_MODEL" = "shared" ; then
|
if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then
|
||||||
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
||||||
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
||||||
fi
|
fi
|
||||||
@ -3446,7 +3503,7 @@ CF_EOF
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]'
|
MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]'
|
||||||
if test "$DFT_LWR_MODEL" = "shared" ; then
|
if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then
|
||||||
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
||||||
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
||||||
fi
|
fi
|
||||||
|
|||||||
2609
Ada95/configure
vendored
2609
Ada95/configure
vendored
File diff suppressed because it is too large
Load Diff
16
INSTALL
16
INSTALL
@ -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: INSTALL,v 1.204 2018/02/10 17:46:44 tom Exp $
|
-- $Id: INSTALL,v 1.206 2018/08/18 20:41:07 tom Exp $
|
||||||
---------------------------------------------------------------------
|
---------------------------------------------------------------------
|
||||||
How to install Ncurses/Terminfo on your system
|
How to install Ncurses/Terminfo on your system
|
||||||
---------------------------------------------------------------------
|
---------------------------------------------------------------------
|
||||||
@ -440,10 +440,18 @@ SUMMARY OF CONFIGURE OPTIONS:
|
|||||||
|
|
||||||
--disable-relink
|
--disable-relink
|
||||||
If --enable-rpath is given, the generated makefiles normally will
|
If --enable-rpath is given, the generated makefiles normally will
|
||||||
rebuild the libraries during install. Use this option to simply
|
rebuild shared libraries during install. Use this option to simply
|
||||||
copy whatever the linked produced.
|
copy whatever the linker produced.
|
||||||
|
|
||||||
This option is ignored if --enable-rpath is not given.
|
Static libraries cannot simply be copied because tools use timestamps
|
||||||
|
to determine if the library's symbol table is up to date. If your
|
||||||
|
install program supports the "-p" (preserve timestamp) option, that
|
||||||
|
is used when --disable-relink is given, to avoid rebuilding the symbol
|
||||||
|
table.
|
||||||
|
|
||||||
|
Finally, some tools ignore the subsecond timestamps supported by some
|
||||||
|
filesystems. This option adds a 1-second sleep to help those tools
|
||||||
|
avoid unnecessary relinking during the install process.
|
||||||
|
|
||||||
--disable-root-environ
|
--disable-root-environ
|
||||||
Compile with environment restriction, so certain environment variables
|
Compile with environment restriction, so certain environment variables
|
||||||
|
|||||||
15
NEWS
15
NEWS
@ -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.3167 2018/08/04 16:18:03 tom Exp $
|
-- $Id: NEWS,v 1.3173 2018/08/19 00:25:22 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,19 @@ 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.
|
||||||
|
|
||||||
|
20180818
|
||||||
|
+ build-fix for PDCurses with ncurses-examples.
|
||||||
|
+ improved CF_CC_ENV_FLAGS.
|
||||||
|
+ modify configure scripts to reduce relinking/ranlib during library
|
||||||
|
install (Debian #903790):
|
||||||
|
+ use "install -p" when available, to avoid need for ranlib of
|
||||||
|
static libraries.
|
||||||
|
+ modify scripts which use "--disable-relink" to add a 1-second
|
||||||
|
sleep to work around tools which use whole-second timestamps, e.g.,
|
||||||
|
in utime() rather than the actual file system resolution.
|
||||||
|
+ add "--disable-touching" option for using "install -p" option during
|
||||||
|
the install, e.g., so that header-files have a predictable timestamp.
|
||||||
|
|
||||||
20180804
|
20180804
|
||||||
+ improve logic for clear with E3 extension, in case the terminal
|
+ improve logic for clear with E3 extension, in case the terminal
|
||||||
scrolls content onto its saved-lines before actually clearing
|
scrolls content onto its saved-lines before actually clearing
|
||||||
|
|||||||
181
aclocal.m4
vendored
181
aclocal.m4
vendored
@ -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.842 2018/07/21 23:12:32 tom Exp $
|
dnl $Id: aclocal.m4,v 1.847 2018/08/18 20:21:21 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
|
||||||
@ -727,7 +727,7 @@ AC_SUBST(BUILD_EXEEXT)
|
|||||||
AC_SUBST(BUILD_OBJEXT)
|
AC_SUBST(BUILD_OBJEXT)
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_CC_ENV_FLAGS version: 8 updated: 2017/09/23 08:50:24
|
dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
||||||
dnl into CC. This will not help with broken scripts that wrap the compiler
|
dnl into CC. This will not help with broken scripts that wrap the compiler
|
||||||
@ -744,11 +744,28 @@ AC_DEFUN([CF_CC_ENV_FLAGS],
|
|||||||
# This should have been defined by AC_PROG_CC
|
# This should have been defined by AC_PROG_CC
|
||||||
: ${CC:=cc}
|
: ${CC:=cc}
|
||||||
|
|
||||||
|
AC_MSG_CHECKING(\$CFLAGS variable)
|
||||||
|
case "x$CFLAGS" in
|
||||||
|
(*-[[IUD]]*)
|
||||||
|
AC_MSG_RESULT(broken)
|
||||||
|
AC_MSG_WARN(your environment uses the CFLAGS variable to hold CPPFLAGS options)
|
||||||
|
cf_flags="$CFLAGS"
|
||||||
|
CFLAGS=
|
||||||
|
for cf_arg in $cf_flags
|
||||||
|
do
|
||||||
|
CF_ADD_CFLAGS($cf_arg)
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
(*)
|
||||||
|
AC_MSG_RESULT(ok)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
AC_MSG_CHECKING(\$CC variable)
|
AC_MSG_CHECKING(\$CC variable)
|
||||||
case "$CC" in
|
case "$CC" in
|
||||||
(*[[\ \ ]]-*)
|
(*[[\ \ ]]-*)
|
||||||
AC_MSG_RESULT(broken)
|
AC_MSG_RESULT(broken)
|
||||||
AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
|
AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options)
|
||||||
# humor him...
|
# humor him...
|
||||||
cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
|
cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
|
||||||
cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'`
|
cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'`
|
||||||
@ -1410,11 +1427,6 @@ fi
|
|||||||
AC_SUBST($1)
|
AC_SUBST($1)
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
|
|
||||||
dnl ----------
|
|
||||||
dnl "dirname" is not portable, so we fake it with a shell script.
|
|
||||||
AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
|
|
||||||
dnl ---------------------------------------------------------------------------
|
|
||||||
dnl CF_DIRS_TO_MAKE version: 3 updated: 2002/02/23 20:38:31
|
dnl CF_DIRS_TO_MAKE version: 3 updated: 2002/02/23 20:38:31
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
AC_DEFUN([CF_DIRS_TO_MAKE],
|
AC_DEFUN([CF_DIRS_TO_MAKE],
|
||||||
@ -3214,12 +3226,13 @@ CPPFLAGS="-I. $CPPFLAGS"
|
|||||||
AC_SUBST(CPPFLAGS)
|
AC_SUBST(CPPFLAGS)
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_INSTALL_OPTS version: 1 updated: 2014/07/21 18:19:51
|
dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl prompt for/fill-in useful install-program options
|
dnl prompt for/fill-in useful install-program options
|
||||||
AC_DEFUN([CF_INSTALL_OPTS],
|
AC_DEFUN([CF_INSTALL_OPTS],
|
||||||
[
|
[
|
||||||
CF_INSTALL_OPT_S
|
CF_INSTALL_OPT_S
|
||||||
|
CF_INSTALL_OPT_P
|
||||||
CF_INSTALL_OPT_O
|
CF_INSTALL_OPT_O
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
@ -3250,7 +3263,42 @@ fi
|
|||||||
AC_SUBST(INSTALL_OPT_O)
|
AC_SUBST(INSTALL_OPT_O)
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_INSTALL_OPT_S version: 1 updated: 2014/07/21 18:19:51
|
dnl CF_INSTALL_OPT_P version: 1 updated: 2018/08/18 12:19:21
|
||||||
|
dnl ----------------
|
||||||
|
dnl Some install-programs accept a "-p" option to preserve file modification
|
||||||
|
dnl timestamps. That can be useful as an install option, as well as a way to
|
||||||
|
dnl avoid the need for ranlib after copying a static archive.
|
||||||
|
AC_DEFUN([CF_INSTALL_OPT_P],
|
||||||
|
[
|
||||||
|
: ${INSTALL:=install}
|
||||||
|
AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
|
||||||
|
rm -rf conftest*
|
||||||
|
date >conftest.in
|
||||||
|
mkdir conftest.out
|
||||||
|
sleep 3
|
||||||
|
if $INSTALL -p conftest.in conftest.out 2>/dev/null
|
||||||
|
then
|
||||||
|
if test -f conftest.out/conftest.in
|
||||||
|
then
|
||||||
|
test conftest.in -nt conftest.out/conftest.in 2>conftest.err && \
|
||||||
|
test conftest.out/conftest.in -nt conftest.in 2>conftest.err
|
||||||
|
if test -s conftest.err
|
||||||
|
then
|
||||||
|
cf_cv_install_p=no
|
||||||
|
else
|
||||||
|
cf_cv_install_p=yes
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
cf_cv_install_p=no
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
cf_cv_install_p=no
|
||||||
|
fi
|
||||||
|
rm -rf conftest*
|
||||||
|
])
|
||||||
|
])dnl
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl CF_INSTALL_OPT_S version: 2 updated: 2018/08/18 12:19:21
|
||||||
dnl ----------------
|
dnl ----------------
|
||||||
dnl By default, we should strip executables which are installed, but leave the
|
dnl By default, we should strip executables which are installed, but leave the
|
||||||
dnl ability to suppress that for unit-testing.
|
dnl ability to suppress that for unit-testing.
|
||||||
@ -3258,7 +3306,7 @@ AC_DEFUN([CF_INSTALL_OPT_S],
|
|||||||
[
|
[
|
||||||
AC_MSG_CHECKING(if you want to install stripped executables)
|
AC_MSG_CHECKING(if you want to install stripped executables)
|
||||||
CF_ARG_DISABLE(stripping,
|
CF_ARG_DISABLE(stripping,
|
||||||
[ --disable-stripping do not strip installed executables],
|
[ --disable-stripping do not strip (debug info) installed executables],
|
||||||
[with_stripping=no],
|
[with_stripping=no],
|
||||||
[with_stripping=yes])
|
[with_stripping=yes])
|
||||||
AC_MSG_RESULT($with_stripping)
|
AC_MSG_RESULT($with_stripping)
|
||||||
@ -3485,49 +3533,52 @@ AC_DEFUN([CF_LD_RPATH_OPT],
|
|||||||
AC_REQUIRE([CF_CHECK_CACHE])
|
AC_REQUIRE([CF_CHECK_CACHE])
|
||||||
|
|
||||||
LD_RPATH_OPT=
|
LD_RPATH_OPT=
|
||||||
AC_MSG_CHECKING(for an rpath option)
|
if test "x$cf_cv_enable_rpath" != xno
|
||||||
case $cf_cv_system_name in
|
then
|
||||||
(irix*)
|
AC_MSG_CHECKING(for an rpath option)
|
||||||
if test "$GCC" = yes; then
|
case $cf_cv_system_name in
|
||||||
|
(irix*)
|
||||||
|
if test "$GCC" = yes; then
|
||||||
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
|
else
|
||||||
|
LD_RPATH_OPT="-rpath "
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
(linux*|gnu*|k*bsd*-gnu|freebsd*)
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
else
|
;;
|
||||||
|
(openbsd[[2-9]].*|mirbsd*)
|
||||||
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
|
;;
|
||||||
|
(dragonfly*)
|
||||||
LD_RPATH_OPT="-rpath "
|
LD_RPATH_OPT="-rpath "
|
||||||
fi
|
;;
|
||||||
;;
|
(netbsd*)
|
||||||
(linux*|gnu*|k*bsd*-gnu|freebsd*)
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
;;
|
||||||
;;
|
(osf*|mls+*)
|
||||||
(openbsd[[2-9]].*|mirbsd*)
|
LD_RPATH_OPT="-rpath "
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
;;
|
||||||
;;
|
(solaris2*)
|
||||||
(dragonfly*)
|
LD_RPATH_OPT="-R"
|
||||||
LD_RPATH_OPT="-rpath "
|
;;
|
||||||
;;
|
(*)
|
||||||
(netbsd*)
|
;;
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
esac
|
||||||
;;
|
AC_MSG_RESULT($LD_RPATH_OPT)
|
||||||
(osf*|mls+*)
|
|
||||||
LD_RPATH_OPT="-rpath "
|
|
||||||
;;
|
|
||||||
(solaris2*)
|
|
||||||
LD_RPATH_OPT="-R"
|
|
||||||
;;
|
|
||||||
(*)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
AC_MSG_RESULT($LD_RPATH_OPT)
|
|
||||||
|
|
||||||
case "x$LD_RPATH_OPT" in
|
case "x$LD_RPATH_OPT" in
|
||||||
(x-R*)
|
(x-R*)
|
||||||
AC_MSG_CHECKING(if we need a space after rpath option)
|
AC_MSG_CHECKING(if we need a space after rpath option)
|
||||||
cf_save_LIBS="$LIBS"
|
cf_save_LIBS="$LIBS"
|
||||||
CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
|
CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
|
||||||
AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
|
AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
|
||||||
LIBS="$cf_save_LIBS"
|
LIBS="$cf_save_LIBS"
|
||||||
AC_MSG_RESULT($cf_rpath_space)
|
AC_MSG_RESULT($cf_rpath_space)
|
||||||
test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
|
test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
fi
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
|
dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
|
||||||
@ -3592,7 +3643,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
|
|||||||
AC_SUBST(LIB_PREFIX)
|
AC_SUBST(LIB_PREFIX)
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_LIB_RULES version: 87 updated: 2017/07/26 17:08:35
|
dnl CF_LIB_RULES version: 88 updated: 2018/08/18 12:19:21
|
||||||
dnl ------------
|
dnl ------------
|
||||||
dnl Append definitions and rules for the given models to the subdirectory
|
dnl Append definitions and rules for the given models to the subdirectory
|
||||||
dnl Makefiles, and the recursion rule for the top-level Makefile. If the
|
dnl Makefiles, and the recursion rule for the top-level Makefile. If the
|
||||||
@ -3928,6 +3979,7 @@ CF_EOF
|
|||||||
ShlibVer=$cf_cv_shlib_version \
|
ShlibVer=$cf_cv_shlib_version \
|
||||||
ShlibVerInfix=$cf_cv_shlib_version_infix \
|
ShlibVerInfix=$cf_cv_shlib_version_infix \
|
||||||
ReLink=${cf_cv_do_relink:-no} \
|
ReLink=${cf_cv_do_relink:-no} \
|
||||||
|
ReRanlib=${cf_cv_do_reranlib:-yes} \
|
||||||
DoLinks=$cf_cv_do_symlinks \
|
DoLinks=$cf_cv_do_symlinks \
|
||||||
rmSoLocs=$cf_cv_rm_so_locs \
|
rmSoLocs=$cf_cv_rm_so_locs \
|
||||||
ldconfig="$LDCONFIG" \
|
ldconfig="$LDCONFIG" \
|
||||||
@ -5658,24 +5710,6 @@ AC_SUBST(cf_ada_config_Ada)
|
|||||||
AC_SUBST(cf_ada_config_C)
|
AC_SUBST(cf_ada_config_C)
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_PROG_INSTALL version: 7 updated: 2015/04/18 08:56:57
|
|
||||||
dnl ---------------
|
|
||||||
dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the
|
|
||||||
dnl misc/tabset install won't work properly. Usually this happens only when
|
|
||||||
dnl using the fallback mkinstalldirs script
|
|
||||||
AC_DEFUN([CF_PROG_INSTALL],
|
|
||||||
[AC_PROG_INSTALL
|
|
||||||
case $INSTALL in
|
|
||||||
(/*)
|
|
||||||
;;
|
|
||||||
(*)
|
|
||||||
CF_DIRNAME(cf_dir,$INSTALL)
|
|
||||||
test -z "$cf_dir" && cf_dir=.
|
|
||||||
INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'`
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
])dnl
|
|
||||||
dnl ---------------------------------------------------------------------------
|
|
||||||
dnl CF_PROG_LDCONFIG version: 5 updated: 2015/04/18 08:56:57
|
dnl CF_PROG_LDCONFIG version: 5 updated: 2015/04/18 08:56:57
|
||||||
dnl ----------------
|
dnl ----------------
|
||||||
dnl Check for ldconfig, needed to fixup shared libraries that would be built
|
dnl Check for ldconfig, needed to fixup shared libraries that would be built
|
||||||
@ -5981,6 +6015,7 @@ dnl Some loaders leave 'so_locations' lying around. It's nice to clean up.
|
|||||||
AC_DEFUN([CF_SHARED_OPTS],
|
AC_DEFUN([CF_SHARED_OPTS],
|
||||||
[
|
[
|
||||||
AC_REQUIRE([CF_LD_RPATH_OPT])
|
AC_REQUIRE([CF_LD_RPATH_OPT])
|
||||||
|
|
||||||
RM_SHARED_OPTS=
|
RM_SHARED_OPTS=
|
||||||
LOCAL_LDFLAGS=
|
LOCAL_LDFLAGS=
|
||||||
LOCAL_LDFLAGS2=
|
LOCAL_LDFLAGS2=
|
||||||
@ -6168,7 +6203,7 @@ CF_EOF
|
|||||||
cf_cv_rm_so_locs=yes
|
cf_cv_rm_so_locs=yes
|
||||||
;;
|
;;
|
||||||
(linux*|gnu*|k*bsd*-gnu)
|
(linux*|gnu*|k*bsd*-gnu)
|
||||||
if test "$DFT_LWR_MODEL" = "shared" ; then
|
if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then
|
||||||
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
||||||
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
||||||
fi
|
fi
|
||||||
@ -6206,7 +6241,7 @@ CF_EOF
|
|||||||
chmod +x mk_shared_lib.sh
|
chmod +x mk_shared_lib.sh
|
||||||
;;
|
;;
|
||||||
(openbsd[[2-9]].*|mirbsd*)
|
(openbsd[[2-9]].*|mirbsd*)
|
||||||
if test "$DFT_LWR_MODEL" = "shared" ; then
|
if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then
|
||||||
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
||||||
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
||||||
fi
|
fi
|
||||||
@ -6262,7 +6297,7 @@ CF_EOF
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]'
|
MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]'
|
||||||
if test "$DFT_LWR_MODEL" = "shared" ; then
|
if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then
|
||||||
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
||||||
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# $Id: Makefile.in,v 1.114 2016/05/21 23:26:12 tom Exp $
|
# $Id: Makefile.in,v 1.117 2018/08/12 00:06:34 tom Exp $
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. #
|
# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. #
|
||||||
# #
|
# #
|
||||||
# Permission is hereby granted, free of charge, to any person obtaining a #
|
# Permission is hereby granted, free of charge, to any person obtaining a #
|
||||||
# copy of this software and associated documentation files (the "Software"), #
|
# copy of this software and associated documentation files (the "Software"), #
|
||||||
@ -67,9 +67,10 @@ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
|
|||||||
LIBTOOL_VERSION = @LIBTOOL_VERSION@
|
LIBTOOL_VERSION = @LIBTOOL_VERSION@
|
||||||
LT_UNDEF = @LT_UNDEF@
|
LT_UNDEF = @LT_UNDEF@
|
||||||
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
|
INSTALL_LIB = $(INSTALL) @INSTALL_LIB@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
INSTALL_OPT_P = @INSTALL_OPT_P@
|
||||||
|
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
ARFLAGS = @ARFLAGS@
|
ARFLAGS = @ARFLAGS@
|
||||||
|
|||||||
24
configure.in
24
configure.in
@ -28,14 +28,14 @@ dnl***************************************************************************
|
|||||||
dnl
|
dnl
|
||||||
dnl Author: Thomas E. Dickey 1995-on
|
dnl Author: Thomas E. Dickey 1995-on
|
||||||
dnl
|
dnl
|
||||||
dnl $Id: configure.in,v 1.660 2018/07/14 19:04:04 tom Exp $
|
dnl $Id: configure.in,v 1.664 2018/08/18 20:27:17 tom Exp $
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
dnl
|
dnl
|
||||||
dnl See https://invisible-island.net/autoconf/ for additional information.
|
dnl See https://invisible-island.net/autoconf/ for additional information.
|
||||||
dnl
|
dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
AC_PREREQ(2.52.20170501)
|
AC_PREREQ(2.52.20170501)
|
||||||
AC_REVISION($Revision: 1.660 $)
|
AC_REVISION($Revision: 1.664 $)
|
||||||
AC_INIT(ncurses/base/lib_initscr.c)
|
AC_INIT(ncurses/base/lib_initscr.c)
|
||||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||||
|
|
||||||
@ -217,7 +217,7 @@ AC_ARG_PROGRAM
|
|||||||
|
|
||||||
CF_PROG_AWK
|
CF_PROG_AWK
|
||||||
CF_PROG_EGREP
|
CF_PROG_EGREP
|
||||||
CF_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
CF_PROG_LINT
|
CF_PROG_LINT
|
||||||
CF_PROG_LN_S
|
CF_PROG_LN_S
|
||||||
|
|
||||||
@ -534,7 +534,7 @@ CF_ARG_DISABLE(lib-suffixes,
|
|||||||
AC_MSG_RESULT($disable_lib_suffixes)
|
AC_MSG_RESULT($disable_lib_suffixes)
|
||||||
|
|
||||||
### If we're building with rpath, try to link non-standard libs that way too.
|
### If we're building with rpath, try to link non-standard libs that way too.
|
||||||
if test "$DFT_LWR_MODEL" = "shared"; then
|
if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
|
||||||
CF_DISABLE_RPATH_HACK
|
CF_DISABLE_RPATH_HACK
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -1481,6 +1481,21 @@ AC_SUBST(ECHO_LINK)
|
|||||||
# --disable-stripping is used for debugging
|
# --disable-stripping is used for debugging
|
||||||
CF_INSTALL_OPTS
|
CF_INSTALL_OPTS
|
||||||
|
|
||||||
|
# If we're avoiding relinking of shared libraries during install, that is to
|
||||||
|
# avoid modifying the build-tree. For the same reason, avoid doing ranlib if
|
||||||
|
# the install program has "-p" (for preserving timestamps).
|
||||||
|
cf_cv_do_reranlib=yes
|
||||||
|
if test "x$cf_cv_install_p" = xyes
|
||||||
|
then
|
||||||
|
if test "x$cf_cv_do_relink" != xyes
|
||||||
|
then
|
||||||
|
cf_cv_do_reranlib=no
|
||||||
|
INSTALL_OPT_P="-p"
|
||||||
|
INSTALL_LIB="$INSTALL_LIB $INSTALL_OPT_P"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
AC_SUBST(INSTALL_OPT_P)
|
||||||
|
|
||||||
### use option --enable-warnings to turn on all gcc warnings
|
### use option --enable-warnings to turn on all gcc warnings
|
||||||
AC_MSG_CHECKING(if you want to see compiler warnings)
|
AC_MSG_CHECKING(if you want to see compiler warnings)
|
||||||
AC_ARG_ENABLE(warnings,
|
AC_ARG_ENABLE(warnings,
|
||||||
@ -2396,6 +2411,7 @@ WITH_OVERWRITE="$with_overwrite"
|
|||||||
cf_LIST_MODELS="$cf_list_models"
|
cf_LIST_MODELS="$cf_list_models"
|
||||||
cf_cv_abi_version="$cf_cv_abi_version"
|
cf_cv_abi_version="$cf_cv_abi_version"
|
||||||
cf_cv_do_relink="$cf_cv_do_relink"
|
cf_cv_do_relink="$cf_cv_do_relink"
|
||||||
|
cf_cv_do_reranlib="$cf_cv_do_reranlib"
|
||||||
cf_cv_do_symlinks="$cf_cv_do_symlinks"
|
cf_cv_do_symlinks="$cf_cv_do_symlinks"
|
||||||
cf_cv_enable_lp64="$cf_cv_enable_lp64"
|
cf_cv_enable_lp64="$cf_cv_enable_lp64"
|
||||||
cf_cv_enable_opaque="$cf_cv_enable_opaque"
|
cf_cv_enable_opaque="$cf_cv_enable_opaque"
|
||||||
|
|||||||
4
dist.mk
4
dist.mk
@ -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.1235 2018/08/04 13:39:57 tom Exp $
|
# $Id: dist.mk,v 1.1237 2018/08/18 16:14:17 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 = 6
|
NCURSES_MAJOR = 6
|
||||||
NCURSES_MINOR = 1
|
NCURSES_MINOR = 1
|
||||||
NCURSES_PATCH = 20180804
|
NCURSES_PATCH = 20180818
|
||||||
|
|
||||||
# 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)
|
||||||
|
|||||||
22
mk-1st.awk
22
mk-1st.awk
@ -1,6 +1,6 @@
|
|||||||
# $Id: mk-1st.awk,v 1.101 2017/12/02 23:29:29 tom Exp $
|
# $Id: mk-1st.awk,v 1.105 2018/08/18 16:03:51 tom Exp $
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. #
|
# Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. #
|
||||||
# #
|
# #
|
||||||
# Permission is hereby granted, free of charge, to any person obtaining a #
|
# Permission is hereby granted, free of charge, to any person obtaining a #
|
||||||
# copy of this software and associated documentation files (the "Software"), #
|
# copy of this software and associated documentation files (the "Software"), #
|
||||||
@ -46,6 +46,7 @@
|
|||||||
# TermlibRoot ("tinfo" or other root for libterm.so)
|
# TermlibRoot ("tinfo" or other root for libterm.so)
|
||||||
# TermlibSuffix (".so" or other suffix for libterm.so)
|
# TermlibSuffix (".so" or other suffix for libterm.so)
|
||||||
# ReLink ("yes", or "no", flag to rebuild shared libs on install)
|
# ReLink ("yes", or "no", flag to rebuild shared libs on install)
|
||||||
|
# ReRanlib ("yes", or "no", flag to rerun ranlib for installing static)
|
||||||
# DoLinks ("yes", "reverse" or "no", flag to add symbolic links)
|
# DoLinks ("yes", "reverse" or "no", flag to add symbolic links)
|
||||||
# rmSoLocs ("yes" or "no", flag to add extra clean target)
|
# rmSoLocs ("yes" or "no", flag to add extra clean target)
|
||||||
# ldconfig (path for this tool, if used)
|
# ldconfig (path for this tool, if used)
|
||||||
@ -205,7 +206,6 @@ function termlib_end_of() {
|
|||||||
function shlib_build(directory) {
|
function shlib_build(directory) {
|
||||||
dst_libs = sprintf("%s/%s", directory, end_name);
|
dst_libs = sprintf("%s/%s", directory, end_name);
|
||||||
printf "%s : \\\n", dst_libs
|
printf "%s : \\\n", dst_libs
|
||||||
printf "\t\t%s \\\n", directory
|
|
||||||
if (subset == "ticlib" && driver == "yes" ) {
|
if (subset == "ticlib" && driver == "yes" ) {
|
||||||
base = name;
|
base = name;
|
||||||
sub(/^tic/, "ncurses", base); # workaround for "w"
|
sub(/^tic/, "ncurses", base); # workaround for "w"
|
||||||
@ -222,6 +222,10 @@ function shlib_build(directory) {
|
|||||||
}
|
}
|
||||||
printf "\t\t$(RESULTING_SYMS) $(%s_OBJS)\n", OBJS
|
printf "\t\t$(RESULTING_SYMS) $(%s_OBJS)\n", OBJS
|
||||||
printf "\t@echo linking $@\n"
|
printf "\t@echo linking $@\n"
|
||||||
|
printf "\t@mkdir -p %s\n", directory
|
||||||
|
if ( ReLink != "yes" ) {
|
||||||
|
printf "\t@sleep 1\n"
|
||||||
|
}
|
||||||
if ( is_ticlib() ) {
|
if ( is_ticlib() ) {
|
||||||
make_shlib(OBJS, "TICS_LIST")
|
make_shlib(OBJS, "TICS_LIST")
|
||||||
} else if ( is_termlib() ) {
|
} else if ( is_termlib() ) {
|
||||||
@ -290,6 +294,7 @@ BEGIN {
|
|||||||
printf "# TermlibRoot: %s\n", TermlibRoot
|
printf "# TermlibRoot: %s\n", TermlibRoot
|
||||||
printf "# TermlibSuffix: %s\n", TermlibSuffix
|
printf "# TermlibSuffix: %s\n", TermlibSuffix
|
||||||
printf "# ReLink: %s\n", ReLink
|
printf "# ReLink: %s\n", ReLink
|
||||||
|
printf "# ReRanlib: %s\n", ReRanlib
|
||||||
printf "# DoLinks: %s\n", DoLinks
|
printf "# DoLinks: %s\n", DoLinks
|
||||||
printf "# rmSoLocs: %s\n", rmSoLocs
|
printf "# rmSoLocs: %s\n", rmSoLocs
|
||||||
printf "# ldconfig: %s\n", ldconfig
|
printf "# ldconfig: %s\n", ldconfig
|
||||||
@ -467,6 +472,12 @@ END {
|
|||||||
{
|
{
|
||||||
end_name = lib_name;
|
end_name = lib_name;
|
||||||
printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
|
printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
|
||||||
|
# workaround: binutils' ranlib tries to be clever with
|
||||||
|
# timestamps, by pretending its update took no time, confusing
|
||||||
|
# the make utility.
|
||||||
|
if ( ReLink != "yes" ) {
|
||||||
|
printf "\t@sleep 1\n"
|
||||||
|
}
|
||||||
printf "\t$(%sAR) $(%sARFLAGS) $@ $?\n", TOOL_PREFIX, TOOL_PREFIX;
|
printf "\t$(%sAR) $(%sARFLAGS) $@ $?\n", TOOL_PREFIX, TOOL_PREFIX;
|
||||||
printf "\t$(RANLIB) $@\n"
|
printf "\t$(RANLIB) $@\n"
|
||||||
if ( host == "vxworks" )
|
if ( host == "vxworks" )
|
||||||
@ -487,7 +498,10 @@ END {
|
|||||||
symlink("libncurses.a", "libcurses.a")
|
symlink("libncurses.a", "libcurses.a")
|
||||||
printf ")\n"
|
printf ")\n"
|
||||||
}
|
}
|
||||||
printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
|
if ( ReRanlib == "yes" )
|
||||||
|
{
|
||||||
|
printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
|
||||||
|
}
|
||||||
if ( host == "vxworks" )
|
if ( host == "vxworks" )
|
||||||
{
|
{
|
||||||
printf "\t@echo installing ../lib/lib%s$o as $(DESTDIR)$(libdir)/lib%s$o\n", name, name
|
printf "\t@echo installing ../lib/lib%s$o as $(DESTDIR)$(libdir)/lib%s$o\n", name, name
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
ncurses6 (6.1+20180804) unstable; urgency=low
|
ncurses6 (6.1+20180818) unstable; urgency=low
|
||||||
|
|
||||||
* latest weekly patch
|
* latest weekly patch
|
||||||
|
|
||||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 04 Aug 2018 09:39:57 -0400
|
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 18 Aug 2018 12:14:17 -0400
|
||||||
|
|
||||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
ncurses6 (6.1+20180804) unstable; urgency=low
|
ncurses6 (6.1+20180818) unstable; urgency=low
|
||||||
|
|
||||||
* latest weekly patch
|
* latest weekly patch
|
||||||
|
|
||||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 04 Aug 2018 09:39:57 -0400
|
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 18 Aug 2018 12:14:17 -0400
|
||||||
|
|
||||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
ncurses6 (6.1+20180804) unstable; urgency=low
|
ncurses6 (6.1+20180818) unstable; urgency=low
|
||||||
|
|
||||||
* latest weekly patch
|
* latest weekly patch
|
||||||
|
|
||||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 04 Aug 2018 09:39:57 -0400
|
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 18 Aug 2018 12:14:17 -0400
|
||||||
|
|
||||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
# This is intentional.
|
# This is intentional.
|
||||||
ncurses6: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
|
ncurses6: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
|
||||||
ncurses6: binary-or-shlib-defines-rpath usr/bin/ncurses6 /usr/lib
|
|
||||||
|
|
||||||
# This works around a bug in Debian's build-scripts.
|
# This works around a bug in Debian's build-scripts.
|
||||||
ncurses6: latest-debian-changelog-entry-changed-to-native
|
ncurses6: latest-debian-changelog-entry-changed-to-native
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
# This is intentional.
|
# This is intentional.
|
||||||
ncursest6: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
|
ncursest6: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
|
||||||
ncursest6: binary-or-shlib-defines-rpath usr/bin/ncursest6 /usr/lib
|
|
||||||
|
|
||||||
# This works around a bug in Debian's build-scripts.
|
# This works around a bug in Debian's build-scripts.
|
||||||
ncursest6: latest-debian-changelog-entry-changed-to-native
|
ncursest6: latest-debian-changelog-entry-changed-to-native
|
||||||
|
|||||||
@ -61,6 +61,7 @@ configure = \
|
|||||||
--disable-leaks \
|
--disable-leaks \
|
||||||
--disable-macros \
|
--disable-macros \
|
||||||
--disable-overwrite \
|
--disable-overwrite \
|
||||||
|
--disable-relink \
|
||||||
--disable-termcap \
|
--disable-termcap \
|
||||||
--enable-hard-tabs \
|
--enable-hard-tabs \
|
||||||
--enable-opaque-curses \
|
--enable-opaque-curses \
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
; $Id: mingw-ncurses.nsi,v 1.282 2018/08/04 13:39:57 tom Exp $
|
; $Id: mingw-ncurses.nsi,v 1.284 2018/08/18 16:14:17 tom Exp $
|
||||||
|
|
||||||
; TODO add examples
|
; TODO add examples
|
||||||
; TODO bump ABI to 6
|
; TODO bump ABI to 6
|
||||||
@ -10,7 +10,7 @@
|
|||||||
!define VERSION_MAJOR "6"
|
!define VERSION_MAJOR "6"
|
||||||
!define VERSION_MINOR "1"
|
!define VERSION_MINOR "1"
|
||||||
!define VERSION_YYYY "2018"
|
!define VERSION_YYYY "2018"
|
||||||
!define VERSION_MMDD "0804"
|
!define VERSION_MMDD "0818"
|
||||||
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
||||||
|
|
||||||
!define MY_ABI "5"
|
!define MY_ABI "5"
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
Summary: shared libraries for terminal handling
|
Summary: shared libraries for terminal handling
|
||||||
Name: mingw32-ncurses6
|
Name: mingw32-ncurses6
|
||||||
Version: 6.1
|
Version: 6.1
|
||||||
Release: 20180804
|
Release: 20180818
|
||||||
License: X11
|
License: X11
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Source: ncurses-%{version}-%{release}.tgz
|
Source: ncurses-%{version}-%{release}.tgz
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
Summary: shared libraries for terminal handling
|
Summary: shared libraries for terminal handling
|
||||||
Name: ncurses6
|
Name: ncurses6
|
||||||
Version: 6.1
|
Version: 6.1
|
||||||
Release: 20180804
|
Release: 20180818
|
||||||
License: X11
|
License: X11
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Source: ncurses-%{version}-%{release}.tgz
|
Source: ncurses-%{version}-%{release}.tgz
|
||||||
|
|||||||
150
test/aclocal.m4
vendored
150
test/aclocal.m4
vendored
@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written *
|
|||||||
dnl authorization. *
|
dnl authorization. *
|
||||||
dnl***************************************************************************
|
dnl***************************************************************************
|
||||||
dnl
|
dnl
|
||||||
dnl $Id: aclocal.m4,v 1.158 2018/06/21 00:23:13 tom Exp $
|
dnl $Id: aclocal.m4,v 1.160 2018/08/18 20:39:24 tom Exp $
|
||||||
dnl
|
dnl
|
||||||
dnl Author: Thomas E. Dickey
|
dnl Author: Thomas E. Dickey
|
||||||
dnl
|
dnl
|
||||||
@ -386,7 +386,7 @@ ifelse([$3],,[ :]dnl
|
|||||||
])dnl
|
])dnl
|
||||||
])])dnl
|
])])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_CC_ENV_FLAGS version: 8 updated: 2017/09/23 08:50:24
|
dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
||||||
dnl into CC. This will not help with broken scripts that wrap the compiler
|
dnl into CC. This will not help with broken scripts that wrap the compiler
|
||||||
@ -403,11 +403,28 @@ AC_DEFUN([CF_CC_ENV_FLAGS],
|
|||||||
# This should have been defined by AC_PROG_CC
|
# This should have been defined by AC_PROG_CC
|
||||||
: ${CC:=cc}
|
: ${CC:=cc}
|
||||||
|
|
||||||
|
AC_MSG_CHECKING(\$CFLAGS variable)
|
||||||
|
case "x$CFLAGS" in
|
||||||
|
(*-[[IUD]]*)
|
||||||
|
AC_MSG_RESULT(broken)
|
||||||
|
AC_MSG_WARN(your environment uses the CFLAGS variable to hold CPPFLAGS options)
|
||||||
|
cf_flags="$CFLAGS"
|
||||||
|
CFLAGS=
|
||||||
|
for cf_arg in $cf_flags
|
||||||
|
do
|
||||||
|
CF_ADD_CFLAGS($cf_arg)
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
(*)
|
||||||
|
AC_MSG_RESULT(ok)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
AC_MSG_CHECKING(\$CC variable)
|
AC_MSG_CHECKING(\$CC variable)
|
||||||
case "$CC" in
|
case "$CC" in
|
||||||
(*[[\ \ ]]-*)
|
(*[[\ \ ]]-*)
|
||||||
AC_MSG_RESULT(broken)
|
AC_MSG_RESULT(broken)
|
||||||
AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
|
AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options)
|
||||||
# humor him...
|
# humor him...
|
||||||
cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
|
cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
|
||||||
cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'`
|
cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'`
|
||||||
@ -1917,12 +1934,13 @@ AC_DEFUN([CF_INHERIT_SCRIPT],
|
|||||||
test -f $1 || ( test -f ../$1 && cp ../$1 ./ )
|
test -f $1 || ( test -f ../$1 && cp ../$1 ./ )
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_INSTALL_OPTS version: 1 updated: 2014/07/21 18:19:51
|
dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl prompt for/fill-in useful install-program options
|
dnl prompt for/fill-in useful install-program options
|
||||||
AC_DEFUN([CF_INSTALL_OPTS],
|
AC_DEFUN([CF_INSTALL_OPTS],
|
||||||
[
|
[
|
||||||
CF_INSTALL_OPT_S
|
CF_INSTALL_OPT_S
|
||||||
|
CF_INSTALL_OPT_P
|
||||||
CF_INSTALL_OPT_O
|
CF_INSTALL_OPT_O
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
@ -1953,7 +1971,42 @@ fi
|
|||||||
AC_SUBST(INSTALL_OPT_O)
|
AC_SUBST(INSTALL_OPT_O)
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_INSTALL_OPT_S version: 1 updated: 2014/07/21 18:19:51
|
dnl CF_INSTALL_OPT_P version: 1 updated: 2018/08/18 12:19:21
|
||||||
|
dnl ----------------
|
||||||
|
dnl Some install-programs accept a "-p" option to preserve file modification
|
||||||
|
dnl timestamps. That can be useful as an install option, as well as a way to
|
||||||
|
dnl avoid the need for ranlib after copying a static archive.
|
||||||
|
AC_DEFUN([CF_INSTALL_OPT_P],
|
||||||
|
[
|
||||||
|
: ${INSTALL:=install}
|
||||||
|
AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
|
||||||
|
rm -rf conftest*
|
||||||
|
date >conftest.in
|
||||||
|
mkdir conftest.out
|
||||||
|
sleep 3
|
||||||
|
if $INSTALL -p conftest.in conftest.out 2>/dev/null
|
||||||
|
then
|
||||||
|
if test -f conftest.out/conftest.in
|
||||||
|
then
|
||||||
|
test conftest.in -nt conftest.out/conftest.in 2>conftest.err && \
|
||||||
|
test conftest.out/conftest.in -nt conftest.in 2>conftest.err
|
||||||
|
if test -s conftest.err
|
||||||
|
then
|
||||||
|
cf_cv_install_p=no
|
||||||
|
else
|
||||||
|
cf_cv_install_p=yes
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
cf_cv_install_p=no
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
cf_cv_install_p=no
|
||||||
|
fi
|
||||||
|
rm -rf conftest*
|
||||||
|
])
|
||||||
|
])dnl
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl CF_INSTALL_OPT_S version: 2 updated: 2018/08/18 12:19:21
|
||||||
dnl ----------------
|
dnl ----------------
|
||||||
dnl By default, we should strip executables which are installed, but leave the
|
dnl By default, we should strip executables which are installed, but leave the
|
||||||
dnl ability to suppress that for unit-testing.
|
dnl ability to suppress that for unit-testing.
|
||||||
@ -1961,7 +2014,7 @@ AC_DEFUN([CF_INSTALL_OPT_S],
|
|||||||
[
|
[
|
||||||
AC_MSG_CHECKING(if you want to install stripped executables)
|
AC_MSG_CHECKING(if you want to install stripped executables)
|
||||||
CF_ARG_DISABLE(stripping,
|
CF_ARG_DISABLE(stripping,
|
||||||
[ --disable-stripping do not strip installed executables],
|
[ --disable-stripping do not strip (debug info) installed executables],
|
||||||
[with_stripping=no],
|
[with_stripping=no],
|
||||||
[with_stripping=yes])
|
[with_stripping=yes])
|
||||||
AC_MSG_RESULT($with_stripping)
|
AC_MSG_RESULT($with_stripping)
|
||||||
@ -2013,7 +2066,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
|
|||||||
fi
|
fi
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_LD_RPATH_OPT version: 7 updated: 2016/02/20 18:01:19
|
dnl CF_LD_RPATH_OPT version: 8 updated: 2018/08/18 16:36:35
|
||||||
dnl ---------------
|
dnl ---------------
|
||||||
dnl For the given system and compiler, find the compiler flags to pass to the
|
dnl For the given system and compiler, find the compiler flags to pass to the
|
||||||
dnl loader to use the "rpath" feature.
|
dnl loader to use the "rpath" feature.
|
||||||
@ -2022,49 +2075,52 @@ AC_DEFUN([CF_LD_RPATH_OPT],
|
|||||||
AC_REQUIRE([CF_CHECK_CACHE])
|
AC_REQUIRE([CF_CHECK_CACHE])
|
||||||
|
|
||||||
LD_RPATH_OPT=
|
LD_RPATH_OPT=
|
||||||
AC_MSG_CHECKING(for an rpath option)
|
if test "x$cf_cv_enable_rpath" != xno
|
||||||
case $cf_cv_system_name in
|
then
|
||||||
(irix*)
|
AC_MSG_CHECKING(for an rpath option)
|
||||||
if test "$GCC" = yes; then
|
case $cf_cv_system_name in
|
||||||
|
(irix*)
|
||||||
|
if test "$GCC" = yes; then
|
||||||
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
|
else
|
||||||
|
LD_RPATH_OPT="-rpath "
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
(linux*|gnu*|k*bsd*-gnu|freebsd*)
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
else
|
;;
|
||||||
|
(openbsd[[2-9]].*|mirbsd*)
|
||||||
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
|
;;
|
||||||
|
(dragonfly*)
|
||||||
LD_RPATH_OPT="-rpath "
|
LD_RPATH_OPT="-rpath "
|
||||||
fi
|
;;
|
||||||
;;
|
(netbsd*)
|
||||||
(linux*|gnu*|k*bsd*-gnu|freebsd*)
|
LD_RPATH_OPT="-Wl,-rpath,"
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
;;
|
||||||
;;
|
(osf*|mls+*)
|
||||||
(openbsd[[2-9]].*|mirbsd*)
|
LD_RPATH_OPT="-rpath "
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
;;
|
||||||
;;
|
(solaris2*)
|
||||||
(dragonfly*)
|
LD_RPATH_OPT="-R"
|
||||||
LD_RPATH_OPT="-rpath "
|
;;
|
||||||
;;
|
(*)
|
||||||
(netbsd*)
|
;;
|
||||||
LD_RPATH_OPT="-Wl,-rpath,"
|
esac
|
||||||
;;
|
AC_MSG_RESULT($LD_RPATH_OPT)
|
||||||
(osf*|mls+*)
|
|
||||||
LD_RPATH_OPT="-rpath "
|
|
||||||
;;
|
|
||||||
(solaris2*)
|
|
||||||
LD_RPATH_OPT="-R"
|
|
||||||
;;
|
|
||||||
(*)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
AC_MSG_RESULT($LD_RPATH_OPT)
|
|
||||||
|
|
||||||
case "x$LD_RPATH_OPT" in
|
case "x$LD_RPATH_OPT" in
|
||||||
(x-R*)
|
(x-R*)
|
||||||
AC_MSG_CHECKING(if we need a space after rpath option)
|
AC_MSG_CHECKING(if we need a space after rpath option)
|
||||||
cf_save_LIBS="$LIBS"
|
cf_save_LIBS="$LIBS"
|
||||||
CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
|
CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
|
||||||
AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
|
AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
|
||||||
LIBS="$cf_save_LIBS"
|
LIBS="$cf_save_LIBS"
|
||||||
AC_MSG_RESULT($cf_rpath_space)
|
AC_MSG_RESULT($cf_rpath_space)
|
||||||
test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
|
test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
fi
|
||||||
])dnl
|
])dnl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
|
dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
|
||||||
|
|||||||
3255
test/configure
vendored
3255
test/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -29,7 +29,7 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Author: Thomas E. Dickey 1996-on *
|
* Author: Thomas E. Dickey 1996-on *
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
/* $Id: test.priv.h,v 1.167 2018/06/23 21:35:06 tom Exp $ */
|
/* $Id: test.priv.h,v 1.169 2018/08/19 00:28:27 tom Exp $ */
|
||||||
|
|
||||||
#ifndef __TEST_PRIV_H
|
#ifndef __TEST_PRIV_H
|
||||||
#define __TEST_PRIV_H 1
|
#define __TEST_PRIV_H 1
|
||||||
@ -1009,7 +1009,7 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */
|
|||||||
#define USING_WINDOW2(w,func,data) use_window(w, (NCURSES_WINDOW_CB) func, data)
|
#define USING_WINDOW2(w,func,data) use_window(w, (NCURSES_WINDOW_CB) func, data)
|
||||||
#define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
|
#define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
|
||||||
#else
|
#else
|
||||||
#define USING_WINDOW(w,func) func(w)
|
#define USING_WINDOW(w,func) func(w, NULL)
|
||||||
#define USING_WINDOW1(w,func,safe) func(w)
|
#define USING_WINDOW1(w,func,safe) func(w)
|
||||||
#define USING_WINDOW2(w,func,data) func(w,data)
|
#define USING_WINDOW2(w,func,data) func(w,data)
|
||||||
#define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
|
#define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user