From xemacs-m  Sat Jul 26 22:27:53 1997
Received: from punt-1.mail.demon.net (relay-14.mail.demon.net [194.217.242.138])
	by xemacs.org (8.8.5/8.8.5) with SMTP id WAA20337
	for <xemacs-beta@xemacs.org>; Sat, 26 Jul 1997 22:27:52 -0500 (CDT)
Received: from haruspex.demon.co.uk ([158.152.162.249]) by punt-1.mail.demon.net
           id aa0902742; 27 Jul 97 4:22 BST
Received: (from ltb@localhost)
	by haruspex.demon.co.uk (8.8.5/8.8.5) id DAA21309;
	Sun, 27 Jul 1997 03:21:56 GMT
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: XEmacs 20.3b15 lib-src/config.values patch??
X-url: http://www.haruspex.demon.co.uk/
X-Attribution: Len
X-Unexpected: The Spanish Inquisition
X-Mayan-date: Long count = 12.19.4.6.12; tzolkin = 5 Eb; haab = 10 Xul
Mime-Version: 1.0 (generated by tm-edit 7.108)
Content-Type: text/plain; charset=US-ASCII
From: Leonard Blanks <ltb@haruspex.demon.co.uk>
Date: 27 Jul 1997 03:21:56 +0000
Message-ID: <m2iuxx9o2z.fsf@haruspex.demon.co.uk>
Lines: 94
X-Mailer: Gnus v5.4.64/XEmacs 20.3(beta14) - "Vienna"


I seem to have avoided the patch problem that Glynn had with gnus.xpm,
having cleaned the dead directories before patching; the process was not
however completely successful:

--------------------------
Patching file `lib-src/config.values' using Plan A...
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 43 with fuzz 1.
Hunk #3 succeeded at 58 with fuzz 1.
Hunk #4 FAILED at 84.
Hunk #5 FAILED at 219.
3 out of 5 hunks FAILED -- saving rejects to lib-src/config.values.rej

***************
*** 1,11 ****
- CFLAGS "-m486 -O4 -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer -Wall"
  CPPFLAGS ""
  CXXFLAGS ""
  DEFS "-DHAVE_CONFIG_H"
  LDFLAGS ""
  LIBS "-ldb -lgdbm -lgpm -lncurses -lintl -lm "
- exec_prefix "${prefix}"
- prefix "/usr/local"
  program_transform_name "s,x,x,"
  bindir "${exec_prefix}/bin"
  sbindir "${exec_prefix}/sbin"
--- 1,11 ----
+ CFLAGS "-m486 -Wall -O4 -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer"
  CPPFLAGS ""
  CXXFLAGS ""
  DEFS "-DHAVE_CONFIG_H"
  LDFLAGS ""
  LIBS "-ldb -lgdbm -lgpm -lncurses -lintl -lm "
+ exec_prefix "/usr/src/junk2"
+ prefix "/usr/src/junk1"
  program_transform_name "s,x,x,"
  bindir "${exec_prefix}/bin"
  sbindir "${exec_prefix}/sbin"
***************
*** 84,96 ****
  INSTALL "$INSTALL"
  EMACS_MAJOR_VERSION 20
  EMACS_MINOR_VERSION 3
- EMACS_BETA_VERSION 14
- XEMACS_CODENAME "Vienna"
- EMACS_VERSION "20.3-b14"
  DEBUG_XEMACS t
  USE_ASSERTIONS t
  MEMORY_USAGE_STATS t
- CANONICAL_VERSION 20_3_b14_i586_pc_linux
  HAVE_SYS_TIMEB_H t
  HAVE_SYS_TIME_H t
  HAVE_UNISTD_H t
--- 84,96 ----
  INSTALL "$INSTALL"
  EMACS_MAJOR_VERSION 20
  EMACS_MINOR_VERSION 3
+ EMACS_BETA_VERSION 15
+ XEMACS_CODENAME "Berlin"
+ EMACS_VERSION "20.3-b15"
  DEBUG_XEMACS t
  USE_ASSERTIONS t
  MEMORY_USAGE_STATS t
+ CANONICAL_VERSION 20_3_b15_i586_pc_linux
  HAVE_SYS_TIMEB_H t
  HAVE_SYS_TIME_H t
  HAVE_UNISTD_H t
***************
*** 219,225 ****
  HAVE_BERKELEY_DB t
  HAVE_DATABASE t
  EMACS_CONFIGURATION "i586-pc-linux"
- EMACS_CONFIG_OPTIONS " '--cflags=-m486 -O4 -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer -Wall' --with-sound=no --error-checking=none --debug=yes --with-mule=yes --with-dialogs=athena3d --with-scrollbars=athena3d --use-union-type=yes --with-xim=no --mail-locking=file"
  config_machfile "m/intel386.h"
  config_opsysfile "s/linux.h"
  LD_SWITCH_X_SITE ""
--- 219,225 ----
  HAVE_BERKELEY_DB t
  HAVE_DATABASE t
  EMACS_CONFIGURATION "i586-pc-linux"
+ EMACS_CONFIG_OPTIONS " '--cflags=-m486 -Wall -O4 -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer' --with-sound=no --error-checking=none --debug=yes --with-mule=yes --with-dialogs=athena3d --with-scrollbars=athena3d --use-union-type=yes --with-xim=no --mail-locking=file --prefix=/usr/src/junk1 --exec-prefix=/usr/src/junk2"
  config_machfile "m/intel386.h"
  config_opsysfile "s/linux.h"
  LD_SWITCH_X_SITE ""


There seems to be a bit too much of Steven's configuration here in the
context.  I would have simply patched by hand, but should this be patched
at all?

-- 
Len

