spu autoconfiscation patch

spu autoconfiscation patch

[Nathanael Nerode]

Reposting...

'configure' is not included in the patch below because I couldn't get
cvs diff to handle a new file.  It's generated from configure.in anyway.

The whole files are probably easier to read than the diffs.

I did not attempt to cure any bugs or portability issues in SPU, as I
do not feel that I am a competent enough C programmer to do so; this is
just enough that the 'utils' and top level autoconfiscations will be
possible.

With this patch, spu configures, builds, and has no behavior changes on
my Debian woody system (i686-pc-linux-gnu).  (The programs which SPU
generates are identical before and after.)

Apr 2 2002 Nathanael Nerode
	* utils/spu/configure.in: autoconfiscated.
	* utils/spu/Makefile.in: autoconfiscated.
	* utils/spu/configure: new autoconf-generated file.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/utils/spu/Makefile.in,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.in
1c1
< # Copyright 1993, 1994 Free Software Foundation, Inc.
---
> # Copyright 1993, 1994, 2002 Free Software Foundation, Inc.
3c3
< # This file is part of GNU CC.
---
> # This file is part of SPU.
17a18
> VPATH = @srcdir@
19c20
< prefix = /usr/local
---
> SHELL = /bin/sh
21,25c22,33
< program_transform_name =
< exec_prefix = $(prefix)
< bindir = $(exec_prefix)/bin
< libdir = $(exec_prefix)/lib
< tooldir = $(libdir)/$(target_alias)
---
> prefix = @prefix@
> exec_prefix = @exec_prefix@
> bindir = @bindir@
> libdir = @libdir@
> datadir = @datadir@
> mandir = @mandir@
> infodir = @infodir@
> includedir = @includedir@
> srcdir = @srcdir@
> 
> CC = @CC@
> CFLAGS = @CFLAGS@
27,28d34
< datadir = $(prefix)/share
< mandir = $(prefix)/man
38,41c44
< infodir = $(prefix)/info
< includedir = $(prefix)/include
< 
< SHELL = /bin/sh
---
> tooldir = $(libdir)/$(target_alias)
43c46
< INSTALL = install -c
---
> INSTALL = @INSTALL@
47,54d49
< AR = ar
< AR_FLAGS = qv
< RANLIB = ranlib
< 
< # Directory containing source files.  Don't clean up the spacing,
< # this exact string is matched for by the "configure" script.
< srcdir = .
< 
57,58c52
< INCLUDE_DIR =  ${srcdir}/../../include
< INCLUDE_DEP = $$(INCLUDE_DIR)
---
> INCLUDE_DIR = ${srcdir}/../../include
67,71d60
< # CFLAGS is specifically reserved for setting from the command line
< # when running make.  I.E.  "make CFLAGS=-Wmissing-prototypes".
< 
< CFLAGS = -g
< 
74,96c63
< ALL_CFLAGS = $(CFLAGS) $(INCLUDE_CFLAGS)
< 
< # None of the things in CFLAGS will do any harm, and on some systems
< #  (e.g. SunOS4) it is important to use the MH_CFLAGS.
< 
< LDFLAGS = $(CFLAGS)
< 
< # Where is the "-liberty" library, containing getopt and obstack?
< 
< LIBIBERTY_DIR = ${srcdir}/../../libiberty
< LIBIBERTY = ./../../libiberty${subdir}/libiberty.a
< 
< # Host and target-dependent makefile fragments come in here.
< ####
< # End of host and target-dependent makefile fragments
< 
< # Prevent Sun make from putting in the machine type.  Setting
< # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
< 
< .c.o:
< 	${CC} -c ${ALL_CFLAGS} $<
< 
< OFILES = spu.o
---
> ALL_CFLAGS = @DEFS@ $(INCLUDE_CFLAGS) $(CFLAGS)
104,106c71
< install-info:
< 
< spu: ${OFILES}
---
> spu: spu.o
109c74,77
< spu.o: spu.c
---
> # Prevent Sun make from putting in the machine type.  Setting
> # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
> spu.o: $(srcdir)/spu.c
> 	${CC} -c ${ALL_CFLAGS} $(srcdir)/spu.c
113c81
< clean:		mostlyclean
---
> clean: mostlyclean
116,117c84,87
< distclean:	clean
< 	rm -f Makefile config.status
---
> distclean: clean
> 	rm -f Makefile config.status config.log config.cache
> 
> maintainer-clean realclean: distclean
119c89,90
< maintainer-clean realclean:	distclean
---
> Makefile: $(srcdir)/Makefile.in config.status
> 	./config.status
121,122c92,93
< Makefile: Makefile.in $(host_makefile_frag) $(target_makefile_frag)
< 	$(SHELL) config.status
---
> config.status: $(srcdir)/configure
> 	./config.status --recheck
124c95,96
< force:
---
> $(srcdir)/configure: $(srcdir)/configure.in
> 	cd $(srcdir) && autoconf
Index: configure.in
===================================================================
RCS file: /cvs/src/src/utils/spu/configure.in,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 configure.in
1,4c1
< # This file is a shell script fragment that supplies the information
< # necessary to tailor a template configure script into the configure
< # script appropriate for this directory.  For more information, check
< # any existing configure script.
---
> # Process this file with autoconf to produce a configure script.
6,7c3
< srctrigger=spu.c
< srcname="spu"
---
> # Copyright 2002 Free Software Foundation, Inc.
9c5
< # per-host:
---
> # This file is part of SPU.
11c7,19
< # per-target:
---
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
> # the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> # 
> # This program is distributed in the hope that it will be useful,
> # but WITHOUT ANY WARRANTY; without even the implied warranty of
> # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> # GNU General Public License for more details.
> # 
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
13c21,40
< # post-target:
---
> AC_INIT([spu.c])
> 
> # Checks for programs.
> AC_PROG_CC
> AC_PROG_INSTALL
> 
> # Checks for header files.
> # The program doesn't actually handle failure.
> #AC_HEADER_STDC
> #AC_CHECK_HEADERS([stdlib.h string.h])
> 
> # Checks for typedefs, structures, and compiler characteristics.
> AC_C_CONST
> 
> # Checks for library functions.
> # The program doesn't actually handle failure.
> #AC_FUNC_MALLOC
> #AC_CHECK_FUNCS([memset strtol])
> 
> AC_OUTPUT([Makefile])

Re: spu autoconfiscation patch

[Stan Shebs]

Nathanael Nerode wrote:
> 
> Reposting...
> 
> 'configure' is not included in the patch below because I couldn't get
> cvs diff to handle a new file.  It's generated from configure.in anyway.
> 
> The whole files are probably easier to read than the diffs.
> 
> I did not attempt to cure any bugs or portability issues in SPU, as I
> do not feel that I am a competent enough C programmer to do so; this is
> just enough that the 'utils' and top level autoconfiscations will be
> possible.

Hmm, I suppose I ought to fix the portability issues...

> With this patch, spu configures, builds, and has no behavior changes on
> my Debian woody system (i686-pc-linux-gnu).  (The programs which SPU
> generates are identical before and after.)
> 
> Apr 2 2002 Nathanael Nerode
>         * utils/spu/configure.in: autoconfiscated.
>         * utils/spu/Makefile.in: autoconfiscated.
>         * utils/spu/configure: new autoconf-generated file.

This is OK to check in.  Thanks, and thanks for being patient...

Stan

Re: spu autoconfiscation patch

[Daniel Jacobowitz]

On Tue, Apr 02, 2002 at 02:56:14PM -0500, Nathanael Nerode wrote:
> Reposting...
> 
> 'configure' is not included in the patch below because I couldn't get
> cvs diff to handle a new file.  It's generated from configure.in anyway.
> 
> The whole files are probably easier to read than the diffs.

Please don't use straight diff; it's unreadable.  Use contextual or
unified diffs - I think the preference for most GNU projects is
contextual (I'm a unified person, myself....)

> I did not attempt to cure any bugs or portability issues in SPU, as I
> do not feel that I am a competent enough C programmer to do so; this is
> just enough that the 'utils' and top level autoconfiscations will be
> possible.
> 
> With this patch, spu configures, builds, and has no behavior changes on
> my Debian woody system (i686-pc-linux-gnu).  (The programs which SPU
> generates are identical before and after.)
> 
> Apr 2 2002 Nathanael Nerode

You also may want to look at GNU changelog formatting.  That should be:

2002-04-02  Nathanael Nerode  <neroden@doctormoo.dyndns.org>

(note the double spaces)

> 	* utils/spu/configure.in: autoconfiscated.
> 	* utils/spu/Makefile.in: autoconfiscated.
> 	* utils/spu/configure: new autoconf-generated file.

GDB folks: This patch is simple and seems obviously correct to me.
Since I'm allowed to check in changes to configury, I'm going to sit on
this for two or three days, and check it in to the trunk if there are
no objections.  Speak now or, etc.

-- 
Daniel Jacobowitz                           Carnegie Mellon University
MontaVista Software                         Debian GNU/Linux Developer

Re: spu autoconfiscation patch

[Daniel Jacobowitz]

On Tue, Apr 02, 2002 at 12:03:52PM -0800, Stan Shebs wrote:
> Nathanael Nerode wrote:
> > 
> > Reposting...
> > 
> > 'configure' is not included in the patch below because I couldn't get
> > cvs diff to handle a new file.  It's generated from configure.in anyway.
> > 
> > The whole files are probably easier to read than the diffs.
> > 
> > I did not attempt to cure any bugs or portability issues in SPU, as I
> > do not feel that I am a competent enough C programmer to do so; this is
> > just enough that the 'utils' and top level autoconfiscations will be
> > possible.
> 
> Hmm, I suppose I ought to fix the portability issues...
> 
> > With this patch, spu configures, builds, and has no behavior changes on
> > my Debian woody system (i686-pc-linux-gnu).  (The programs which SPU
> > generates are identical before and after.)
> > 
> > Apr 2 2002 Nathanael Nerode
> >         * utils/spu/configure.in: autoconfiscated.
> >         * utils/spu/Makefile.in: autoconfiscated.
> >         * utils/spu/configure: new autoconf-generated file.
> 
> This is OK to check in.  Thanks, and thanks for being patient...

Or even better!  Thanks, Stan.

-- 
Daniel Jacobowitz                           Carnegie Mellon University
MontaVista Software                         Debian GNU/Linux Developer

Re: spu autoconfiscation patch

[Nathanael Nerode]

On Tue, Apr 02, 2002 at 12:03:52PM -0800, Stan Shebs wrote:
> > Apr 2 2002 Nathanael Nerode
> >         * utils/spu/configure.in: autoconfiscated.
> >         * utils/spu/Makefile.in: autoconfiscated.
> >         * utils/spu/configure: new autoconf-generated file.
> 
> This is OK to check in.  Thanks, and thanks for being patient...
> 
> Stan

Thank you!  Sorry I couldn't help more. ;-)  Could you or someone with
cvs write access check it in please?  (I don't have cvs write access.)

Nathanael

Re: spu autoconfiscation patch

[Nathanael Nerode]

Daniel, thanks for the pointers... I've had this patch sitting for a
while and ASSumed I'd got the diff format right the
first time I posted it. (No sort of diff is very readable, though,
because more of the file changed than stayed the same.)  And I
think the ChangeLog entry in my original post was more correct, but I
couldn't find it and rewrote it very quickly. :-P  Sorry to cause
trouble...

--Nathanael

Re: spu autoconfiscation patch

[Daniel Jacobowitz]

On Tue, Apr 02, 2002 at 03:15:05PM -0500, Nathanael Nerode wrote:
> Daniel, thanks for the pointers... I've had this patch sitting for a
> while and ASSumed I'd got the diff format right the
> first time I posted it. (No sort of diff is very readable, though,
> because more of the file changed than stayed the same.)  And I
> think the ChangeLog entry in my original post was more correct, but I
> couldn't find it and rewrote it very quickly. :-P  Sorry to cause
> trouble...

No problem.  I checked in a corrected version.

Also, you should remember that # is not a comment character in
configure.in.  The only reason it worked for you was because you didn't
have spaces between # and AC, I think.  M4 comments start with 'dnl'.

Here's what went in.

-- 
Daniel Jacobowitz                           Carnegie Mellon University
MontaVista Software                         Debian GNU/Linux Developer

Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/utils/spu/ChangeLog,v
retrieving revision 1.5
diff -u -p -r1.5 ChangeLog
--- ChangeLog	2000/07/31 12:54:31	1.5
+++ ChangeLog	2002/04/02 20:22:47
@@ -1,3 +1,10 @@
+2002-04-02  Daniel Jacobowitz  <drow@mvista.com>
+
+	From Nathanael Nerode <neroden@doctormoo.dyndns.org>:
+        * utils/spu/configure.in: Autoconfiscated.
+        * utils/spu/Makefile.in: Autoconfiscated.
+        * utils/spu/configure: New generated file.
+
 2000-07-21  Stan Shebs  <shebs@shebs.cnchost.com>
 
 	Add the generation of C++ classes.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/utils/spu/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.in
--- Makefile.in	1999/04/16 01:35:29	1.1.1.1
+++ Makefile.in	2002/04/02 20:22:47
@@ -1,6 +1,6 @@
-# Copyright 1993, 1994 Free Software Foundation, Inc.
+# Copyright 1993, 1994, 2002 Free Software Foundation, Inc.
 
-# This file is part of GNU CC.
+# This file is part of SPU.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,17 +15,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+VPATH = @srcdir@
 
-prefix = /usr/local
+SHELL = /bin/sh
 
-program_transform_name =
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
-tooldir = $(libdir)/$(target_alias)
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+datadir = @datadir@
+mandir = @mandir@
+infodir = @infodir@
+includedir = @includedir@
+srcdir = @srcdir@
+
+CC = @CC@
+CFLAGS = @CFLAGS@
 
-datadir = $(prefix)/share
-mandir = $(prefix)/man
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
@@ -35,27 +41,15 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
-infodir = $(prefix)/info
-includedir = $(prefix)/include
-
-SHELL = /bin/sh
+tooldir = $(libdir)/$(target_alias)
 
-INSTALL = install -c
+INSTALL = @INSTALL@
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 
-AR = ar
-AR_FLAGS = qv
-RANLIB = ranlib
-
-# Directory containing source files.  Don't clean up the spacing,
-# this exact string is matched for by the "configure" script.
-srcdir = .
-
 # Where is the "include" directory?  Traditionally ../include or ./include
 
-INCLUDE_DIR =  ${srcdir}/../../include
-INCLUDE_DEP = $$(INCLUDE_DIR)
+INCLUDE_DIR = ${srcdir}/../../include
 
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
@@ -64,61 +58,39 @@ INCLUDE_DEP = $$(INCLUDE_DIR)
 
 INCLUDE_CFLAGS = -I. -I${srcdir} -I${srcdir}/config -I$(INCLUDE_DIR)
 
-# CFLAGS is specifically reserved for setting from the command line
-# when running make.  I.E.  "make CFLAGS=-Wmissing-prototypes".
-
-CFLAGS = -g
-
 # ALL_CFLAGS is the aggregate of all other *CFLAGS macros.
-
-ALL_CFLAGS = $(CFLAGS) $(INCLUDE_CFLAGS)
-
-# None of the things in CFLAGS will do any harm, and on some systems
-#  (e.g. SunOS4) it is important to use the MH_CFLAGS.
-
-LDFLAGS = $(CFLAGS)
 
-# Where is the "-liberty" library, containing getopt and obstack?
+ALL_CFLAGS = @DEFS@ $(INCLUDE_CFLAGS) $(CFLAGS)
 
-LIBIBERTY_DIR = ${srcdir}/../../libiberty
-LIBIBERTY = ./../../libiberty${subdir}/libiberty.a
-
-# Host and target-dependent makefile fragments come in here.
-####
-# End of host and target-dependent makefile fragments
-
-# Prevent Sun make from putting in the machine type.  Setting
-# TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
-
-.c.o:
-	${CC} -c ${ALL_CFLAGS} $<
-
-OFILES = spu.o
-
 all: spu
 
 info:
 
 install:
-
-install-info:
 
-spu: ${OFILES}
+spu: spu.o
 	$(CC) $(CFLAGS) -o spu spu.o
 
-spu.o: spu.c
+# Prevent Sun make from putting in the machine type.  Setting
+# TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
+spu.o: $(srcdir)/spu.c
+	${CC} -c ${ALL_CFLAGS} $(srcdir)/spu.c
 
 mostlyclean:
 
-clean:		mostlyclean
+clean: mostlyclean
 	rm -f *.o spu
+
+distclean: clean
+	rm -f Makefile config.status config.log config.cache
 
-distclean:	clean
-	rm -f Makefile config.status
+maintainer-clean realclean: distclean
 
-maintainer-clean realclean:	distclean
+Makefile: $(srcdir)/Makefile.in config.status
+	./config.status
 
-Makefile: Makefile.in $(host_makefile_frag) $(target_makefile_frag)
-	$(SHELL) config.status
+config.status: $(srcdir)/configure
+	./config.status --recheck
 
-force:
+$(srcdir)/configure: $(srcdir)/configure.in
+	cd $(srcdir) && autoconf
cvs server: configure is a new entry, no comparison available
Index: configure.in
===================================================================
RCS file: /cvs/src/src/utils/spu/configure.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 configure.in
--- configure.in	1999/04/16 01:35:30	1.1.1.1
+++ configure.in	2002/04/02 20:22:48
@@ -1,13 +1,40 @@
-# This file is a shell script fragment that supplies the information
-# necessary to tailor a template configure script into the configure
-# script appropriate for this directory.  For more information, check
-# any existing configure script.
+# Process this file with autoconf to produce a configure script.
 
-srctrigger=spu.c
-srcname="spu"
+# Copyright 2002 Free Software Foundation, Inc.
 
-# per-host:
+# This file is part of SPU.
 
-# per-target:
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-# post-target:
+AC_INIT([spu.c])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+
+dnl # Checks for header files.
+dnl # The program doesn't actually handle failure.
+dnl AC_HEADER_STDC
+dnl AC_CHECK_HEADERS([stdlib.h string.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+
+dnl # Checks for library functions.
+dnl # The program doesn't actually handle failure.
+dnl AC_FUNC_MALLOC
+dnl AC_CHECK_FUNCS([memset strtol])
+
+AC_OUTPUT([Makefile])