guile/guile-core ChangeLog configure.in libguil...

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/03/17 13:20:20

Modified files:
        guile-core     : ChangeLog configure.in 
        guile-core/libguile: ChangeLog Makefile.am sort.c 

Log message:
        * configure.in: don't append threads.doc to EXTRA_DOT_DOC_FILES,
        since EXTRA_DOT_DOC_FILES is redefined later.  define
        EXTRA_DOT_X_FILES and hand it to AC_SUBST.
        * sort.c (scm_sort): move sortvec variable to avoid a compiler
        warning when HAVE_ARRAYS is not defined.  move len too.
        * Makefile.am (DOT_X_FILES): remove net_db.x, posix.x, socket.x.
        (EXTRA_DOT_X_FILES): let configure set the value.
        (DOT_DOC_FILES): remove net_db.doc, posix.doc, socket.doc.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/ChangeLog.diff?r1=1.223&r2=1.224
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/configure.in.diff?r1=1.127&r2=1.128
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1329&r2=1.1330
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/Makefile.am.diff?r1=1.125&r2=1.126
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/sort.c.diff?r1=1.30&r2=1.31

Patches:
Index: guile/guile-core/ChangeLog
diff -u guile/guile-core/ChangeLog:1.223 guile/guile-core/ChangeLog:1.224
--- guile/guile-core/ChangeLog:1.223    Fri Mar  9 02:03:46 2001
+++ guile/guile-core/ChangeLog  Sat Mar 17 13:20:19 2001
@@ -1,3 +1,9 @@
+2001-03-17  Gary Houston  <address@hidden>
+
+       * configure.in: don't append threads.doc to EXTRA_DOT_DOC_FILES,
+       since EXTRA_DOT_DOC_FILES is redefined later.  define
+       EXTRA_DOT_X_FILES and hand it to AC_SUBST.
+
 2001-03-09  Martin Grabmueller  <address@hidden>
 
        * configure.in: Added header checks for crypt.h, sys/resource.h
Index: guile/guile-core/configure.in
diff -u guile/guile-core/configure.in:1.127 guile/guile-core/configure.in:1.128
--- guile/guile-core/configure.in:1.127 Fri Mar  9 02:03:46 2001
+++ guile/guile-core/configure.in       Sat Mar 17 13:20:19 2001
@@ -471,7 +471,6 @@
 
   ## Include the Guile thread interface in the library...
   LIBOBJS="$LIBOBJS threads.o"
-  EXTRA_DOT_DOC_FILES="$EXTRA_DOT_DOC_FILES threads.doc"
 
   ## ... and tell it which package to talk to.
   case "${THREAD_PACKAGE}" in
@@ -514,8 +513,9 @@
 ## given in LIBOBJS.  We'll call it LIBLOBJS.
 LIBLOBJS="`echo ${LIBOBJS} | sed 's/\.o/.lo/g'`"
 
-## We also need to create corresponding .doc files
+## We also need to create corresponding .doc and .x files
 EXTRA_DOT_DOC_FILES="`echo ${LIBOBJS} | sed 's/\.o/.doc/g'`"
+EXTRA_DOT_X_FILES="`echo ${LIBOBJS} | sed 's/\.o/.x/g'`"
 
 AC_SUBST(GUILE_MAJOR_VERSION)
 AC_SUBST(GUILE_MINOR_VERSION)
@@ -532,6 +532,7 @@
 AC_SUBST(AWK)
 AC_SUBST(LIBLOBJS)
 AC_SUBST(EXTRA_DOT_DOC_FILES)
+AC_SUBST(EXTRA_DOT_X_FILES)
 
 # Support for "make check"
 test_suite_dir="`(cd $srcdir ; pwd)`/test-suite"
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1329 
guile/guile-core/libguile/ChangeLog:1.1330
--- guile/guile-core/libguile/ChangeLog:1.1329  Sat Mar 17 08:59:48 2001
+++ guile/guile-core/libguile/ChangeLog Sat Mar 17 13:20:19 2001
@@ -1,5 +1,12 @@
 2001-03-17  Gary Houston  <address@hidden>
 
+       * sort.c (scm_sort): move sortvec variable to avoid a compiler
+       warning when HAVE_ARRAYS is not defined.  move len too.
+
+       * Makefile.am (DOT_X_FILES): remove net_db.x, posix.x, socket.x.
+       (EXTRA_DOT_X_FILES): let configure set the value.
+       (DOT_DOC_FILES): remove net_db.doc, posix.doc, socket.doc.
+
        * gc.c (scm_must_malloc): changed the comment explaining when
        scm_must variants of malloc/free etc., should be used, based on
        explanation from Dirk Herrmann.
Index: guile/guile-core/libguile/Makefile.am
diff -u guile/guile-core/libguile/Makefile.am:1.125 
guile/guile-core/libguile/Makefile.am:1.126
--- guile/guile-core/libguile/Makefile.am:1.125 Tue Mar  6 22:06:16 2001
+++ guile/guile-core/libguile/Makefile.am       Sat Mar 17 13:20:20 2001
@@ -55,16 +55,15 @@
     continuations.x debug.x dynl.x dynwind.x environments.x eq.x           \
     error.x eval.x evalext.x feature.x fluids.x fports.x gc.x goops.x      \
     gsubr.x guardians.x hash.x hashtab.x hooks.x init.x ioext.x iselect.x   \
-    keywords.x lang.x list.x load.x macros.x mallocs.x modules.x net_db.x   \
-    numbers.x objects.x objprop.x options.x pairs.x ports.x posix.x print.x \
+    keywords.x lang.x list.x load.x macros.x mallocs.x modules.x \
+    numbers.x objects.x objprop.x options.x pairs.x ports.x print.x \
     procprop.x procs.x properties.x random.x rdelim.x read.x root.x        \
-    scmsigs.x script.x simpos.x smob.x socket.x sort.x srcprop.x           \
+    scmsigs.x script.x simpos.x smob.x sort.x srcprop.x            \
     stackchk.x stacks.x stime.x strings.x strop.x strorder.x strports.x        
    \
     struct.x symbols.x tag.x throw.x values.x variable.x vectors.x         \
     version.x vports.x weaks.x
 
-EXTRA_DOT_X_FILES = debug-malloc.x filesys.x net_db.x posix.x ramap.x  \
-                    regex-posix.x socket.x threads.x unif.x
+EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@
 
 DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc            \
     boolean.doc chars.doc continuations.doc debug.doc dynl.doc            \
@@ -72,10 +71,10 @@
     feature.doc fluids.doc fports.doc gc.doc goops.doc gsubr.doc          \
     guardians.doc hash.doc hashtab.doc hooks.doc init.doc ioext.doc       \
     iselect.doc keywords.doc lang.doc list.doc load.doc macros.doc        \
-    mallocs.doc modules.doc net_db.doc numbers.doc objects.doc objprop.doc \
-    options.doc pairs.doc ports.doc posix.doc print.doc procprop.doc      \
+    mallocs.doc modules.doc numbers.doc objects.doc objprop.doc \
+    options.doc pairs.doc ports.doc print.doc procprop.doc        \
     procs.doc properties.doc random.doc rdelim.doc read.doc root.doc      \
-    scmsigs.doc script.doc simpos.doc smob.doc socket.doc sort.doc        \
+    scmsigs.doc script.doc simpos.doc smob.doc sort.doc           \
     srcprop.doc stackchk.doc stacks.doc stime.doc strings.doc strop.doc        
   \
     strorder.doc strports.doc struct.doc symbols.doc tag.doc throw.doc    \
     values.doc variable.doc vectors.doc version.doc vports.doc weaks.doc
Index: guile/guile-core/libguile/sort.c
diff -u guile/guile-core/libguile/sort.c:1.30 
guile/guile-core/libguile/sort.c:1.31
--- guile/guile-core/libguile/sort.c:1.30       Fri Mar  9 15:33:41 2001
+++ guile/guile-core/libguile/sort.c    Sat Mar 17 13:20:20 2001
@@ -751,14 +751,14 @@
            "elements.  This is not a stable sort.")
 #define FUNC_NAME s_scm_sort
 {
-  SCM sortvec;                 /* the vector we actually sort */
-  long len;                    /* list/vector length */
   if (SCM_NULLP(items))
     return SCM_EOL;
 
   SCM_VALIDATE_NIM (2,less);
   if (SCM_CONSP (items))
     {
+      long len;
+  
       SCM_VALIDATE_LIST_COPYLEN (1,items,len);
       items = scm_list_copy (items);
       return scm_merge_list_step (&items, scm_cmp_function (less), less, len);
@@ -767,8 +767,9 @@
   /* support ordinary vectors even if arrays not available?  */
   else if (SCM_VECTORP (items))
     {
-      len = SCM_VECTOR_LENGTH (items);
-      sortvec = scm_make_uve (len, scm_array_prototype (items));
+      long len = SCM_VECTOR_LENGTH (items);
+      SCM sortvec = scm_make_uve (len, scm_array_prototype (items));
+
       scm_array_copy_x (items, sortvec);
       scm_restricted_vector_sort_x (sortvec,
                                    less,