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

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/06/27 13:31:25

Modified files:
        guile-scsh     : ChangeLog Makefile.am README configure.in 
Added files:
        guile-scsh/rx  : .cvsignore Makefile.am 

Log message:
        * configure.in: converted for autoconf 2.50: remove AC_INIT arg,
        add AC_CONFIG_SRCDIR.
        (GUILE_SCSH_DIR): removed.  don't install to directory
        reported by guile-config, but use the datadir which is
        derived from prefix by default.
        don't test for guile-config.
        add rx/Makefile.
        * Makefile.am (pkgdatadir): derive it from datadir.
        add rx to SUBDIRS.  remove mkinstalldirs rx hack from
        install-exec-local.
        (EXTRA_DIST): fix the RHS.
        (pkgdata_DATA): remove rx subdir files.
        * rx/Makefile.am: new file.
        * README: updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/ChangeLog.diff?cvsroot=OldCVS&tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/Makefile.am.diff?cvsroot=OldCVS&tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/README.diff?cvsroot=OldCVS&tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/configure.in.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/.cvsignore?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/Makefile.am?cvsroot=OldCVS&rev=1.1

Patches:
Index: guile/guile-scsh/ChangeLog
diff -u guile/guile-scsh/ChangeLog:1.61 guile/guile-scsh/ChangeLog:1.62
--- guile/guile-scsh/ChangeLog:1.61     Tue Jun 12 14:36:51 2001
+++ guile/guile-scsh/ChangeLog  Wed Jun 27 13:31:25 2001
@@ -1,3 +1,20 @@
+2001-06-27  Gary Houston  <address@hidden>
+
+       * configure.in: converted for autoconf 2.50: remove AC_INIT arg,
+       add AC_CONFIG_SRCDIR.
+       (GUILE_SCSH_DIR): removed.  don't install to directory
+       reported by guile-config, but use the datadir which is
+       derived from prefix by default.
+       don't test for guile-config.
+       add rx/Makefile.
+       * Makefile.am (pkgdatadir): derive it from datadir.
+       add rx to SUBDIRS.  remove mkinstalldirs rx hack from
+       install-exec-local.
+       (EXTRA_DIST): fix the RHS.
+       (pkgdata_DATA): remove rx subdir files.
+       * rx/Makefile.am: new file.
+       * README: updated.
+
 2001-06-12  Gary Houston  <address@hidden>
 
        * network.scm (socket-connect): export socket-connect.
Index: guile/guile-scsh/Makefile.am
diff -u guile/guile-scsh/Makefile.am:1.23 guile/guile-scsh/Makefile.am:1.24
--- guile/guile-scsh/Makefile.am:1.23   Wed Dec  6 15:10:39 2000
+++ guile/guile-scsh/Makefile.am        Wed Jun 27 13:31:25 2001
@@ -1,9 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 
-# AUTOMAKE_OPTIONS = foreign
+pkgdatadir = ${datadir}/guile/site/scsh
 
-pkgdatadir = @GUILE_SCSH_DIR@
-
 pkgdata_DATA = alt-syntax.scm ascii.scm awk.scm bitwise.scm \
        char-set.scm define-foreign-syntax.scm \
        defrec.scm ekko.scm errno.scm fdports.scm features.scm \
@@ -15,10 +13,6 @@
        netconst.scm network.scm newports.scm population.scm \
        primitives.scm procobj.scm \
        rdelim.scm reading.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 signals.scm stringcoll.scm \
        syntax.scm syntax-helpers.scm syscalls.scm \
@@ -27,6 +21,7 @@
 install-exec-local:
        $(srcdir)/mkinstalldirs $(pkgdatadir)/rx
        $(srcdir)/mkinstalldirs $(pkgdatadir)/lib
+
+EXTRA_DIST = $(pkgdata_DATA) INCOMPAT USAGE make-module-list autogen.sh
 
-EXTRA_DIST = $pkgdatadir_DATA $rxdata_DATA \
-       INCOMPAT USAGE make-module-list autogen.sh
+SUBDIRS = rx
Index: guile/guile-scsh/README
diff -u guile/guile-scsh/README:1.14 guile/guile-scsh/README:1.15
--- guile/guile-scsh/README:1.14        Thu Jan 25 13:50:54 2001
+++ guile/guile-scsh/README     Wed Jun 27 13:31:25 2001
@@ -1,4 +1,4 @@
-This is an incomplete port of the scheme shell, scsh 0.5.2, to Guile.
+This is an incomplete port of the Scheme Shell, scsh 0.5.2, to Guile.
 This is not a release of guile-scsh, but was presumably obtained at
 some random time from the CVS archive.
 
@@ -12,7 +12,8 @@
 as guile-scsh.  Version 1.4 is too old.
 
 2) The guilerxspencer module, available from http://arglist.com/guile/
-(although some scsh modules can still be used if it's not installed.)
+A few guile-scsh modules can still be used if it's not installed.
+It's possible to install guile-scsh first and guilerxspencer later.
 
 Please send bug reports to:
 
@@ -20,16 +21,20 @@
 
 To install the package, use something like:
 
-./configure
+./configure --prefix=<see below>
 make install
 
-The configure script will attempt to locate the Guile site directory,
-as reported by guile-config in the current PATH.  Supplying a prefix
-argument to configure doesn't have any effect.
+The prefix given to configure should probably match the prefix where
+Guile's site directory can be found.  Otherwise Guile won't find the
+module without further configuration.  E.g.,
 
+--prefix=/usr --> /usr/share/guile/site
+--prefix=/usr/local --> /usr/local/share/guile/site
+
 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.
+See the USAGE file for notes on using the library and INSTALL for 
+generic configure documentation.
Index: guile/guile-scsh/configure.in
diff -u guile/guile-scsh/configure.in:1.6 guile/guile-scsh/configure.in:1.7
--- guile/guile-scsh/configure.in:1.6   Mon Nov 27 15:59:16 2000
+++ guile/guile-scsh/configure.in       Wed Jun 27 13:31:25 2001
@@ -1,12 +1,6 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(scsh.scm)
+AC_INIT
+AC_CONFIG_SRCDIR(scsh.scm)
+AC_CONFIG_FILES(rx/Makefile)
 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)