? guile.patch
? Library/gstep-guile.scm
Index: Greg/libtool
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/Greg/libtool,v
retrieving revision 1.17
diff -u -r1.17 libtool
--- Greg/libtool	15 Mar 2003 07:28:36 -0000	1.17
+++ Greg/libtool	4 Apr 2003 13:56:17 -0000
@@ -34,13 +34,13 @@
 if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 
 ### BEGIN LIBTOOL CONFIG
-# Libtool was configured as follows, on host tiptree:
+# Libtool was configured as follows, on host vespertine:
 #
 # CC="gcc" CFLAGS="-g -O2" CPPFLAGS="" \
 # LD="/usr/bin/ld" LDFLAGS="" LIBS="" \
 # NM="/usr/bin/nm -B" RANLIB="ranlib" LN_S="ln -s" \
 # DLLTOOL="" OBJDUMP="" AS="" \
-#   ./ltconfig --cache-file=.././config.cache --with-gcc --with-gnu-ld --enable-win32-dll --no-verify ./ltmain.sh i686-pc-linux-gnu
+#   ./ltconfig --cache-file=/dev/null --with-gcc --with-gnu-ld --enable-win32-dll --no-verify ./ltmain.sh i586-pc-linux-gnu
 #
 # Compiler and other test output produced by ltconfig, useful for
 # debugging ltconfig, is in ./config.log if it exists.
@@ -61,8 +61,8 @@
 fast_install=yes
 
 # The host system.
-host_alias=i686-pc-linux-gnu
-host=i686-pc-linux-gnu
+host_alias=i586-pc-linux-gnu
+host=i586-pc-linux-gnu
 
 # An echo program that does not interpret backslashes.
 echo="echo"
@@ -141,7 +141,7 @@
 link_static_flag="-static"
 
 # Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
+no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
 
 # Compiler flag to allow reflexive dlopens.
 export_dynamic_flag_spec="\${wl}--export-dynamic"
Index: Library/gg_class.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/Library/gg_class.m,v
retrieving revision 1.14
diff -u -r1.14 gg_class.m
--- Library/gg_class.m	15 Mar 2003 07:28:36 -0000	1.14
+++ Library/gg_class.m	4 Apr 2003 13:56:17 -0000
@@ -727,7 +727,7 @@
 		    mimp = gh_lookup((char*)name);
 		    free(name);
 		  }
-		scm_protect_object(mimp);	// Protect from GC
+		scm_gc_protect_object(mimp);	// Protect from GC
 		if (instance == YES)
 		  {
 		    NSMapInsert(cls->instance_methods,
Index: Library/gstep-guile.scm.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/Library/gstep-guile.scm.in,v
retrieving revision 1.3
diff -u -r1.3 gstep-guile.scm.in
--- Library/gstep-guile.scm.in	17 Mar 2003 14:21:11 -0000	1.3
+++ Library/gstep-guile.scm.in	4 Apr 2003 13:56:17 -0000
@@ -27,11 +27,11 @@
 
 (if (defined? 'load-extension)
   (begin
-    (load-extension "libgstep_guile_d" "gstep_init")
-    (load-extension "libgg_base_d" "gstep_link_base")
+    (load-extension "libgstep_guile" "gstep_init")
+    (load-extension "libgg_base" "gstep_link_base")
     (define-public (gstep-gui)
       (if (eq? '@ac_cv_header_AppKit_AppKit_h@ 'yes)
-	(load-extension "libgg_gui_d" "gstep_link_gui")
+	(load-extension "libgg_gui" "gstep_link_gui")
 	(begin
 	  (display "GNUstep GUI not supported in this configuration\n")
 	  #f
@@ -40,7 +40,7 @@
     )
     (define-public (gstep-gdl2)
       (if (eq? '@ac_cv_header_EOAccess_EOAccess_h@ 'yes)
-	(load-extension "libgg_gdl2_d" "gstep_link_gdl2")
+	(load-extension "libgg_gdl2" "gstep_link_gdl2")
 	(begin
 	  (display "GNUstep GDL2 not supported in this configuration\n")
 	  #f
@@ -50,15 +50,15 @@
   )
   (begin
     (if (not (feature? 'gstep-guile))
-      (dynamic-call "gstep_init" (dynamic-link "libgstep_guile_d.so"))
+      (dynamic-call "gstep_init" (dynamic-link "libgstep_guile.so"))
     )
     (if (not (feature? 'link_base))
-      (dynamic-call "gstep_link_base" (dynamic-link "libgg_base_d.so"))
+      (dynamic-call "gstep_link_base" (dynamic-link "libgg_base.so"))
     )
     (define-public (gstep-gui)
       (if (eq? '@ac_cv_header_AppKit_AppKit_h@ 'yes)
 	(if (not (feature? 'link_gui))
-	  (dynamic-call "gstep_link_gui" (dynamic-link "libgg_gui_d.so"))
+	  (dynamic-call "gstep_link_gui" (dynamic-link "libgg_gui.so"))
 	)
 	(begin
 	  (display "GNUstep GUI not supported in this configuration\n")
@@ -69,7 +69,7 @@
     (define-public (gstep-gdl2)
       (if (eq? '@ac_cv_header_EOAccess_EOAccess_h@ 'yes)
 	(if (not (feature? 'link_gdl2))
-	  (dynamic-call "gstep_link_gdl2" (dynamic-link "libgg_gdl2_d.so"))
+	  (dynamic-call "gstep_link_gdl2" (dynamic-link "libgg_gdl2.so"))
 	)
 	(begin
 	  (display "GNUstep GDL2 not supported in this configuration\n")
Index: Library/private.h
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/Library/private.h,v
retrieving revision 1.3
diff -u -r1.3 private.h
--- Library/private.h	16 Mar 2003 07:32:00 -0000	1.3
+++ Library/private.h	4 Apr 2003 13:56:17 -0000
@@ -57,11 +57,11 @@
 #define	CSEL(X) gh_define(#X, gh_str02scm((char*)sel_get_name(X)))
 
 #endif
-
+/*
 #ifdef HAVE_SCM_GC_PROTECT_OBJECT
 #define	scm_protect_object	scm_gc_protect_object
 #endif
-
+*/
 
 /*
  *	NOTE - OBJC_VERSION needs to be defined to be the version of the
Index: ScriptKit/Library/GuileInterpreter.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/ScriptKit/Library/GuileInterpreter.m,v
retrieving revision 1.3
diff -u -r1.3 GuileInterpreter.m
--- ScriptKit/Library/GuileInterpreter.m	2 Jan 2002 20:02:30 -0000	1.3
+++ ScriptKit/Library/GuileInterpreter.m	4 Apr 2003 13:56:18 -0000
@@ -163,8 +163,8 @@
   gh_eval_str("(use-modules (languages gstep-guile))");
   if (!proc_install)
     {
-      scm_make_gsubr(script_kit_lookup_n, 1, 0, 0, script_kit_lookup_fn);
-      scm_make_gsubr(script_kit_update_n, 2, 0, 0, script_kit_update_fn);
+      scm_c_define_gsubr(script_kit_lookup_n, 1, 0, 0, script_kit_lookup_fn);
+      scm_c_define_gsubr(script_kit_update_n, 2, 0, 0, script_kit_update_fn);
     }
 }
 
Index: ScriptKit/Library/GuileSCM.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/ScriptKit/Library/GuileSCM.m,v
retrieving revision 1.3
diff -u -r1.3 GuileSCM.m
--- ScriptKit/Library/GuileSCM.m	31 Jul 2001 03:02:34 -0000	1.3
+++ ScriptKit/Library/GuileSCM.m	4 Apr 2003 13:56:19 -0000
@@ -133,7 +133,7 @@
       }
 
     /* protect str from GC while we copy off its data */
-    scm_protect_object (scm);
+    scm_gc_protect_object (scm);
 
     str = SCM_CHARS (scm);
     len = SCM_LENGTH (scm);
@@ -304,7 +304,7 @@
   if (write2str == SCM_BOOL_F)
     {
       write2str = gh_eval_str ("(lambda (x) (call-with-output-string (lambda (port) (write x port))))");
-      scm_protect_object (write2str);
+      scm_gc_protect_object (write2str);
     }
   
   tmpstr = gh_scm2newstr (gh_call1 (write2str, value), NULL);
@@ -447,7 +447,7 @@
   SCM_NEWCELL(mapper_dummy);
   SCM_SETCAR (mapper_dummy, scm_tc16_mapper_dummy);
   SCM_SETCDR (mapper_dummy, 0);
-  scm_protect_object (mapper_dummy);
+  scm_gc_protect_object (mapper_dummy);
 
   map_SCM_to_GuileSCM = NSCreateMapTable(map_callbacks_for_SCM,
 					 NSNonOwnedPointerMapValueCallBacks,