[screen-devel] build patch

[William Pursell]

I'd like to start working on some of the
bugs to help get the next release out, but
I think there is quite a bit of basic cleanup
that needs to be done in the code base.  As
a step towards that, here are a few patches.
(They have little or nothing to do with
cleaning up the code, though.)

I think what I'm saying is that it will be
easier to attract developers if the code gets
scrubbed and modernized.  What priority
does "janitorial" work have right now?

--
William Pursell

>From 3c620c962038406641607c2c1b1f867854c9a5a4 Mon Sep 17 00:00:00 2001
From: William <address@hidden>
Date: Sun, 5 Oct 2008 08:49:52 +0100
Subject: [PATCH] Add distribution tarball to .gitignore.

---
 src/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/.gitignore b/src/.gitignore
index 529960c..c1cc2a3 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -19,3 +19,4 @@ term.h
 screen
 stamp-h.in
 tty.c
+screen*.tar.gz
-- 
1.5.6

>From 64b0c7547044ec92e53dac03cb1915f0b9dd0b06 Mon Sep 17 00:00:00 2001
From: William <address@hidden>
Date: Sun, 5 Oct 2008 09:08:51 +0100
Subject: [PATCH] Modernizing the autoconf setup.

AC_INIT in modern versions of autoconf takes
the version number, and it is more robust to
include this information here than in patchlevel.h.
For backwards compatibility, we AC_DEFINE all of
the values previously parsed from patchlevel.h,
so those values will now come from config.h.
---
 src/Makefile.in  |    2 +-
 src/configure.in |   22 +++++++++++-----------
 src/patchlevel.h |    2 ++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index 5be5d73..ac9bbd7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -19,7 +19,7 @@ datadir = @datadir@
 # don't forget to change mandir and infodir in doc/Makefile.
 bindir  = $(exec_prefix)/bin
 
-VERSION = @VERSION@
+VERSION = @PACKAGE_VERSION@
 SCREEN = screen-$(VERSION)
 
 ETCSCREENRC = $(prefix)/etc/screenrc
diff --git a/src/configure.in b/src/configure.in
index d2171c2..1af048d 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -6,8 +6,16 @@ dnl Many thanks to David MacKenzie for writing autoconf and
 dnl providing a sample configure.in file for screen.
 dnl
 AC_REVISION($Revision$)dnl
-AC_INIT(screen.c)
-AC_CONFIG_HEADER(config.h)
+AC_INIT([screen], [4.1.0], address@hidden)
+AC_CONFIG_SRCDIR([screen.c])
+AC_CONFIG_HEADER([config.h])
+
+AC_DEFINE([ORIGIN], ["FAU"], [origin])
+AC_DEFINE([REV], [4], [revision])
+AC_DEFINE([VERS], [1], [version])
+AC_DEFINE([PATCHLEVEL], [0], [patchlevel])
+AC_DEFINE([DATE], ["2-May-06"], [date])
+AC_DEFINE([STATE], ["devel"], [state])
 
 dnl
 dnl Define some useful macros
@@ -28,15 +36,7 @@ define(AC_NOTE,
 [echo "$1" 1>&AC_FD_MSG
 ])dnl
 
-dnl
-dnl Extract version from patchlevel.h
-dnl
-rev=`sed < ${srcdir}/patchlevel.h -n -e '/#define REV/s/#define REV  *//p'`
-vers=`sed < ${srcdir}/patchlevel.h -n -e '/#define VERS/s/#define VERS  *//p'`
-pat=`sed < ${srcdir}/patchlevel.h -n -e '/#define PATCHLEVEL/s/#define 
PATCHLEVEL  *//p'`
-VERSION="$rev.$vers.$pat"
-AC_NOTE(this is screen version $VERSION)
-AC_SUBST(VERSION)
+AC_NOTE([this is screen version $PACKAGE_VERSION])
 AC_PREFIX_PROGRAM(screen)
 AC_PREFIX_PROGRAM(gzip)
 
diff --git a/src/patchlevel.h b/src/patchlevel.h
index 0c147ab..54365aa 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -525,9 +525,11 @@
  * 2005-12-19, 4.00.03jw3 syntax error.
  */
 
+#if 0
 #define ORIGIN "FAU"
 #define REV 4
 #define VERS 1
 #define PATCHLEVEL 0
 #define DATE "2-May-06"
 #define STATE "devel"
+#endif
-- 
1.5.6