diff options
-rw-r--r-- | CHANGES | 6 | ||||
-rw-r--r-- | PACKAGE/debian/changelog | 4 | ||||
-rw-r--r-- | PACKAGE/lynx.nsi | 6 | ||||
-rw-r--r-- | PACKAGE/lynx.spec | 4 | ||||
-rw-r--r-- | PACKAGE/version.iss | 2 | ||||
-rw-r--r-- | aclocal.m4 | 8 | ||||
-rwxr-xr-x | configure | 16 | ||||
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | lynx.cfg | 4 | ||||
-rw-r--r-- | makefile.in | 4 | ||||
-rw-r--r-- | src/LYIcon.rc | 10 | ||||
-rw-r--r-- | userdefs.h | 4 |
12 files changed, 39 insertions, 35 deletions
diff --git a/CHANGES b/CHANGES index 033ffce7..63322fea 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,12 @@ --- $LynxId: CHANGES,v 1.797 2015/05/07 00:18:31 tom Exp $ +-- $LynxId: CHANGES,v 1.798 2015/05/09 16:14:59 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== +2015-05-09 (2.8.9dev.7) +* fix CF_CHECK_SIZEOF autoconf macro to work when its working variables have + been preset to an empty value (report by Andrew Arensburger) -TD + 2015-05-06 (2.8.9dev.6) * add a note about OCSP to url-support documentation (Debian #745835) -TD * change defaults for SSL prompts when a problem is detected to "no" (Debian diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog index 11128602..2e34817a 100644 --- a/PACKAGE/debian/changelog +++ b/PACKAGE/debian/changelog @@ -1,8 +1,8 @@ -lynx-dev (2.8.9dev.6) unstable; urgency=low +lynx-dev (2.8.9dev.7) unstable; urgency=low * maintenance updates - -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 14 Apr 2015 20:19:14 -0400 + -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 May 2015 11:06:15 -0400 lynx-dev (2.8.8dev.16) unstable; urgency=high diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi index 9ba6c34a..81762477 100644 --- a/PACKAGE/lynx.nsi +++ b/PACKAGE/lynx.nsi @@ -1,4 +1,4 @@ -; $LynxId: lynx.nsi,v 1.24 2015/04/15 00:19:14 tom Exp $ +; $LynxId: lynx.nsi,v 1.25 2015/05/09 15:06:14 tom Exp $ ; Script originally generated with the Venis Install Wizard, but customized. ; The Inno Setup script is preferred; but this can be built via cross-compiling. @@ -9,8 +9,8 @@ !define VERSION_EPOCH "2" !define VERSION_MAJOR "8" !define VERSION_MINOR "9" -!define VERSION_LEVEL "1006" -!define VERSION_PATCH "dev.6" +!define VERSION_LEVEL "1007" +!define VERSION_PATCH "dev.7" !define SUBKEY "Lynx" diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec index 6a2ba0bc..98d8a7d2 100644 --- a/PACKAGE/lynx.spec +++ b/PACKAGE/lynx.spec @@ -1,8 +1,8 @@ -# $LynxId: lynx.spec,v 1.32 2015/05/04 10:37:30 tom Exp $ +# $LynxId: lynx.spec,v 1.33 2015/05/09 15:06:15 tom Exp $ Summary: A text-based Web browser Name: lynx Version: 2.8.9 -Release: dev.6 +Release: dev.7 License: GPLv2 Group: Applications/Internet Source: lynx%{version}%{release}.tgz diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss index 5274d3ae..3963016c 100644 --- a/PACKAGE/version.iss +++ b/PACKAGE/version.iss @@ -1,7 +1,7 @@ ; version used for Inno Setup files. ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ -#define LYNX_VERSION "2.8.9dev.6" +#define LYNX_VERSION "2.8.9dev.7" ; most-recent full release and target #define LYNX_RELEASE "2.8.9" diff --git a/aclocal.m4 b/aclocal.m4 index 6cc3e773..49bbab8f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $LynxId: aclocal.m4,v 1.225 2015/04/27 00:38:54 tom Exp $ +dnl $LynxId: aclocal.m4,v 1.226 2015/05/09 15:05:27 tom Exp $ dnl Macros for auto-configure script. dnl by Thomas E. Dickey <dickey@invisible-island.net> dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> @@ -1562,7 +1562,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_SIZEOF version: 1 updated: 2012/08/10 11:32:08 +dnl CF_CHECK_SIZEOF version: 2 updated: 2015/05/09 11:00:10 dnl --------------- dnl Improve on AC_CHECK_SIZEOF for cases when the build-environment is dnl deficient, e.g., if someone tries to build in busybox. Use the second @@ -1573,8 +1573,8 @@ dnl can detect; the former includes only stdio.h for types while the latter dnl includes several header files. AC_DEFUN([CF_CHECK_SIZEOF],[ AC_CHECK_SIZEOF([$1],[$2]) -if test "${ac_cv_type_$1:+set}" = set; then - if test "${ac_cv_sizeof_$1:+set}" != set; then +if test "${ac_cv_type_$1+set}" = set; then + if test "${ac_cv_sizeof_$1+set}" != set; then AC_MSG_WARN(using $2 for sizeof $1) ac_cv_sizeof_$1=$2 elif test "x${ac_cv_sizeof_$1}" = x0; then diff --git a/configure b/configure index 26638fdf..f8bdf4a4 100755 --- a/configure +++ b/configure @@ -27850,8 +27850,8 @@ cat >>confdefs.h <<EOF #define SIZEOF_INT $ac_cv_sizeof_int EOF -if test "${ac_cv_type_int:+set}" = set; then - if test "${ac_cv_sizeof_int:+set}" != set; then +if test "${ac_cv_type_int+set}" = set; then + if test "${ac_cv_sizeof_int+set}" != set; then { echo "$as_me:27855: WARNING: using 4 for sizeof int" >&5 echo "$as_me: WARNING: using 4 for sizeof int" >&2;} ac_cv_sizeof_int=4 @@ -28099,8 +28099,8 @@ cat >>confdefs.h <<EOF #define SIZEOF_LONG $ac_cv_sizeof_long EOF -if test "${ac_cv_type_long:+set}" = set; then - if test "${ac_cv_sizeof_long:+set}" != set; then +if test "${ac_cv_type_long+set}" = set; then + if test "${ac_cv_sizeof_long+set}" != set; then { echo "$as_me:28104: WARNING: using 4 for sizeof long" >&5 echo "$as_me: WARNING: using 4 for sizeof long" >&2;} ac_cv_sizeof_long=4 @@ -28348,8 +28348,8 @@ cat >>confdefs.h <<EOF #define SIZEOF_OFF_T $ac_cv_sizeof_off_t EOF -if test "${ac_cv_type_off_t:+set}" = set; then - if test "${ac_cv_sizeof_off_t:+set}" != set; then +if test "${ac_cv_type_off_t+set}" = set; then + if test "${ac_cv_sizeof_off_t+set}" != set; then { echo "$as_me:28353: WARNING: using 4 for sizeof off_t" >&5 echo "$as_me: WARNING: using 4 for sizeof off_t" >&2;} ac_cv_sizeof_off_t=4 @@ -28597,8 +28597,8 @@ cat >>confdefs.h <<EOF #define SIZEOF_TIME_T $ac_cv_sizeof_time_t EOF -if test "${ac_cv_type_time_t:+set}" = set; then - if test "${ac_cv_sizeof_time_t:+set}" != set; then +if test "${ac_cv_type_time_t+set}" = set; then + if test "${ac_cv_sizeof_time_t+set}" != set; then { echo "$as_me:28602: WARNING: using 4 for sizeof time_t" >&5 echo "$as_me: WARNING: using 4 for sizeof time_t" >&2;} ac_cv_sizeof_time_t=4 diff --git a/configure.in b/configure.in index 6799ca11..fbd5c4f6 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $LynxId: configure.in,v 1.276 2015/04/23 09:26:06 tom Exp $ +dnl $LynxId: configure.in,v 1.277 2015/05/09 15:06:14 tom Exp $ dnl dnl Process this file with autoconf to produce a configure script. dnl @@ -29,7 +29,7 @@ dnl --------------------------------------------------------------------------- dnl dnl ask PRCS to plug-in the project-version for the configure-script. dnl $Format: "AC_REVISION($ProjectVersion$)"$ -AC_REVISION(2.8.9dev.6) +AC_REVISION(2.8.9dev.7) # Save the original $CFLAGS so we can distinguish whether the user set those # in the environment, or whether autoconf added -O and -g options: @@ -64,7 +64,7 @@ AC_ARG_PROGRAM PACKAGE=lynx dnl ask PRCS to plug-in the project-version for the packages. # $Format: "VERSION=$ProjectVersion$"$ -VERSION=2.8.9dev.6 +VERSION=2.8.9dev.7 AC_SUBST(PACKAGE) AC_SUBST(VERSION) diff --git a/lynx.cfg b/lynx.cfg index ee88f184..672fb017 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1,10 +1,10 @@ -# $LynxId: lynx.cfg,v 1.257 2015/05/07 00:56:19 tom Exp $ +# $LynxId: lynx.cfg,v 1.258 2015/05/09 15:06:14 tom Exp $ # lynx.cfg file. # The default placement for this file is /usr/local/lib/lynx.cfg (Unix) # or Lynx_Dir:lynx.cfg (VMS) # # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ -#PRCS LYNX_VERSION "2.8.9dev.6" +#PRCS LYNX_VERSION "2.8.9dev.7" # # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ #PRCS LYNX_DATE "Wed, 06 May 2015 17:56:19 -0700" diff --git a/makefile.in b/makefile.in index 273e373a..975c9ed6 100644 --- a/makefile.in +++ b/makefile.in @@ -1,4 +1,4 @@ -# $LynxId: makefile.in,v 1.151 2015/04/15 00:19:14 tom Exp $ +# $LynxId: makefile.in,v 1.152 2015/05/09 15:06:14 tom Exp $ ##makefile for lynx SHELL = @CONFIG_SHELL@ @@ -46,7 +46,7 @@ TAR_UP = $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@ TAR_DOWN = $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@ # $Format: "LYNX_VERSION = $ProjectVersion$"$ -LYNX_VERSION = 2.8.9dev.6 +LYNX_VERSION = 2.8.9dev.7 ## This is the version which we are developing (or, upon release, make this ## the same). Use no dots in the name, since it must work on VMS and MS-DOS. diff --git a/src/LYIcon.rc b/src/LYIcon.rc index aefc76eb..018e38e0 100644 --- a/src/LYIcon.rc +++ b/src/LYIcon.rc @@ -1,12 +1,12 @@ -// $LynxId: LYIcon.rc,v 1.18 2015/04/15 00:19:14 tom Exp $ +// $LynxId: LYIcon.rc,v 1.19 2015/05/09 15:06:15 tom Exp $ #include <windows.h> 100 ICON "../samples/lynx.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION 2,8,9,1006 -PRODUCTVERSION 2,8,9,1006 +FILEVERSION 2,8,9,1007 +PRODUCTVERSION 2,8,9,1007 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "http://lynx.isc.org" VALUE "FileDescription", "Lynx - web browser" - VALUE "FileVersion", "2.8.9.1006" + VALUE "FileVersion", "2.8.9.1007" VALUE "InternalName", "Lynx" VALUE "LegalCopyright", "©1997-2015 Thomas E. Dickey" VALUE "OriginalFilename", "lynx.exe" VALUE "ProductName", "Lynx - web browser" - VALUE "ProductVersion", "2.8.9.1006" + VALUE "ProductVersion", "2.8.9.1007" END END BLOCK "VarFileInfo" diff --git a/userdefs.h b/userdefs.h index 36da82f8..7d721703 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1,5 +1,5 @@ /* - * $LynxId: userdefs.h,v 1.307 2015/05/07 00:56:19 tom Exp $ + * $LynxId: userdefs.h,v 1.308 2015/05/09 15:06:14 tom Exp $ * * Lynx - Hypertext navigation system * @@ -1442,7 +1442,7 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.9dev.6" +#define LYNX_VERSION "2.8.9dev.7" #define LYNX_WWW_HOME "http://lynx.isc.org/" #define LYNX_WWW_DIST "http://lynx.isc.org/current/" /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ |