Re: guile-1.6, and compiling without debugging symbols

[Matt Rice]

ok so I redid into 2 patches,
I haven't tried them with 1.4 but I think it should
work


I also had to regenerate the configure script in
ScriptKit/


matt

__________________________________________________
Do you Yahoo!?
Yahoo! Tax Center - File online, calculators, forms, and more
http://tax.yahoo.com

? dl-without-debug.diff
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  5 Apr 2003 02:20:41 -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: 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        5 Apr 2003 01:56:37 -0000
@@ -44,6 +44,12 @@
 
 #include <string.h>
 
+#ifdef HAVE_SCM_C_DEFINE_GSUBR
+#define CFUN(X,A1,A2,A3,P) scm_c_define_gsubr(X,A1,A2,A3,P)
+#else
+#define CFUN(X,A1,A2,A3,P) scm_make_gsubr(X,A1,A2,A3,P)
+#endif
+
 static GuileInterpreter *currentInterpreter = nil;
 // static NSLock *singleInterpreterLock = nil;
 
@@ -163,8 +169,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);
+      CFUN(script_kit_lookup_n, 1, 0, 0, script_kit_lookup_fn);
+      CFUN(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        5 Apr 2003 01:56:39 -0000
@@ -40,6 +40,10 @@
 #define DEBUG_INIT_DEALLOC(X...)       DEBUG_PRINT 
(GUILESCM_DEBUG_INIT_DEALLOC, X)
 #define DEBUG_MAPPER(X...)             DEBUG_PRINT (GUILESCM_DEBUG_MAPPER, X)
 
+#ifdef HAVE_SCM_GC_PROTECT_OBJECT
+#define scm_protect_object scm_gc_protect_object
+#endif
+
 static int GuileSCM_debug_flag = 0;
 static GuileSCM *GuileSCM_nil = nil;