guile/guile-scsh ChangeLog Makefile.am README c...

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   00/11/27 15:59:16

Modified files:
        guile-scsh     : ChangeLog Makefile.am README configure.in 
Added files:
        guile-scsh     : AUTHORS NEWS autogen.sh 
Removed files:
        guile-scsh     : INSTALL Makefile.in aclocal.m4 configure 
                         install-sh missing mkinstalldirs 

Log message:
        * Removed auto-generated files from the CVS repository.
        
        * configure.in: don't use AM_MAINTAINER_MODE.  set version to 0.0.
        check for guile-config.
        
        * Makefile.am (scsh_DATA): updated the file list.  rename to
        subpkgdata_DATA.
        (EXTRA_DIST): add autogen.sh.
        (subpkgdatadir): new variable, set via configure.
        
        * autogen.sh: new file.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/AUTHORS.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/NEWS.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/autogen.sh.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/ChangeLog.diff?r1=1.43&r2=1.44
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/Makefile.am.diff?r1=1.18&r2=1.19
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/README.diff?r1=1.10&r2=1.11
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/configure.in.diff?r1=1.5&r2=1.6
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/INSTALL.diff?r1=1.1&r2=NONE
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/Makefile.in.diff?r1=1.22&r2=NONE
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/aclocal.m4.diff?r1=1.8&r2=NONE
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/configure.diff?r1=1.10&r2=NONE
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/install-sh.diff?r1=1.1&r2=NONE
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/missing.diff?r1=1.1&r2=NONE
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/mkinstalldirs.diff?r1=1.1&r2=NONE

Patches:
Index: guile/guile-scsh/ChangeLog
diff -u guile/guile-scsh/ChangeLog:1.43 guile/guile-scsh/ChangeLog:1.44
--- guile/guile-scsh/ChangeLog:1.43     Mon Nov 27 13:27:04 2000
+++ guile/guile-scsh/ChangeLog  Mon Nov 27 15:59:16 2000
@@ -1,5 +1,17 @@
 2000-11-27  Gary Houston  <address@hidden>
 
+       * Removed auto-generated files from the CVS repository.
+
+       * configure.in: don't use AM_MAINTAINER_MODE.  set version to 0.0.
+       check for guile-config.
+
+       * Makefile.am (scsh_DATA): updated the file list.  rename to
+       subpkgdata_DATA.
+       (EXTRA_DIST): add autogen.sh.
+       (subpkgdatadir): new variable, set via configure.
+       
+       * autogen.sh: new file.
+       
        * USAGE, README: updated.
 
        * lib/list-lib.scm (for-each): define
Index: guile/guile-scsh/Makefile.am
diff -u guile/guile-scsh/Makefile.am:1.18 guile/guile-scsh/Makefile.am:1.19
--- guile/guile-scsh/Makefile.am:1.18   Sun Oct 29 11:53:23 2000
+++ guile/guile-scsh/Makefile.am        Mon Nov 27 15:59:16 2000
@@ -1,18 +1,27 @@
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = foreign
+# AUTOMAKE_OPTIONS = foreign
 
-scshdir = $(datadir)/guile/scsh
-scsh_DATA = alt-syntax.scm awk.scm bitwise.scm char-set.scm condition.scm \
-       defrec.scm ekko.scm enumconst.scm \
-       errno.scm fileinfo.scm filemtch.scm filesys.scm \
+subpkgdatadir = @GUILE_SCSH_DIR@
+
+subpkgdata_DATA = alt-syntax.scm ascii.scm awk.scm bitwise.scm \
+       char-set.scm \
+       defrec.scm ekko.scm errno.scm features.scm \
+       fileinfo.scm filemtch.scm filesys.scm \
        fluid.scm fname.scm fr.scm glob.scm here.scm \
-       init.scm let-opt.scm netconst.scm \
-       network.scm newports.scm population.scm procobj.scm \
-       rdelim.scm re.scm receive.scm rw.scm \
+       init.scm let-opt.scm \
+       lib/list-lib.scm lib/string-lib.scm \
+       loophole.scm module-system.scm \
+       netconst.scm network.scm newports.scm population.scm \
+       primitives.scm procobj.scm \
+       rdelim.scm reading.scm receive.scm rw.scm \
+       rx/cond-package.scm rx/let-match.scm rx/oldfuns.scm \
+       rx/parse.scm rx/posixstr.scm rx/re-fold.scm rx/re-high.scm \
+       rx/re-low.scm rx/re-subst.scm \
+       rx/re-syntax.scm rx/re.scm rx/rx-lib.scm rx/simp.scm rx/spencer.scm \
        scsh.scm scsh-condition.scm scsh-version.scm \
-       sighandlers.scm stringcoll.scm \
+       sighandlers.scm signals.scm stringcoll.scm \
        syntax.scm syntax-helpers.scm syscalls.scm \
        time.scm utilities.scm weak.scm
 
-EXTRA_DIST = $(scsh_DATA) INCOMPAT USAGE make-module-list
+EXTRA_DIST = $subpkgdatadir_DATA INCOMPAT USAGE make-module-list autogen.sh
Index: guile/guile-scsh/README
diff -u guile/guile-scsh/README:1.10 guile/guile-scsh/README:1.11
--- guile/guile-scsh/README:1.10        Mon Nov 27 13:27:04 2000
+++ guile/guile-scsh/README     Mon Nov 27 15:59:16 2000
@@ -18,52 +18,16 @@
 
 To install the package, use something like:
 
-configure --prefix=/usr/local
-make
+./configure
 make install
 
-For now, the configure prefix must match the one where Guile is installed.
-(FIXME: use guile-config to find the installation directory).
+The configure script will attempt to install guile-scsh in the Guile
+site directory, as reported by guile-config in the current PATH.
+Supplying a prefix argument to configure doesn't have any effect.
 
-See the INSTALL file for more details.
-
 Alternatively it's sufficient to rename (or link) the main guile-scsh
 directory to "scsh" and place it somewhere in the guile load path (type
 %load-path in an interactive Guile session to see the current
 setting).
 
 See the USAGE file for notes on using the library.
-
-FIXME: delete the autogenerated files from the repository and remove
-the text below.
-
-Hacking It Yourself ==================================================
-
-As distributed, the Guile SCSH port needs only a Unix system to build
-and install.  However, its makefiles, configuration scripts, and a few
-other files are automatically generated, not written by hand.  If you
-want to make changes to the system (which we encourage!) you will find
-it helpful to have the tools we use to develop it.  They are the
-following:
-
-Autoconf 2.12 --- a system for automatically generating `configure'
-       scripts from templates which list the non-portable features a
-       program would like to use.  Available in
-       "ftp://prep.ai.mit.edu/pub/gnu";.
-
-Automake 1.1p --- a system for automatically generating Makefiles that
-       conform to the (rather Byzantine) GNU coding standards.  The
-       nice thing is that it takes care of hairy targets like 'make
-       dist' and 'make distclean', and automatically generates
-       Makefile dependencies.  Available in
-       "ftp://ftp.cygnus.com/pub/tromey";.
-
-libtool 0.9d --- a system for managing the zillion hairy options needed
-       on various systems to produce shared libraries.  Available in
-       "ftp://alpha.gnu.ai.mit.edu/gnu";.
-
-You are lost in a little maze of automatically generated files, all
-different.
-> 
-
-
Index: guile/guile-scsh/configure.in
diff -u guile/guile-scsh/configure.in:1.5 guile/guile-scsh/configure.in:1.6
--- guile/guile-scsh/configure.in:1.5   Sat Jun 14 23:53:25 1997
+++ guile/guile-scsh/configure.in       Mon Nov 27 15:59:16 2000
@@ -1,5 +1,12 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(network.scm)
-AM_INIT_AUTOMAKE(guile-scsh, 1.2a, no-define)
-AM_MAINTAINER_MODE
+AC_INIT(scsh.scm)
+AM_INIT_AUTOMAKE(guile-scsh, 0.0, no-define)
+
+AC_CHECK_PROG(have_guile, guile-config, yes, no)
+if test $have_guile = no; then
+   AC_MSG_ERROR([guile-config not found])
+fi
+GUILE_SCSH_DIR=`guile-config info pkgdatadir`/site/scsh
+AC_MSG_RESULT(* directory for make install is $GUILE_SCSH_DIR)
+AC_SUBST(GUILE_SCSH_DIR)
 AC_OUTPUT(Makefile)