From xemacs-m  Sat Sep 13 02:59:44 1997
Received: from GS213.SP.CS.CMU.EDU (GS213.SP.CS.CMU.EDU [128.2.209.183])
	by xemacs.org (8.8.5/8.8.5) with SMTP id CAA22253
	for <xemacs-beta@xemacs.org>; Sat, 13 Sep 1997 02:59:43 -0500 (CDT)
Received: by GS213.SP.CS.CMU.EDU (AIX 3.2/UCB 5.64/4.03)
          id AA19100; Sat, 13 Sep 1997 03:59:44 -0400
Date: Sat, 13 Sep 1997 03:59:44 -0400
Message-Id: <9709130759.AA19100@GS213.SP.CS.CMU.EDU>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
From: Darrell Kindred <dkindred@cmu.edu>
To: xemacs-beta@xemacs.org
Subject: 19.16-pre1: configure PATCH, puresize
Organization: Carnegie Mellon University School of Computer Science
X-Mailer: VM 6.22 under 19.15 XEmacs Lucid

I've built 19.16-pre1 under linux (config is below), and it
went fairly smoothly except that the default puresize is
still low.

Changes between 19.15 and 19.16-pre1 have caused configure
commands like the following to break:

./configure  --verbose \
     --with-xpm --with-xface --with-gif --with-jpeg --with-dialogs=athena \
     --site-includes="/afs/cs/local/xemacs/src/xpm-3.4j/common/include \
                      /afs/cs/local/xemacs/src/compface" \
     --site-libraries="/afs/cs/local/xemacs/src/xpm-3.4j/@sys/lib \
                       /afs/cs/local/xemacs/src/compface/lib/@sys" \
     --x-includes=/usr/local/include \
     --x-libraries=/usr/local/lib \
     --cflags='-O2 -DCMU -DCMUCS'

The problem is that the newlines embedded in the
site-includes and site-libraries lists are preserved
in the comment at the top of config.status, so it
looks like this:

    #!/bin/sh
    # Generated automatically by configure.
    # Run this file to recreate the current configuration.
    # This directory was configured as follows,
    # on host GS213:
    #
    # /afs/cs/project/calder/member/dkindred/tmp/xemacs/xemacs-19.16-pre1/configure  '--verbose' '--with-xpm' '--with-xface' '--with-gif' '--with-jpeg' '--with-dialogs=athena' '--site-includes=/afs/cs/local/xemacs/src/xpm-3.4j/common/include 
                          /afs/cs/local/xemacs/src/compface' '--site-libraries=/afs/cs/local/xemacs/src/xpm-3.4j/@sys/lib 
                           /afs/cs/local/xemacs/src/compface/lib/@sys' '--x-includes=/usr/local/include' '--x-libraries=/usr/local/lib' '--cflags=-O2 -DCMU -DCMUCS'


The last two lines don't get interpreted as part of the
comment, so they cause errors.

The patch below makes configure insert a '#' at the
beginning of each line.  I've made the patch to configure
itself, rather than configure.in, since the latter doesn't
include the relevant code.  (I assume it's autoconf-generated, 
but I don't have the right version of autoconf here.)  Since
this is a dead-end release, I thought patching configure
itself might be acceptable, but I'll understand if you don't
want to do it.

- Darrell

Configured for `i586-unknown-linux2.0.30'.

  Where should the build process find the source code?    /old/usr1/src/xemacs-19.16-pre1
  What installation prefix should install use?            /usr/local
  What operating system and machine description files should XEmacs use?
        `s/linux.h' and `m/intel386.h'
  What compiler should XEmacs be built with?              gcc -g -O2
  Should XEmacs use the GNU version of malloc?            yes
  Should XEmacs use the relocating allocator for buffers? yes
  What window system should XEmacs use?                   x11
  Where do we find X Windows header files?                /usr/local/include
  Where do we find X Windows libraries?                   /usr/local/lib
  Additional header files:                                /old/usr1/src/xpm-3.4f/
  Additional libraries:                                   /old/usr1/src/xpm-3.4f/lib
  Compiling in support for XAUTH.
  Compiling in support for XPM.
  Compiling in support for X-Face headers.
  Compiling in support for GIF image conversion.
  Compiling in support for JPEG image conversion.
  Compiling in native sound support.
  Using the Lucid menubar.
  Using the Lucid scrollbar.
  Using the Motif dialog boxes.

--- configure.orig	Sat Sep 13 01:45:17 1997
+++ configure	Sat Sep 13 03:47:27 1997
@@ -8287,8 +8287,11 @@
 # This directory was configured as follows,
 # on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 #
-# $0 $quoted_arguments
-
+EOF
+sed 's/^/# /' >> config.status <<EOF
+$0 $quoted_arguments
+EOF
+cat >> config.status <<EOF
 ac_cs_usage="Usage: config.status [--recheck] [--version] [--help]"
 for ac_option
 do

