mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-01-24 15:13:56 +08:00
ncurses 5.7 - patch 20090207
+ update several configure macros from lynx changes + append (not prepend) to CFLAGS/CPPFLAGS + change variable from PATHSEP to PATH_SEPARATOR + improve install-rules for pc-files (patch by Miroslav Lichvar). + make it work with $DESTDIR + create the pkg-config library directory if needed.
This commit is contained in:
Thomas E. Dickey
parent
95a30fbbfc
commit
eae581c004
10
NEWS
10
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1360 2009/01/24 23:06:51 tom Exp $
|
||||
-- $Id: NEWS,v 1.1362 2009/02/07 19:20:43 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,14 @@ See the AUTHORS file for the corresponding full names.
|
||||
Changes through 1.9.9e did not credit all contributions;
|
||||
it is not possible to add this information.
|
||||
|
||||
20090207
|
||||
+ update several configure macros from lynx changes
|
||||
+ append (not prepend) to CFLAGS/CPPFLAGS
|
||||
+ change variable from PATHSEP to PATH_SEPARATOR
|
||||
+ improve install-rules for pc-files (patch by Miroslav Lichvar).
|
||||
+ make it work with $DESTDIR
|
||||
+ create the pkg-config library directory if needed.
|
||||
|
||||
20090124
|
||||
+ modify init_pair() to allow caller to create extra color pairs beyond
|
||||
the color_pairs limit, which use default colors (request by Emanuele
|
||||
|
||||
50
aclocal.m4
vendored
50
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.482 2009/01/17 21:10:05 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.483 2009/02/07 19:12:17 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -86,7 +86,7 @@ fi
|
||||
AC_SUBST(ACPPFLAGS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ADD_CFLAGS version: 7 updated: 2004/04/25 17:48:30
|
||||
dnl CF_ADD_CFLAGS version: 8 updated: 2009/01/06 19:33:30
|
||||
dnl -------------
|
||||
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
|
||||
dnl The second parameter if given makes this macro verbose.
|
||||
@ -156,7 +156,7 @@ fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
|
||||
CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
@ -168,7 +168,7 @@ AC_SUBST(EXTRA_CPPFLAGS)
|
||||
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ADD_INCDIR version: 10 updated: 2008/12/27 12:30:03
|
||||
dnl CF_ADD_INCDIR version: 12 updated: 2009/01/18 10:00:47
|
||||
dnl -------------
|
||||
dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's
|
||||
dnl redundant. We don't normally need to add -I/usr/local/include for gcc,
|
||||
@ -211,7 +211,7 @@ if test -n "$1" ; then
|
||||
|
||||
if test "$cf_have_incdir" = no ; then
|
||||
CF_VERBOSE(adding $cf_add_incdir to include-path)
|
||||
ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
|
||||
ifelse($2,,CPPFLAGS,$2)="$ifelse($2,,CPPFLAGS,$2) -I$cf_add_incdir"
|
||||
|
||||
cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
|
||||
test "$cf_top_incdir" = "$cf_add_incdir" && break
|
||||
@ -225,7 +225,7 @@ if test -n "$1" ; then
|
||||
fi
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ADD_LIBDIR version: 6 updated: 2008/02/09 13:15:34
|
||||
dnl CF_ADD_LIBDIR version: 8 updated: 2009/01/18 10:01:08
|
||||
dnl -------------
|
||||
dnl Adds to the library-path
|
||||
dnl
|
||||
@ -254,7 +254,7 @@ if test -n "$1" ; then
|
||||
fi
|
||||
if test "$cf_have_libdir" = no ; then
|
||||
CF_VERBOSE(adding $cf_add_libdir to library-path)
|
||||
ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)"
|
||||
ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,$2)"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
@ -353,7 +353,7 @@ You have the following choices:
|
||||
fi
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_AR_FLAGS version: 2 updated: 2009/01/01 20:45:18
|
||||
dnl CF_AR_FLAGS version: 4 updated: 2009/02/07 13:42:23
|
||||
dnl -----------
|
||||
dnl Check for suitable "ar" (archiver) options for updating an archive.
|
||||
AC_DEFUN([CF_AR_FLAGS],[
|
||||
@ -383,7 +383,7 @@ EOF
|
||||
done
|
||||
rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
|
||||
])
|
||||
|
||||
test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags
|
||||
AC_SUBST(ARFLAGS,$cf_cv_ar_flags)
|
||||
])
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -2082,7 +2082,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
|
||||
[AC_DIVERT_HELP([$1])dnl
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_INCLUDE_DIRS version: 5 updated: 2006/10/14 15:23:15
|
||||
dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40
|
||||
dnl ---------------
|
||||
dnl Construct the list of include-options according to whether we're building
|
||||
dnl in the source directory or using '--srcdir=DIR' option. If we're building
|
||||
@ -2090,9 +2090,9 @@ dnl with gcc, don't append the includedir if it happens to be /usr/include,
|
||||
dnl since that usually breaks gcc's shadow-includes.
|
||||
AC_DEFUN([CF_INCLUDE_DIRS],
|
||||
[
|
||||
CPPFLAGS="-I. -I../include $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I. -I../include"
|
||||
if test "$srcdir" != "."; then
|
||||
CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
|
||||
fi
|
||||
if test "$GCC" != yes; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
@ -3049,7 +3049,7 @@ fi
|
||||
AC_SUBST(MAKE_LOWER_TAGS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MANPAGE_FORMAT version: 7 updated: 2003/12/20 19:30:34
|
||||
dnl CF_MANPAGE_FORMAT version: 8 updated: 2009/01/11 20:30:50
|
||||
dnl -----------------
|
||||
dnl Option to allow user to override automatic configuration of manpage format.
|
||||
dnl There are several special cases:
|
||||
@ -3091,7 +3091,7 @@ unknown)
|
||||
cf_catonly=yes
|
||||
cf_example=date
|
||||
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
|
||||
for cf_dir in $MANPATH; do
|
||||
test -z "$cf_dir" && cf_dir=/usr/man
|
||||
for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
|
||||
@ -3780,17 +3780,17 @@ AC_DEFUN([CF_OBJ_SUBDIR],
|
||||
esac
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_PATHSEP version: 3 updated: 2001/01/12 01:23:53
|
||||
dnl CF_PATHSEP version: 4 updated: 2009/01/11 20:30:23
|
||||
dnl ----------
|
||||
dnl Provide a value for the $PATH and similar separator
|
||||
AC_DEFUN([CF_PATHSEP],
|
||||
[
|
||||
case $cf_cv_system_name in
|
||||
os2*) PATHSEP=';' ;;
|
||||
*) PATHSEP=':' ;;
|
||||
os2*) PATH_SEPARATOR=';' ;;
|
||||
*) PATH_SEPARATOR=':' ;;
|
||||
esac
|
||||
ifelse($1,,,[$1=$PATHSEP])
|
||||
AC_SUBST(PATHSEP)
|
||||
ifelse($1,,,[$1=$PATH_SEPARATOR])
|
||||
AC_SUBST(PATH_SEPARATOR)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59
|
||||
@ -3830,7 +3830,7 @@ case ".[$]$1" in #(vi
|
||||
esac
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_PKG_CONFIG version: 2 updated: 2008/12/24 07:57:28
|
||||
dnl CF_PKG_CONFIG version: 3 updated: 2009/01/25 10:55:09
|
||||
dnl -------------
|
||||
dnl Check for the package-config program, unless disabled by command-line.
|
||||
AC_DEFUN([CF_PKG_CONFIG],
|
||||
@ -3842,11 +3842,11 @@ AC_ARG_WITH(pkg-config,
|
||||
[cf_pkg_config=yes])
|
||||
AC_MSG_RESULT($cf_pkg_config)
|
||||
|
||||
case $cf_pkg_config in
|
||||
no)
|
||||
case $cf_pkg_config in #(vi
|
||||
no) #(vi
|
||||
PKG_CONFIG=none
|
||||
;;
|
||||
yes)
|
||||
yes) #(vi
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, none)
|
||||
;;
|
||||
*)
|
||||
@ -5544,7 +5544,7 @@ $3="$withval"
|
||||
AC_SUBST($3)dnl
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_WITH_PATHLIST version: 5 updated: 2001/12/10 01:28:30
|
||||
dnl CF_WITH_PATHLIST version: 6 updated: 2009/01/11 20:30:23
|
||||
dnl ----------------
|
||||
dnl Process an option specifying a list of colon-separated paths.
|
||||
dnl
|
||||
@ -5560,7 +5560,7 @@ AC_REQUIRE([CF_PATHSEP])
|
||||
AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),,
|
||||
ifelse($4,,[withval=${$3}],[withval=${$3-ifelse($5,,$4,$5)}]))dnl
|
||||
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}"
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR}"
|
||||
cf_dst_path=
|
||||
for cf_src_path in $withval
|
||||
do
|
||||
|
||||
61
configure
vendored
61
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Revision: 1.464 .
|
||||
# From configure.in Revision: 1.465 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by Autoconf 2.52.20081225.
|
||||
#
|
||||
@ -2497,7 +2497,7 @@ fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
|
||||
CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
@ -2615,7 +2615,7 @@ fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
|
||||
CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
@ -3426,11 +3426,11 @@ fi;
|
||||
echo "$as_me:3426: result: $cf_pkg_config" >&5
|
||||
echo "${ECHO_T}$cf_pkg_config" >&6
|
||||
|
||||
case $cf_pkg_config in
|
||||
no)
|
||||
case $cf_pkg_config in #(vi
|
||||
no) #(vi
|
||||
PKG_CONFIG=none
|
||||
;;
|
||||
yes)
|
||||
yes) #(vi
|
||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
set dummy pkg-config; ac_word=$2
|
||||
echo "$as_me:3436: checking for $ac_word" >&5
|
||||
@ -4082,7 +4082,7 @@ echo "${as_me-configure}:4075: testing cannot compile test-program ..." 1>&5
|
||||
fi
|
||||
echo "$as_me:4083: result: $cf_cv_ar_flags" >&5
|
||||
echo "${ECHO_T}$cf_cv_ar_flags" >&6
|
||||
|
||||
test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags
|
||||
ARFLAGS=$cf_cv_ar_flags
|
||||
|
||||
echo "$as_me:4088: checking if you have specified an install-prefix" >&5
|
||||
@ -5670,8 +5670,8 @@ os2*) #(vi
|
||||
esac
|
||||
|
||||
case $cf_cv_system_name in
|
||||
os2*) PATHSEP=';' ;;
|
||||
*) PATHSEP=':' ;;
|
||||
os2*) PATH_SEPARATOR=';' ;;
|
||||
*) PATH_SEPARATOR=':' ;;
|
||||
esac
|
||||
|
||||
if test "$use_database" != no ; then
|
||||
@ -5754,7 +5754,7 @@ if test "${with_terminfo_dirs+set}" = set; then
|
||||
else
|
||||
withval=${TERMINFO_DIRS-${datadir}/terminfo}
|
||||
fi;
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}"
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR}"
|
||||
cf_dst_path=
|
||||
for cf_src_path in $withval
|
||||
do
|
||||
@ -5991,7 +5991,7 @@ if test "${with_termpath+set}" = set; then
|
||||
else
|
||||
withval=${TERMPATH-/etc/termcap:/usr/share/misc/termcap}
|
||||
fi;
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}"
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR}"
|
||||
cf_dst_path=
|
||||
for cf_src_path in $withval
|
||||
do
|
||||
@ -7755,7 +7755,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
echo "${as_me-configure}:7756: testing adding $cf_add_incdir to include-path ..." 1>&5
|
||||
|
||||
CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
|
||||
|
||||
cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
|
||||
test "$cf_top_incdir" = "$cf_add_incdir" && break
|
||||
@ -8778,7 +8778,7 @@ unknown)
|
||||
cf_catonly=yes
|
||||
cf_example=date
|
||||
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
|
||||
for cf_dir in $MANPATH; do
|
||||
test -z "$cf_dir" && cf_dir=/usr/man
|
||||
for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
|
||||
@ -10852,7 +10852,7 @@ fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
|
||||
CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
@ -11053,7 +11053,7 @@ fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
|
||||
CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
@ -11254,7 +11254,7 @@ fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
|
||||
CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
@ -11399,7 +11399,7 @@ fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
|
||||
CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
@ -12658,7 +12658,7 @@ fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
|
||||
CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
@ -14667,7 +14667,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
echo "${as_me-configure}:14668: testing adding $cf_add_incdir to include-path ..." 1>&5
|
||||
|
||||
CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
|
||||
|
||||
cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
|
||||
test "$cf_top_incdir" = "$cf_add_incdir" && break
|
||||
@ -16540,9 +16540,9 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
|
||||
|
||||
### Construct the list of include-directories to be generated
|
||||
|
||||
CPPFLAGS="-I. -I../include $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I. -I../include"
|
||||
if test "$srcdir" != "."; then
|
||||
CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
|
||||
fi
|
||||
if test "$GCC" != yes; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
@ -17040,7 +17040,7 @@ do
|
||||
done
|
||||
|
||||
cat >>confdefs.h <<EOF
|
||||
#define NCURSES_PATHSEP '$PATHSEP'
|
||||
#define NCURSES_PATHSEP '$PATH_SEPARATOR'
|
||||
EOF
|
||||
|
||||
cat >>confdefs.h <<EOF
|
||||
@ -17109,7 +17109,7 @@ fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
|
||||
CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
@ -17775,7 +17775,6 @@ s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t
|
||||
s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t
|
||||
s,@INSTALL_LIB@,$INSTALL_LIB,;t t
|
||||
s,@TERMINFO_SRC@,$TERMINFO_SRC,;t t
|
||||
s,@PATHSEP@,$PATHSEP,;t t
|
||||
s,@FALLBACK_LIST@,$FALLBACK_LIST,;t t
|
||||
s,@WHICH_XTERM@,$WHICH_XTERM,;t t
|
||||
s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
|
||||
@ -17983,7 +17982,7 @@ done; }
|
||||
esac
|
||||
|
||||
if test x"$ac_file" != x-; then
|
||||
{ echo "$as_me:17986: creating $ac_file" >&5
|
||||
{ echo "$as_me:17985: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
rm -f "$ac_file"
|
||||
fi
|
||||
@ -18001,7 +18000,7 @@ echo "$as_me: creating $ac_file" >&6;}
|
||||
-) echo $tmp/stdin ;;
|
||||
[\\/$]*)
|
||||
# Absolute (can't be DOS-style, as IFS=:)
|
||||
test -f "$f" || { { echo "$as_me:18004: error: cannot find input file: $f" >&5
|
||||
test -f "$f" || { { echo "$as_me:18003: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
echo $f;;
|
||||
@ -18014,7 +18013,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
echo $srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ { echo "$as_me:18017: error: cannot find input file: $f" >&5
|
||||
{ { echo "$as_me:18016: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi;;
|
||||
@ -18080,7 +18079,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
|
||||
* ) ac_file_in=$ac_file.in ;;
|
||||
esac
|
||||
|
||||
test x"$ac_file" != x- && { echo "$as_me:18083: creating $ac_file" >&5
|
||||
test x"$ac_file" != x- && { echo "$as_me:18082: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
|
||||
# First look for the input files in the build tree, otherwise in the
|
||||
@ -18091,7 +18090,7 @@ echo "$as_me: creating $ac_file" >&6;}
|
||||
-) echo $tmp/stdin ;;
|
||||
[\\/$]*)
|
||||
# Absolute (can't be DOS-style, as IFS=:)
|
||||
test -f "$f" || { { echo "$as_me:18094: error: cannot find input file: $f" >&5
|
||||
test -f "$f" || { { echo "$as_me:18093: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
echo $f;;
|
||||
@ -18104,7 +18103,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
echo $srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ { echo "$as_me:18107: error: cannot find input file: $f" >&5
|
||||
{ { echo "$as_me:18106: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi;;
|
||||
@ -18162,7 +18161,7 @@ cat >>$CONFIG_STATUS <<\EOF
|
||||
rm -f $tmp/in
|
||||
if test x"$ac_file" != x-; then
|
||||
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
|
||||
{ echo "$as_me:18165: $ac_file is unchanged" >&5
|
||||
{ echo "$as_me:18164: $ac_file is unchanged" >&5
|
||||
echo "$as_me: $ac_file is unchanged" >&6;}
|
||||
else
|
||||
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
|
||||
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.464 2009/01/10 19:18:03 tom Exp $
|
||||
dnl $Id: configure.in,v 1.465 2009/02/07 18:41:03 tom Exp $
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
dnl See http://invisible-island.net/autoconf/ for additional information.
|
||||
dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_PREREQ(2.13.20020210)
|
||||
AC_REVISION($Revision: 1.464 $)
|
||||
AC_REVISION($Revision: 1.465 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -1783,7 +1783,7 @@ fi
|
||||
|
||||
CF_DIRS_TO_MAKE
|
||||
|
||||
AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATHSEP')
|
||||
AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATH_SEPARATOR')
|
||||
|
||||
AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${NCURSES_PATCH}")
|
||||
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.684 2009/01/24 20:49:01 tom Exp $
|
||||
# $Id: dist.mk,v 1.685 2009/02/07 14:08:14 tom Exp $
|
||||
# Makefile for creating ncurses distributions.
|
||||
#
|
||||
# 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.
|
||||
NCURSES_MAJOR = 5
|
||||
NCURSES_MINOR = 7
|
||||
NCURSES_PATCH = 20090124
|
||||
NCURSES_PATCH = 20090207
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.50 2009/01/24 21:42:15 tom Exp $
|
||||
# $Id: Makefile.in,v 1.51 2009/02/07 18:17:17 Miroslav.Lichvar Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -108,8 +108,8 @@ NCURSES_CONFIG = ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
|
||||
install.libs :: $(DESTDIR)$(bindir) ncurses-config
|
||||
$(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
|
||||
|
||||
@MAKE_PC_FILES@install.libs :: pc-files
|
||||
@MAKE_PC_FILES@ $(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(PKG_CONFIG_LIBDIR)/$$name; done'
|
||||
@MAKE_PC_FILES@install.libs :: pc-files $(DESTDIR)$(PKG_CONFIG_LIBDIR)
|
||||
@MAKE_PC_FILES@ $(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
|
||||
|
||||
@MAKE_PC_FILES@sources :: pc-files
|
||||
@MAKE_PC_FILES@pc-files :
|
||||
@ -128,7 +128,8 @@ run_tic.sed :
|
||||
$(DESTDIR)$(bindir) \
|
||||
$(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(datadir) \
|
||||
$(DESTDIR)$(tabsetdir) :
|
||||
$(DESTDIR)$(tabsetdir) \
|
||||
$(DESTDIR)$(PKG_CONFIG_LIBDIR) :
|
||||
$(SHELL) $(top_srcdir)/mkdirs.sh $@
|
||||
|
||||
uninstall : uninstall.data uninstall.libs
|
||||
@ -140,7 +141,7 @@ uninstall.data :
|
||||
|
||||
uninstall.libs :
|
||||
-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
|
||||
@MAKE_PC_FILES@ $(SHELL) 'for name in *.pc; do rm -f $(PKG_CONFIG_LIBDIR)/$$name; done'
|
||||
@MAKE_PC_FILES@ $(SHELL) 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
|
||||
|
||||
tags :
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user