ncurses 5.9 - patch 20131012

+ fix a few compiler warnings in progs and test.
+ minor fix to package/debian-mingw/rules, do not strip dll's.
+ minor fixes to configure script for empty $prefix, e.g., when doing
  cross-compiles to MinGW.
+ add script for building test-packages of binaries cross-compiled to
  MinGW using NSIS.

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 9614524e8fe17f7d358570001a4297d6afd98aa9..2dfa5d0c047f1ea9857740bade8100cb67e36ec6 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl

-dnl $Id: aclocal.m4,v 1.72 2013/09/21 21:37:42 tom Exp $
+dnl $Id: aclocal.m4,v 1.73 2013/10/12 21:01:04 tom Exp $

 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on


@@ -65,7 +65,7 @@ define([CF_ACVERSION_COMPARE],
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07
+dnl CF_ADA_INCLUDE_DIRS version: 7 updated: 2013/10/12 16:45:09

 dnl -------------------
 dnl Construct the list of include-options for the C programs in the Ada95
 dnl binding.
 dnl -------------------
 dnl Construct the list of include-options for the C programs in the Ada95
 dnl binding.


@@ -79,7 +79,7 @@ if test "$GCC" != yes; then
        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then

-               if test $prefix != /usr ; then
+               if test x$prefix != /usr ; then

                        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
                fi
        else
                        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
                fi
        else


@@ -294,7 +294,7 @@ dnl $1 = libraries to add, with the "-l", etc.
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
 dnl ---------------------------------------------------------------------------
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12
+dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05

 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result
 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result


@@ -304,9 +304,9 @@ dnl $4 = the directory under which we will test for subdirectories
 dnl $5 = a directory that we do not want $4 to match
 AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [
 dnl $5 = a directory that we do not want $4 to match
 AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [

-test "$4" != "$5" && \
+test "x$4" != "x$5" && \

 test -d "$4" && \
 test -d "$4" && \

-ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
+ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {

        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -d $4/$3 &&          $1="[$]$1 $4/$3"
        test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -d $4/$3 &&          $1="[$]$1 $4/$3"
        test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"


@@ -1549,7 +1549,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INCLUDE_DIRS version: 7 updated: 2012/11/10 19:15:05
+dnl CF_INCLUDE_DIRS version: 8 updated: 2013/10/12 16:45:09

 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
 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


@@ -1561,7 +1561,7 @@ if test "$GCC" != yes; then
        CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
        CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then

-               if test $prefix != /usr ; then
+               if test x$prefix != x/usr ; then

                        CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else
                        CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else


@@ -1973,7 +1973,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05
+dnl CF_MIXEDCASE_FILENAMES version: 6 updated: 2013/10/08 17:47:05

 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.


@@ -1982,7 +1982,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi

-       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
+       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi

                cf_cv_mixedcase=no
                ;;
        *)
                cf_cv_mixedcase=no
                ;;
        *)

diff --git a/Ada95/configure b/Ada95/configure
index 8a699bb684119a94efe6deb92f7527ff37e48b92..f81cf90c23afb9b6930897fda231678052474272 100644 (file)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -2673,7 +2673,7 @@ else
 
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi
 
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi

-       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
+       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi

                cf_cv_mixedcase=no
                ;;
        *)
                cf_cv_mixedcase=no
                ;;
        *)


@@ -3808,7 +3808,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 

-test "$cf_header_path" != "NONE" && \
+test "x$cf_header_path" != "xNONE" && \

 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"


@@ -3829,9 +3829,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/utf8 &&       cf_search="$cf_search /usr/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/utf8 &&       cf_search="$cf_search /usr/include/utf8"


@@ -3840,7 +3840,7 @@ test -d "/usr" && \
        test -d /usr/utf8/include/utf8 &&    cf_search="$cf_search /usr/utf8/include/utf8"
 }
 
        test -d /usr/utf8/include/utf8 &&    cf_search="$cf_search /usr/utf8/include/utf8"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"


@@ -3851,9 +3851,9 @@ test -d "$prefix" && \
        test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
 }
 
        test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/utf8 &&       cf_search="$cf_search /usr/local/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/utf8 &&       cf_search="$cf_search /usr/local/include/utf8"


@@ -3862,9 +3862,9 @@ test -d "/usr/local" && \
        test -d /usr/local/utf8/include/utf8 &&    cf_search="$cf_search /usr/local/utf8/include/utf8"
 }
 
        test -d /usr/local/utf8/include/utf8 &&    cf_search="$cf_search /usr/local/utf8/include/utf8"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/utf8 &&       cf_search="$cf_search /opt/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/utf8 &&       cf_search="$cf_search /opt/include/utf8"


@@ -3873,9 +3873,9 @@ test -d "/opt" && \
        test -d /opt/utf8/include/utf8 &&    cf_search="$cf_search /opt/utf8/include/utf8"
 }
 
        test -d /opt/utf8/include/utf8 &&    cf_search="$cf_search /opt/utf8/include/utf8"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/utf8 &&       cf_search="$cf_search $HOME/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/utf8 &&       cf_search="$cf_search $HOME/include/utf8"


@@ -3970,7 +3970,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 

-test "$cf_library_path" != "NONE" && \
+test "x$cf_library_path" != "xNONE" && \

 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"


@@ -3989,9 +3989,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/utf8 &&       cf_search="$cf_search /usr/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/utf8 &&       cf_search="$cf_search /usr/lib/utf8"


@@ -4000,7 +4000,7 @@ test -d "/usr" && \
        test -d /usr/utf8/lib/utf8 &&    cf_search="$cf_search /usr/utf8/lib/utf8"
 }
 
        test -d /usr/utf8/lib/utf8 &&    cf_search="$cf_search /usr/utf8/lib/utf8"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"


@@ -4011,9 +4011,9 @@ test -d "$prefix" && \
        test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
 }
 
        test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/utf8 &&       cf_search="$cf_search /usr/local/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/utf8 &&       cf_search="$cf_search /usr/local/lib/utf8"


@@ -4022,9 +4022,9 @@ test -d "/usr/local" && \
        test -d /usr/local/utf8/lib/utf8 &&    cf_search="$cf_search /usr/local/utf8/lib/utf8"
 }
 
        test -d /usr/local/utf8/lib/utf8 &&    cf_search="$cf_search /usr/local/utf8/lib/utf8"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/utf8 &&       cf_search="$cf_search /opt/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/utf8 &&       cf_search="$cf_search /opt/lib/utf8"


@@ -4033,9 +4033,9 @@ test -d "/opt" && \
        test -d /opt/utf8/lib/utf8 &&    cf_search="$cf_search /opt/utf8/lib/utf8"
 }
 
        test -d /opt/utf8/lib/utf8 &&    cf_search="$cf_search /opt/utf8/lib/utf8"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/utf8 &&       cf_search="$cf_search $HOME/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/utf8 &&       cf_search="$cf_search $HOME/lib/utf8"


@@ -4633,7 +4633,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 

-test "$cf_header_path" != "NONE" && \
+test "x$cf_header_path" != "xNONE" && \

 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"


@@ -4654,9 +4654,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"


@@ -4665,7 +4665,7 @@ test -d "/usr" && \
        test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"


@@ -4676,9 +4676,9 @@ test -d "$prefix" && \
        test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"


@@ -4687,9 +4687,9 @@ test -d "/usr/local" && \
        test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"


@@ -4698,9 +4698,9 @@ test -d "/opt" && \
        test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"


@@ -5471,7 +5471,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 

-test "$cf_library_path" != "NONE" && \
+test "x$cf_library_path" != "xNONE" && \

 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"


@@ -5490,9 +5490,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"


@@ -5501,7 +5501,7 @@ test -d "/usr" && \
        test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"


@@ -5512,9 +5512,9 @@ test -d "$prefix" && \
        test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"


@@ -5523,9 +5523,9 @@ test -d "/usr/local" && \
        test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"


@@ -5534,9 +5534,9 @@ test -d "/opt" && \
        test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"


@@ -6042,7 +6042,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 

-test "$cf_header_path" != "NONE" && \
+test "x$cf_header_path" != "xNONE" && \

 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"


@@ -6063,9 +6063,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"


@@ -6074,7 +6074,7 @@ test -d "/usr" && \
        test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"


@@ -6085,9 +6085,9 @@ test -d "$prefix" && \
        test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"


@@ -6096,9 +6096,9 @@ test -d "/usr/local" && \
        test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"


@@ -6107,9 +6107,9 @@ test -d "/opt" && \
        test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"


@@ -6880,7 +6880,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 

-test "$cf_library_path" != "NONE" && \
+test "x$cf_library_path" != "xNONE" && \

 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"


@@ -6899,9 +6899,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"


@@ -6910,7 +6910,7 @@ test -d "/usr" && \
        test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"


@@ -6921,9 +6921,9 @@ test -d "$prefix" && \
        test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"


@@ -6932,9 +6932,9 @@ test -d "/usr/local" && \
        test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"


@@ -6943,9 +6943,9 @@ test -d "/opt" && \
        test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"


@@ -11838,7 +11838,7 @@ if test "$GCC" != yes; then
        CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
        CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then

-               if test $prefix != /usr ; then
+               if test x$prefix != x/usr ; then

                        CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else
                        CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else


@@ -11858,7 +11858,7 @@ if test "$GCC" != yes; then
        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then

-               if test $prefix != /usr ; then
+               if test x$prefix != /usr ; then

                        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
                fi
        else
                        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
                fi
        else

diff --git a/COPYING b/COPYING
new file mode 100644 (file)
index 0000000..48e6cd4
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,28 @@
+Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, distribute with modifications, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
+
+-- vile:txtmode fc=72
+-- $Id: COPYING,v 1.1 2013/10/12 17:01:03 tom Exp $

diff --git a/MANIFEST b/MANIFEST
index 5488d6731cae9a1f36f2475f359ae43f2e6c006e..04faec085d31f34d4a2b0ec83b6482255d4b91a9 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -190,6 +190,7 @@
 ./Ada95/src/terminal_interface-curses-text_io.ads
 ./Ada95/src/terminal_interface-curses-trace.adb_p
 ./Ada95/src/terminal_interface.ads
 ./Ada95/src/terminal_interface-curses-text_io.ads
 ./Ada95/src/terminal_interface-curses-trace.adb_p
 ./Ada95/src/terminal_interface.ads

+./COPYING

 ./INSTALL
 ./MANIFEST
 ./Makefile.in
 ./INSTALL
 ./MANIFEST
 ./Makefile.in


@@ -995,6 +996,7 @@
 ./package/debian/rules
 ./package/debian/source/format
 ./package/debian/watch
 ./package/debian/rules
 ./package/debian/source/format
 ./package/debian/watch

+./package/mingw-ncurses.nsi

 ./package/mingw-ncurses.spec
 ./package/ncurses.spec
 ./panel/Makefile.in
 ./package/mingw-ncurses.spec
 ./package/ncurses.spec
 ./panel/Makefile.in

diff --git a/NEWS b/NEWS
index 6990bdb644a39ea0942b552df0e6f63ba9d4bade..09c7447cb71ffc034f71bb48fcc63b3f18a9483b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.2112 2013/10/05 23:46:51 tom Exp $
+-- $Id: NEWS,v 1.2117 2013/10/12 23:15:23 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,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.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20131012
+       + fix a few compiler warnings in progs and test.
+       + minor fix to package/debian-mingw/rules, do not strip dll's.
+       + minor fixes to configure script for empty $prefix, e.g., when doing
+         cross-compiles to MinGW.
+       + add script for building test-packages of binaries cross-compiled to
+         MinGW using NSIS.
+

 20131005
        + minor fixes for ncurses-example package and makefile.
        + add scripts for test-builds of cross-compiler packages for ncurses6
 20131005
        + minor fixes for ncurses-example package and makefile.
        + add scripts for test-builds of cross-compiler packages for ncurses6

diff --git a/aclocal.m4 b/aclocal.m4
index 77ff8ba648453608cca0fe23e7cbb0eedbf1e6d9..04cf49b6e8aae93ab64999a4a7f927461568b514 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: aclocal.m4,v 1.678 2013/09/21 21:36:28 tom Exp $
+dnl $Id: aclocal.m4,v 1.680 2013/10/12 20:45:47 tom Exp $

 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on


@@ -88,7 +88,7 @@ define([CF_ACVERSION_COMPARE],
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07
+dnl CF_ADA_INCLUDE_DIRS version: 7 updated: 2013/10/12 16:45:09

 dnl -------------------
 dnl Construct the list of include-options for the C programs in the Ada95
 dnl binding.
 dnl -------------------
 dnl Construct the list of include-options for the C programs in the Ada95
 dnl binding.


@@ -102,7 +102,7 @@ if test "$GCC" != yes; then
        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then

-               if test $prefix != /usr ; then
+               if test x$prefix != /usr ; then

                        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
                fi
        else
                        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
                fi
        else


@@ -317,7 +317,7 @@ dnl $1 = libraries to add, with the "-l", etc.
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
 dnl ---------------------------------------------------------------------------
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12
+dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05

 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result
 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result


@@ -327,9 +327,9 @@ dnl $4 = the directory under which we will test for subdirectories
 dnl $5 = a directory that we do not want $4 to match
 AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [
 dnl $5 = a directory that we do not want $4 to match
 AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [

-test "$4" != "$5" && \
+test "x$4" != "x$5" && \

 test -d "$4" && \
 test -d "$4" && \

-ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
+ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {

        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -d $4/$3 &&          $1="[$]$1 $4/$3"
        test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -d $4/$3 &&          $1="[$]$1 $4/$3"
        test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"


@@ -2778,7 +2778,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INCLUDE_DIRS version: 7 updated: 2012/11/10 19:15:05
+dnl CF_INCLUDE_DIRS version: 8 updated: 2013/10/12 16:45:09

 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
 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


@@ -2790,7 +2790,7 @@ if test "$GCC" != yes; then
        CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
        CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then

-               if test $prefix != /usr ; then
+               if test x$prefix != x/usr ; then

                        CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else
                        CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else


@@ -4542,7 +4542,7 @@ ifelse($1,,[
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05
+dnl CF_MIXEDCASE_FILENAMES version: 6 updated: 2013/10/08 17:47:05

 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.


@@ -4551,7 +4551,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi

-       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
+       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi

                cf_cv_mixedcase=no
                ;;
        *)
                cf_cv_mixedcase=no
                ;;
        *)

diff --git a/configure b/configure
index c07c067a65c3b2138361fb3f14d8fd23ddfd627a..eb0672957ceec9738f48f2b83ef40ffb44c8ce41 100755 (executable)
--- a/configure
+++ b/configure
@@ -3468,7 +3468,7 @@ else
 
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi
 
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi

-       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
+       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi

                cf_cv_mixedcase=no
                ;;
        *)
                cf_cv_mixedcase=no
                ;;
        *)


@@ -8955,7 +8955,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 

-test "$cf_header_path" != "NONE" && \
+test "x$cf_header_path" != "xNONE" && \

 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"


@@ -8976,9 +8976,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/utf8 &&       cf_search="$cf_search /usr/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/utf8 &&       cf_search="$cf_search /usr/include/utf8"


@@ -8987,7 +8987,7 @@ test -d "/usr" && \
        test -d /usr/utf8/include/utf8 &&    cf_search="$cf_search /usr/utf8/include/utf8"
 }
 
        test -d /usr/utf8/include/utf8 &&    cf_search="$cf_search /usr/utf8/include/utf8"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"


@@ -8998,9 +8998,9 @@ test -d "$prefix" && \
        test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
 }
 
        test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/utf8 &&       cf_search="$cf_search /usr/local/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/utf8 &&       cf_search="$cf_search /usr/local/include/utf8"


@@ -9009,9 +9009,9 @@ test -d "/usr/local" && \
        test -d /usr/local/utf8/include/utf8 &&    cf_search="$cf_search /usr/local/utf8/include/utf8"
 }
 
        test -d /usr/local/utf8/include/utf8 &&    cf_search="$cf_search /usr/local/utf8/include/utf8"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/utf8 &&       cf_search="$cf_search /opt/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/utf8 &&       cf_search="$cf_search /opt/include/utf8"


@@ -9020,9 +9020,9 @@ test -d "/opt" && \
        test -d /opt/utf8/include/utf8 &&    cf_search="$cf_search /opt/utf8/include/utf8"
 }
 
        test -d /opt/utf8/include/utf8 &&    cf_search="$cf_search /opt/utf8/include/utf8"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/utf8 &&       cf_search="$cf_search $HOME/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/utf8 &&       cf_search="$cf_search $HOME/include/utf8"


@@ -9117,7 +9117,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 

-test "$cf_library_path" != "NONE" && \
+test "x$cf_library_path" != "xNONE" && \

 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"


@@ -9136,9 +9136,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/utf8 &&       cf_search="$cf_search /usr/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/utf8 &&       cf_search="$cf_search /usr/lib/utf8"


@@ -9147,7 +9147,7 @@ test -d "/usr" && \
        test -d /usr/utf8/lib/utf8 &&    cf_search="$cf_search /usr/utf8/lib/utf8"
 }
 
        test -d /usr/utf8/lib/utf8 &&    cf_search="$cf_search /usr/utf8/lib/utf8"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"


@@ -9158,9 +9158,9 @@ test -d "$prefix" && \
        test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
 }
 
        test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/utf8 &&       cf_search="$cf_search /usr/local/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/utf8 &&       cf_search="$cf_search /usr/local/lib/utf8"


@@ -9169,9 +9169,9 @@ test -d "/usr/local" && \
        test -d /usr/local/utf8/lib/utf8 &&    cf_search="$cf_search /usr/local/utf8/lib/utf8"
 }
 
        test -d /usr/local/utf8/lib/utf8 &&    cf_search="$cf_search /usr/local/utf8/lib/utf8"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/utf8 &&       cf_search="$cf_search /opt/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/utf8 &&       cf_search="$cf_search /opt/lib/utf8"


@@ -9180,9 +9180,9 @@ test -d "/opt" && \
        test -d /opt/utf8/lib/utf8 &&    cf_search="$cf_search /opt/utf8/lib/utf8"
 }
 
        test -d /opt/utf8/lib/utf8 &&    cf_search="$cf_search /opt/utf8/lib/utf8"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/utf8 &&       cf_search="$cf_search $HOME/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/utf8 &&       cf_search="$cf_search $HOME/lib/utf8"


@@ -20193,7 +20193,7 @@ if test "$GCC" != yes; then
        CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
        CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then

-               if test $prefix != /usr ; then
+               if test x$prefix != x/usr ; then

                        CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else
                        CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else


@@ -20213,7 +20213,7 @@ if test "$GCC" != yes; then
        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then

-               if test $prefix != /usr ; then
+               if test x$prefix != /usr ; then

                        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
                fi
        else
                        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
                fi
        else

diff --git a/dist.mk b/dist.mk
index 85f249c25d12943ebd80de24612742cf721f51cd..52c613d26438d43039b33c3f43efb51aeb6446bd 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.947 2013/10/05 14:36:58 tom Exp $
+# $Id: dist.mk,v 1.948 2013/10/12 16:11:35 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # 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 = 9
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 9

-NCURSES_PATCH = 20131005
+NCURSES_PATCH = 20131012

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 2bfd391572942c71245ca20f2fdca13ad5e8c819..8b5c290a8f4d87fd909f83deb4366ac994cbd583 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,3 +1,9 @@
+ncurses6 (5.9-20131012) unstable; urgency=low
+
+  * latest weekly patch
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Oct 2013 19:17:29 -0400
+

 ncurses6 (5.9-20131005) unstable; urgency=low
 
   * initial release
 ncurses6 (5.9-20131005) unstable; urgency=low
 
   * initial release

diff --git a/package/debian-mingw/rules b/package/debian-mingw/rules
index 0c6362ad87b7326f307434a7070fb3fee50ef032..35dacc04eaa31add8f9b84a7f1478a19f1fab7dc 100644 (file)
--- a/package/debian-mingw/rules
+++ b/package/debian-mingw/rules
@@ -117,7 +117,7 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        dh_installchangelogs NEWS
        dh_testdir
        dh_testroot
        dh_installchangelogs NEWS

-       dh_strip
+       # dh_strip

        dh_compress
        dh_fixperms
        dh_installdeb
        dh_compress
        dh_fixperms
        dh_installdeb

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 2bfd391572942c71245ca20f2fdca13ad5e8c819..8b5c290a8f4d87fd909f83deb4366ac994cbd583 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,3 +1,9 @@
+ncurses6 (5.9-20131012) unstable; urgency=low
+
+  * latest weekly patch
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Oct 2013 19:17:29 -0400
+

 ncurses6 (5.9-20131005) unstable; urgency=low
 
   * initial release
 ncurses6 (5.9-20131005) unstable; urgency=low
 
   * initial release

diff --git a/package/debian-mingw64/rules b/package/debian-mingw64/rules
index e292147fd6e4713f1fe81afb72b0e54e7b1e9feb..864ff654f8adc4e7105d0204ac10ba60ea1dd452 100644 (file)
--- a/package/debian-mingw64/rules
+++ b/package/debian-mingw64/rules
@@ -117,7 +117,7 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        dh_installchangelogs NEWS
        dh_testdir
        dh_testroot
        dh_installchangelogs NEWS

-       dh_strip
+       # dh_strip

        dh_compress
        dh_fixperms
        dh_installdeb
        dh_compress
        dh_fixperms
        dh_installdeb

diff --git a/package/debian/changelog b/package/debian/changelog
index a50f0b1ffd019a36f656c05ecf1c03294dc4c7ec..c905d8c44cd223059eb76249fbc874c6a4fc20be 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20131005) unstable; urgency=low
+ncurses6 (5.9-20131012) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Oct 2013 10:36:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Oct 2013 12:11:35 -0400

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
new file mode 100644 (file)
index 0000000..67cb268
--- /dev/null
+++ b/package/mingw-ncurses.nsi
@@ -0,0 +1,191 @@
+; $Id: mingw-ncurses.nsi,v 1.4 2013/10/12 23:13:27 tom Exp $\r
+\r
+; TODO add examples\r
+; TODO bump ABI to 6\r
+\r
+; Define the application name\r
+!define APPNAME "ncurses"\r
+!define EXENAME "ncurses.exe"\r
+\r
+!define VERSION_MAJOR "5"\r
+!define VERSION_MINOR "9"\r
+!define VERSION_YYYY  "2013"\r
+!define VERSION_MMDD  "1012"\r
+!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
+\r
+!define MY_ABI   "5"\r
+!define MY_MODEL "w"\r
+\r
+!define SUBKEY "ncurses"\r
+\r
+!define INSTALL "${APPNAME} (Console)"\r
+!define VERSION ${VERSION_MAJOR}.${VERSION_MINOR}\r
+!define VERSION_FULL  ${VERSION}-${VERSION_PATCH}\r
+\r
+; Main Install settings\r
+Name "${INSTALL}"\r
+InstallDir "c:\mingw"\r
+InstallDirRegKey HKLM "Software\${SUBKEY}" "$INSTDIR\bin"\r
+OutFile "NSIS-Output\${APPNAME}-${VERSION_FULL}-setup.exe"\r
+\r
+CRCCheck on\r
+SetCompressor /SOLID lzma\r
+\r
+VIAddVersionKey ProductName "${SUBKEY}"\r
+VIAddVersionKey CompanyName "http://invisible-island.net"\r
+VIAddVersionKey LegalCopyright "© 2013, Thomas E. Dickey"\r
+VIAddVersionKey FileDescription "NCurses Installer (MinGW)"\r
+VIAddVersionKey FileVersion ${VERSION_FULL}\r
+VIAddVersionKey ProductVersion ${VERSION_FULL}\r
+VIAddVersionKey Comments "This installer was built with NSIS and cross-compiling to MinGW."\r
+VIAddVersionKey InternalName "${APPNAME}-${VERSION_FULL}-setup.exe"\r
+; This is a dotted set of numbers limited to 16-bits each\r
+VIProductVersion "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_YYYY}.${VERSION_MMDD}"\r
+\r
+; Modern interface settings\r
+!include "MUI.nsh"\r
+\r
+!define MUI_ABORTWARNING\r
+;!define MUI_FINISHPAGE_RUN\r
+;"$INSTDIR\bin\${EXENAME}"\r
+\r
+!insertmacro MUI_PAGE_WELCOME\r
+!insertmacro MUI_PAGE_LICENSE "..\COPYING"\r
+!insertmacro MUI_PAGE_COMPONENTS\r
+!insertmacro MUI_PAGE_DIRECTORY\r
+!insertmacro MUI_PAGE_INSTFILES\r
+!insertmacro MUI_PAGE_FINISH\r
+\r
+!insertmacro MUI_UNPAGE_CONFIRM\r
+!insertmacro MUI_UNPAGE_INSTFILES\r
+\r
+; Set languages (first is default language)\r
+!insertmacro MUI_LANGUAGE "English"\r
+!insertmacro MUI_RESERVEFILE_LANGDLL\r
+\r
+InstType "Full"                ; SectionIn 1\r
+InstType "Typical"     ; SectionIn 2\r
+InstType "Minimal"     ; SectionIn 3\r
+\r
+Section "${APPNAME}" Section1\r
+\r
+       SectionIn 1 2 3\r
+\r
+       ; Set Section properties\r
+       SetOverwrite on\r
+\r
+       ; Set Section Files and Shortcuts\r
+       SetOutPath "$INSTDIR\bin"\r
+\r
+       File ".\bin\*.dll"\r
+\r
+       SetOutPath "$INSTDIR\share\${APPNAME}"\r
+       File /oname=README.txt "..\README"\r
+       File /oname=README-mingw.txt "..\README.mingw"\r
+\r
+       CreateDirectory "$SMPROGRAMS\${INSTALL}"\r
+       CreateShortCut "$SMPROGRAMS\${INSTALL}\${APPNAME}.lnk" "$INSTDIR\bin\${EXENAME}"\r
+       CreateShortCut "$SMPROGRAMS\${INSTALL}\Uninstall.lnk" "$INSTDIR\uninstall.exe"\r
+\r
+SectionEnd\r
+\r
+Section "development" Section2\r
+\r
+       SectionIn 1 2\r
+\r
+       ; Set Section properties\r
+       SetOverwrite on\r
+\r
+       ; Set Section Files and Shortcuts\r
+       SetOutPath "$INSTDIR\share\${APPNAME}"\r
+\r
+       SetOutPath "$INSTDIR\include\${APPNAME}${MY_MODEL}"\r
+\r
+       File ".\include\${APPNAME}${MY_MODEL}\*.h"\r
+\r
+       SetOutPath "$INSTDIR\lib"\r
+\r
+       File ".\lib\*.a"\r
+\r
+SectionEnd\r
+\r
+Section "examples" Section3\r
+\r
+       SectionIn 1\r
+\r
+       ; Set Section properties\r
+       SetOverwrite on\r
+\r
+       ; Set Section Files and Shortcuts\r
+       SetOutPath "$INSTDIR\lib\${APPNAME}"\r
+\r
+SectionEnd\r
+\r
+Section -FinishSection\r
+\r
+       WriteRegStr HKLM "Software\${SUBKEY}" "" "$INSTDIR"\r
+       WriteRegStr HKLM "Software\${SUBKEY}" "Environment" ""\r
+       WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${INSTALL}" "DisplayName" "${APPNAME} ${VERSION_FULL} (Console)"\r
+       WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${INSTALL}" "UninstallString" "$INSTDIR\uninstall.exe"\r
+       WriteUninstaller "$INSTDIR\uninstall.exe"\r
+\r
+SectionEnd\r
+\r
+; Modern install component descriptions\r
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN\r
+       !insertmacro MUI_DESCRIPTION_TEXT ${Section1} "${SUBKEY} runtime"\r
+       !insertmacro MUI_DESCRIPTION_TEXT ${Section2} "Development headers and libraries"\r
+       !insertmacro MUI_DESCRIPTION_TEXT ${Section3} "Examples"\r
+!insertmacro MUI_FUNCTION_DESCRIPTION_END\r
+\r
+;Uninstall section\r
+Section Uninstall\r
+\r
+       ;Remove from registry...\r
+       DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${INSTALL}"\r
+       DeleteRegKey HKLM "SOFTWARE\${SUBKEY}"\r
+\r
+       ; Delete self\r
+       Delete "$INSTDIR\uninstall.exe"\r
+\r
+       ; Delete Shortcuts\r
+       Delete "$SMPROGRAMS\${INSTALL}\${APPNAME}.lnk"\r
+       Delete "$SMPROGRAMS\${INSTALL}\Uninstall.lnk"\r
+\r
+       ; Clean up application\r
+       Delete "$INSTDIR\bin\libform${MY_MODEL}${MY_ABI}.dll"\r
+       Delete "$INSTDIR\bin\libmenu${MY_MODEL}${MY_ABI}.dll"\r
+       Delete "$INSTDIR\bin\libncurses++${MY_MODEL}${MY_ABI}.dll"\r
+       Delete "$INSTDIR\bin\libncurses${MY_MODEL}${MY_ABI}.dll"\r
+       Delete "$INSTDIR\bin\libpanel${MY_MODEL}${MY_ABI}.dll"\r
+\r
+       Delete "$INSTDIR\include\${APPNAME}${MY_MODEL}\*.h"\r
+\r
+       Delete "$INSTDIR\lib\libform${MY_MODEL}.a"\r
+       Delete "$INSTDIR\lib\libmenu${MY_MODEL}.a"\r
+       Delete "$INSTDIR\lib\libncurses++${MY_MODEL}.a"\r
+       Delete "$INSTDIR\lib\libncurses${MY_MODEL}.a"\r
+       Delete "$INSTDIR\lib\libpanel${MY_MODEL}.a"\r
+\r
+       Delete "$INSTDIR\lib\libform${MY_MODEL}.dll.a"\r
+       Delete "$INSTDIR\lib\libmenu${MY_MODEL}.dll.a"\r
+       Delete "$INSTDIR\lib\libncurses++${MY_MODEL}.dll.a"\r
+       Delete "$INSTDIR\lib\libncurses${MY_MODEL}.dll.a"\r
+       Delete "$INSTDIR\lib\libpanel${MY_MODEL}.dll.a"\r
+\r
+       Delete "$INSTDIR\lib\${APPNAME}\*.exe"\r
+\r
+       Delete "$INSTDIR\share\${APPNAME}\*.*"\r
+\r
+       ; Remove remaining directories\r
+       RMDir "$SMPROGRAMS\${INSTALL}"\r
+       RMDir "$INSTDIR\share\${APPNAME}"\r
+       RMDir "$INSTDIR\share"\r
+       RMDir "$INSTDIR\lib\${APPNAME}"\r
+       RMDir "$INSTDIR\lib"\r
+       RMDir "$INSTDIR\include\${APPNAME}${MY_MODEL}"\r
+       RMDir "$INSTDIR\include"\r
+       RMDir "$INSTDIR\bin"\r
+       RMDir "$INSTDIR\"\r
+\r
+SectionEnd
\ No newline at end of file

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 915c2adaf21ff620522f0c169f69ae543a5663bb..74e30e5323fda18df39ccec62fa51845d7d7f395 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Release: 5.9
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Release: 5.9

-Version: 20131005
+Version: 20131012

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{release}-%{version}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{release}-%{version}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index dac62bd3f92bdbe369889f7fa675f13900476a26..d3e32dfb1c7845321fdfe7f962461b68895bc0f9 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Release: 5.9
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Release: 5.9

-Version: 20131005
+Version: 20131012

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{release}-%{version}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{release}-%{version}.tgz

diff --git a/progs/tset.c b/progs/tset.c
index 7189d00c88826e2013c440ebf701e684f02e8938..21203e3de07468618ababe2e4d1f38ef961d1a18 100644 (file)
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -119,7 +119,7 @@ char *ttyname(int fd);
 #include <dump_entry.h>
 #include <transform.h>
 
 #include <dump_entry.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tset.c,v 1.91 2013/03/23 21:38:08 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.92 2013/10/12 22:17:20 tom Exp $")

 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,


@@ -792,14 +792,14 @@ reset_mode(void)
     mode.c_cc[VWERASE] = CHK(mode.c_cc[VWERASE], CWERASE);
 #endif
 
     mode.c_cc[VWERASE] = CHK(mode.c_cc[VWERASE], CWERASE);
 #endif
 

-    mode.c_iflag &= ~(IGNBRK | PARMRK | INPCK | ISTRIP | INLCR | IGNCR
+    mode.c_iflag &= ~((unsigned) (IGNBRK | PARMRK | INPCK | ISTRIP | INLCR | IGNCR

 #ifdef IUCLC
 #ifdef IUCLC

-                     | IUCLC
+                                 | IUCLC

 #endif
 #ifdef IXANY
 #endif
 #ifdef IXANY

-                     | IXANY
+                                 | IXANY

 #endif
 #endif

-                     | IXOFF);
+                                 | IXOFF));

 
     mode.c_iflag |= (BRKINT | IGNPAR | ICRNL | IXON
 #ifdef IMAXBEL
 
     mode.c_iflag |= (BRKINT | IGNPAR | ICRNL | IXON
 #ifdef IMAXBEL


@@ -807,44 +807,44 @@ reset_mode(void)
 #endif
        );
 
 #endif
        );
 

-    mode.c_oflag &= ~(0
+    mode.c_oflag &= ~((unsigned) (0

 #ifdef OLCUC
 #ifdef OLCUC

-                     | OLCUC
+                                 | OLCUC

 #endif
 #ifdef OCRNL
 #endif
 #ifdef OCRNL

-                     | OCRNL
+                                 | OCRNL

 #endif
 #ifdef ONOCR
 #endif
 #ifdef ONOCR

-                     | ONOCR
+                                 | ONOCR

 #endif
 #ifdef ONLRET
 #endif
 #ifdef ONLRET

-                     | ONLRET
+                                 | ONLRET

 #endif
 #ifdef OFILL
 #endif
 #ifdef OFILL

-                     | OFILL
+                                 | OFILL

 #endif
 #ifdef OFDEL
 #endif
 #ifdef OFDEL

-                     | OFDEL
+                                 | OFDEL

 #endif
 #ifdef NLDLY
 #endif
 #ifdef NLDLY

-                     | NLDLY
+                                 | NLDLY

 #endif
 #ifdef CRDLY
 #endif
 #ifdef CRDLY

-                     | CRDLY
+                                 | CRDLY

 #endif
 #ifdef TABDLY
 #endif
 #ifdef TABDLY

-                     | TABDLY
+                                 | TABDLY

 #endif
 #ifdef BSDLY
 #endif
 #ifdef BSDLY

-                     | BSDLY
+                                 | BSDLY

 #endif
 #ifdef VTDLY
 #endif
 #ifdef VTDLY

-                     | VTDLY
+                                 | VTDLY

 #endif
 #ifdef FFDLY
 #endif
 #ifdef FFDLY

-                     | FFDLY
+                                 | FFDLY

 #endif
 #endif

-       );
+                     ));

 
     mode.c_oflag |= (OPOST
 #ifdef ONLCR
 
     mode.c_oflag |= (OPOST
 #ifdef ONLCR


@@ -852,19 +852,19 @@ reset_mode(void)
 #endif
        );
 
 #endif
        );
 

-    mode.c_cflag &= ~(CSIZE | CSTOPB | PARENB | PARODD | CLOCAL);
+    mode.c_cflag &= ~((unsigned) (CSIZE | CSTOPB | PARENB | PARODD | CLOCAL));

     mode.c_cflag |= (CS8 | CREAD);
     mode.c_cflag |= (CS8 | CREAD);

-    mode.c_lflag &= ~(ECHONL | NOFLSH
+    mode.c_lflag &= ~((unsigned) (ECHONL | NOFLSH

 #ifdef TOSTOP
 #ifdef TOSTOP

-                     | TOSTOP
+                                 | TOSTOP

 #endif
 #ifdef ECHOPTR
 #endif
 #ifdef ECHOPTR

-                     | ECHOPRT
+                                 | ECHOPRT

 #endif
 #ifdef XCASE
 #endif
 #ifdef XCASE

-                     | XCASE
+                                 | XCASE

 #endif
 #endif

-       );
+                     ));

 
     mode.c_lflag |= (ISIG | ICANON | ECHO | ECHOE | ECHOK
 #ifdef ECHOCTL
 
     mode.c_lflag |= (ISIG | ICANON | ECHO | ECHOE | ECHOK
 #ifdef ECHOCTL


@@ -911,14 +911,23 @@ static void
 set_control_chars(void)
 {
 #ifdef TERMIOS
 set_control_chars(void)
 {
 #ifdef TERMIOS

-    if (DISABLED(mode.c_cc[VERASE]) || terasechar >= 0)
-       mode.c_cc[VERASE] = (terasechar >= 0) ? terasechar : default_erase();
+    if (DISABLED(mode.c_cc[VERASE]) || terasechar >= 0) {
+       mode.c_cc[VERASE] = UChar((terasechar >= 0)
+                                 ? terasechar
+                                 : default_erase());
+    }

 
 

-    if (DISABLED(mode.c_cc[VINTR]) || intrchar >= 0)
-       mode.c_cc[VINTR] = (intrchar >= 0) ? intrchar : CINTR;
+    if (DISABLED(mode.c_cc[VINTR]) || intrchar >= 0) {
+       mode.c_cc[VINTR] = UChar((intrchar >= 0)
+                                ? intrchar
+                                : CINTR);
+    }

 
 

-    if (DISABLED(mode.c_cc[VKILL]) || tkillchar >= 0)
-       mode.c_cc[VKILL] = (tkillchar >= 0) ? tkillchar : CKILL;
+    if (DISABLED(mode.c_cc[VKILL]) || tkillchar >= 0) {
+       mode.c_cc[VKILL] = UChar((tkillchar >= 0)
+                                ? tkillchar
+                                : CKILL);
+    }

 #endif
 }
 
 #endif
 }
 


@@ -974,9 +983,9 @@ set_conversions(void)
     if (newline != (char *) 0 && newline[0] == '\n' && !newline[1]) {
        /* Newline, not linefeed. */
 #ifdef ONLCR
     if (newline != (char *) 0 && newline[0] == '\n' && !newline[1]) {
        /* Newline, not linefeed. */
 #ifdef ONLCR

-       mode.c_oflag &= ~ONLCR;
+       mode.c_oflag &= ~((unsigned) ONLCR);

 #endif
 #endif

-       mode.c_iflag &= ~ICRNL;
+       mode.c_iflag &= ~((unsigned) ICRNL);

     }
 #ifdef __OBSOLETE__
     if (tgetflag("HD"))                /* Half duplex. */
     }
 #ifdef __OBSOLETE__
     if (tgetflag("HD"))                /* Half duplex. */

diff --git a/test/aclocal.m4 b/test/aclocal.m4
index a4079eca9a3fd4bffac175f1c86e4e534872f5e4..9e8c8c48b85cb3a1afaa663ab243c9b3b2028260 100644 (file)
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl

-dnl $Id: aclocal.m4,v 1.89 2013/09/07 18:09:19 tom Exp $
+dnl $Id: aclocal.m4,v 1.90 2013/10/12 21:02:05 tom Exp $

 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl


@@ -276,7 +276,7 @@ LIBS=`echo "$LIBS" | sed -e "s/[[   ]][[    ]]*/ /g" -e "s%$1 %$1 $2 %" -e 's%  % %
 CF_VERBOSE(...after  $LIBS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_VERBOSE(...after  $LIBS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12
+dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05

 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result
 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result


@@ -286,9 +286,9 @@ dnl $4 = the directory under which we will test for subdirectories
 dnl $5 = a directory that we do not want $4 to match
 AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [
 dnl $5 = a directory that we do not want $4 to match
 AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [

-test "$4" != "$5" && \
+test "x$4" != "x$5" && \

 test -d "$4" && \
 test -d "$4" && \

-ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
+ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {

        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -d $4/$3 &&          $1="[$]$1 $4/$3"
        test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -d $4/$3 &&          $1="[$]$1 $4/$3"
        test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"


@@ -1800,7 +1800,7 @@ ifelse($1,,[
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05
+dnl CF_MIXEDCASE_FILENAMES version: 6 updated: 2013/10/08 17:47:05

 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.


@@ -1809,7 +1809,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi

-       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
+       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi

                cf_cv_mixedcase=no
                ;;
        *)
                cf_cv_mixedcase=no
                ;;
        *)

diff --git a/test/configure b/test/configure
index 7f2ea982e77e84073053dcf916a5356b5f5c5960..d589c3e63e1abda590aa60aec8d6348c59f0e09b 100755 (executable)
--- a/test/configure
+++ b/test/configure
@@ -2394,7 +2394,7 @@ else
 
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi
 
 if test "$cross_compiling" = yes ; then
        case $target_alias in #(vi

-       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
+       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi

                cf_cv_mixedcase=no
                ;;
        *)
                cf_cv_mixedcase=no
                ;;
        *)


@@ -5804,7 +5804,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 

-test "$cf_header_path" != "NONE" && \
+test "x$cf_header_path" != "xNONE" && \

 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"


@@ -5825,9 +5825,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"


@@ -5836,7 +5836,7 @@ test -d "/usr" && \
        test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"


@@ -5847,9 +5847,9 @@ test -d "$prefix" && \
        test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"


@@ -5858,9 +5858,9 @@ test -d "/usr/local" && \
        test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"


@@ -5869,9 +5869,9 @@ test -d "/opt" && \
        test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"


@@ -6642,7 +6642,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 

-test "$cf_library_path" != "NONE" && \
+test "x$cf_library_path" != "xNONE" && \

 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"


@@ -6661,9 +6661,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"


@@ -6672,7 +6672,7 @@ test -d "/usr" && \
        test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"


@@ -6683,9 +6683,9 @@ test -d "$prefix" && \
        test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"


@@ -6694,9 +6694,9 @@ test -d "/usr/local" && \
        test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"


@@ -6705,9 +6705,9 @@ test -d "/opt" && \
        test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"


@@ -6973,7 +6973,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 

-test "$cf_header_path" != "NONE" && \
+test "x$cf_header_path" != "xNONE" && \

 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"


@@ -6994,9 +6994,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/utf8 &&       cf_search="$cf_search /usr/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/utf8 &&       cf_search="$cf_search /usr/include/utf8"


@@ -7005,7 +7005,7 @@ test -d "/usr" && \
        test -d /usr/utf8/include/utf8 &&    cf_search="$cf_search /usr/utf8/include/utf8"
 }
 
        test -d /usr/utf8/include/utf8 &&    cf_search="$cf_search /usr/utf8/include/utf8"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"


@@ -7016,9 +7016,9 @@ test -d "$prefix" && \
        test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
 }
 
        test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/utf8 &&       cf_search="$cf_search /usr/local/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/utf8 &&       cf_search="$cf_search /usr/local/include/utf8"


@@ -7027,9 +7027,9 @@ test -d "/usr/local" && \
        test -d /usr/local/utf8/include/utf8 &&    cf_search="$cf_search /usr/local/utf8/include/utf8"
 }
 
        test -d /usr/local/utf8/include/utf8 &&    cf_search="$cf_search /usr/local/utf8/include/utf8"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/utf8 &&       cf_search="$cf_search /opt/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/utf8 &&       cf_search="$cf_search /opt/include/utf8"


@@ -7038,9 +7038,9 @@ test -d "/opt" && \
        test -d /opt/utf8/include/utf8 &&    cf_search="$cf_search /opt/utf8/include/utf8"
 }
 
        test -d /opt/utf8/include/utf8 &&    cf_search="$cf_search /opt/utf8/include/utf8"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/utf8 &&       cf_search="$cf_search $HOME/include/utf8"
        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/utf8 &&       cf_search="$cf_search $HOME/include/utf8"


@@ -7135,7 +7135,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 

-test "$cf_library_path" != "NONE" && \
+test "x$cf_library_path" != "xNONE" && \

 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"


@@ -7154,9 +7154,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/utf8 &&       cf_search="$cf_search /usr/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/utf8 &&       cf_search="$cf_search /usr/lib/utf8"


@@ -7165,7 +7165,7 @@ test -d "/usr" && \
        test -d /usr/utf8/lib/utf8 &&    cf_search="$cf_search /usr/utf8/lib/utf8"
 }
 
        test -d /usr/utf8/lib/utf8 &&    cf_search="$cf_search /usr/utf8/lib/utf8"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"


@@ -7176,9 +7176,9 @@ test -d "$prefix" && \
        test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
 }
 
        test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/utf8 &&       cf_search="$cf_search /usr/local/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/utf8 &&       cf_search="$cf_search /usr/local/lib/utf8"


@@ -7187,9 +7187,9 @@ test -d "/usr/local" && \
        test -d /usr/local/utf8/lib/utf8 &&    cf_search="$cf_search /usr/local/utf8/lib/utf8"
 }
 
        test -d /usr/local/utf8/lib/utf8 &&    cf_search="$cf_search /usr/local/utf8/lib/utf8"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/utf8 &&       cf_search="$cf_search /opt/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/utf8 &&       cf_search="$cf_search /opt/lib/utf8"


@@ -7198,9 +7198,9 @@ test -d "/opt" && \
        test -d /opt/utf8/lib/utf8 &&    cf_search="$cf_search /opt/utf8/lib/utf8"
 }
 
        test -d /opt/utf8/lib/utf8 &&    cf_search="$cf_search /opt/utf8/lib/utf8"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/utf8 &&       cf_search="$cf_search $HOME/lib/utf8"
        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/utf8 &&       cf_search="$cf_search $HOME/lib/utf8"


@@ -7798,7 +7798,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                -I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 

-test "$cf_header_path" != "NONE" && \
+test "x$cf_header_path" != "xNONE" && \

 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"


@@ -7819,9 +7819,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr"
        test -d /usr/include &&          cf_search="$cf_search /usr/include"
        test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"


@@ -7830,7 +7830,7 @@ test -d "/usr" && \
        test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"


@@ -7841,9 +7841,9 @@ test -d "$prefix" && \
        test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /usr/local"
        test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
        test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"


@@ -7852,9 +7852,9 @@ test -d "/usr/local" && \
        test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under /opt"
        test -d /opt/include &&          cf_search="$cf_search /opt/include"
        test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"


@@ -7863,9 +7863,9 @@ test -d "/opt" && \
        test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
        test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
        test -n "$verbose" && echo "    ... testing for include-directories under $HOME"
        test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
        test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"


@@ -8636,7 +8636,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                -L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 

-test "$cf_library_path" != "NONE" && \
+test "x$cf_library_path" != "xNONE" && \

 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"


@@ -8655,9 +8655,9 @@ fi
 
 cf_search=
 
 
 cf_search=
 

-test "/usr" != "$prefix" && \
+test "x/usr" != "x$prefix" && \

 test -d "/usr" && \
 test -d "/usr" && \

-(test $prefix = NONE || test "/usr" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr"
        test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
        test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"


@@ -8666,7 +8666,7 @@ test -d "/usr" && \
        test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "$prefix" != "NONE" && \
+test "x$prefix" != "xNONE" && \

 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"


@@ -8677,9 +8677,9 @@ test -d "$prefix" && \
        test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "/usr/local" != "$prefix" && \
+test "x/usr/local" != "x$prefix" && \

 test -d "/usr/local" && \
 test -d "/usr/local" && \

-(test $prefix = NONE || test "/usr/local" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /usr/local"
        test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
        test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"


@@ -8688,9 +8688,9 @@ test -d "/usr/local" && \
        test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "/opt" != "$prefix" && \
+test "x/opt" != "x$prefix" && \

 test -d "/opt" && \
 test -d "/opt" && \

-(test $prefix = NONE || test "/opt" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under /opt"
        test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
        test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"


@@ -8699,9 +8699,9 @@ test -d "/opt" && \
        test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
        test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
 }
 

-test "$HOME" != "$prefix" && \
+test "x$HOME" != "x$prefix" && \

 test -d "$HOME" && \
 test -d "$HOME" && \

-(test $prefix = NONE || test "$HOME" != "$prefix") && {
+(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
        test -n "$verbose" && echo "    ... testing for lib-directories under $HOME"
        test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
        test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"

diff --git a/test/ncurses.c b/test/ncurses.c
index 403cad1b7537d503b9f6d9b30740ce96743d0e58..b701ebf3419bd0ad7be77e921c358f5407c70419 100644 (file)
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -40,7 +40,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 

-$Id: ncurses.c,v 1.394 2013/09/28 21:58:37 tom Exp $
+$Id: ncurses.c,v 1.395 2013/10/12 22:09:33 tom Exp $

 
 ***************************************************************************/
 
 
 ***************************************************************************/
 


@@ -1731,7 +1731,7 @@ wide_show_attr(int row, int skip, bool arrow, chtype attr, short pair, const cha
        attr_t old_attr = 0;
        short old_pair = 0;
 
        attr_t old_attr = 0;
        short old_pair = 0;
 

-       (void) attr_get(&old_attr, &old_pair, 0);
+       (void) (attr_get)(&old_attr, &old_pair, 0);

        (void) attr_set(attr, pair, 0);
        addwstr(wide_attr_test_string);
        (void) attr_set(old_attr, old_pair, 0);
        (void) attr_set(attr, pair, 0);
        addwstr(wide_attr_test_string);
        (void) attr_set(old_attr, old_pair, 0);