snapshot of project "lynx", label v2-9-0d

4 files changed, 14 insertions, 16 deletions

diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index d5aa8fc4..1a817bcb 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.60 2024/03/15 09:58:36 tom Exp $
+// $LynxId: LYIcon.rc,v 1.61 2024/03/15 22:47:43 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,9,0,2003
-PRODUCTVERSION 2,9,0,2003
+FILEVERSION    2,9,0,2004
+PRODUCTVERSION 2,9,0,2004
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "https://invisible-island.net/lynx"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.9.0.2003"
+      VALUE "FileVersion",      "2.9.0.2004"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2024 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.9.0.2003"
+      VALUE "ProductVersion",   "2.9.0.2004"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/LYMain.c b/src/LYMain.c
index ab48caea..1d52bb66 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMain.c,v 1.300 2024/01/07 15:31:25 tom Exp $
+ * $LynxId: LYMain.c,v 1.301 2024/03/17 23:10:41 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -1003,7 +1003,7 @@ static void append_ssl_version(char **target,
 /* Set the text message domain.  */
 void LYSetTextDomain(void)
 {
-#if defined(HAVE_LIBINTL_H) || defined(HAVE_LIBGETTEXT_H)
+#if defined(HAVE_LIBINTL_H)
     const char *cp;
 
     if ((cp = LYGetEnv("LYNX_LOCALEDIR")) == 0) {
@@ -1221,6 +1221,7 @@ int main(int argc,
      * Zero the links and history struct arrays.
      */
     memset((void *) links, 0, sizeof(LinkInfo) * MAXLINKS);
+
     LYAllocHistory(8);
     /*
      * Zero the MultiBookmark arrays.
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index e4ab7962..24efbf51 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYReadCFG.c,v 1.200 2021/07/29 22:52:55 tom Exp $
+ * $LynxId: LYReadCFG.c,v 1.201 2024/03/17 23:04:33 tom Exp $
  */
 #ifndef NO_RULES
 #include <HTRules.h>
@@ -1406,7 +1406,7 @@ static int screen_size_fun(char *value)
 }
 #endif
 
-#if defined(HAVE_LIBINTL_H) || defined(HAVE_LIBGETTEXT_H)
+#if defined(HAVE_LIBINTL_H)
 static int message_language_fun(char *value)
 {
     char *tmp = NULL;
@@ -1621,7 +1621,7 @@ static Config_Type Config_Table [] =
      PARSE_INT(RC_MAX_COOKIES_GLOBAL,   max_cookies_global),
      PARSE_INT(RC_MAX_URI_SIZE,         max_uri_size),
      PARSE_TIM(RC_MESSAGESECS,          MessageSecs),
-#if defined(HAVE_LIBINTL_H) || defined(HAVE_LIBGETTEXT_H)
+#if defined(HAVE_LIBINTL_H)
      PARSE_FUN(RC_MESSAGE_LANGUAGE,     message_language_fun),
 #endif
      PARSE_SET(RC_MINIMAL_COMMENTS,     minimal_comments),
diff --git a/src/makefile.in b/src/makefile.in
index 52462265..18ac2ce9 100644
--- a/src/makefile.in
+++ b/src/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.77 2021/02/28 15:56:53 tom Exp $
+# $LynxId: makefile.in,v 1.79 2024/03/17 22:06:22 tom Exp $
 # template-makefile for Lynx src directory
 
 SHELL		= @CONFIG_SHELL@
@@ -53,9 +53,6 @@ WAISLIB		= # FIXME: set in parent makefile
 WWWINC		= WWW/Library/Implementation
 WWWLIB		= $(top_builddir)/WWW/Library/Implementation/libwww.a
 
-INTLLIB		= @INTLLIBS@
-INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@-I$(top_srcdir)/intl
-
 CPP_OPTS	= $(DEFS) $(CHARSET_DEFS) \
 		-DLOCALEDIR=\"$(localedir)\" \
 		-I. \
@@ -65,7 +62,7 @@ CPP_OPTS	= $(DEFS) $(CHARSET_DEFS) \
 		-I$(top_srcdir) \
 		-I$(top_srcdir)/src \
 		-I$(top_srcdir)/$(WWWINC) \
-		$(INTLDIR_CPPFLAGS) $(SITE_DEFS) $(CPPFLAGS)
+		$(SITE_DEFS) $(CPPFLAGS)
 CC_OPTS		= $(CFLAGS) $(CPP_OPTS)
 
 LINT		= @LINT@
@@ -107,7 +104,7 @@ all: lynx$x
 
 lynx$x:   message $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB)
 	@echo "Linking and creating Lynx executable"
-	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@  $(OBJS) $(WWWLIB) $(LIBS) $(INTLLIB)
+	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@  $(OBJS) $(WWWLIB) $(LIBS)
 	@echo "Copying Lynx executable into top-level directory"
 	rm -f $(top_builddir)/$@
 	cp $@ $(top_builddir)/