summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/load.c10
-rw-r--r--libguile/script.c8
2 files changed, 10 insertions, 8 deletions
diff --git a/libguile/load.c b/libguile/load.c
index abd5b1ca3..c64c746d6 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -27,6 +27,7 @@
#include <stdio.h>
#include "libguile/_scm.h"
+#include "libguile/private-gc.h" /* scm_getenv_int */
#include "libguile/libpath.h"
#include "libguile/fports.h"
#include "libguile/read.h"
@@ -901,9 +902,12 @@ scm_init_load ()
scm_loc_compile_fallback_path
= SCM_VARIABLE_LOC (scm_c_define ("%compile-fallback-path", SCM_BOOL_F));
- scm_loc_load_should_autocompile
- = SCM_VARIABLE_LOC (scm_c_define ("%load-should-autocompile", SCM_BOOL_F));
-
+ {
+ SCM autocomp = scm_from_bool (scm_getenv_int ("GUILE_AUTO_COMPILE", 1));
+ scm_loc_load_should_autocompile
+ = SCM_VARIABLE_LOC (scm_c_define ("%load-should-autocompile", autocomp));
+ }
+
the_reader = scm_make_fluid ();
scm_fluid_set_x (the_reader, SCM_BOOL_F);
scm_c_define("current-reader", the_reader);
diff --git a/libguile/script.c b/libguile/script.c
index 2f2495774..3ba656fcf 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -720,13 +720,11 @@ scm_compile_shell_switches (int argc, char **argv)
tail = scm_cons (scm_cons (sym_load_user_init, SCM_EOL), tail);
}
- /* If GUILE_AUTO_COMPILE is not set and no args are given, default to
- autocompilation. */
- if (turn_on_autocompile || (scm_getenv_int ("GUILE_AUTO_COMPILE", 1)
- && !dont_turn_on_autocompile))
+ /* If we are given an autocompilation arg, set %load-should-autocompile. */
+ if (turn_on_autocompile || dont_turn_on_autocompile)
{
tail = scm_cons (scm_list_3 (sym_set_x, sym_sys_load_should_autocompile,
- SCM_BOOL_T),
+ scm_from_bool (turn_on_autocompile)),
tail);
}