summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2012-01-15 22:41:53 +0000
committerPaul Smith <psmith@gnu.org>2012-01-15 22:41:53 +0000
commitc992c4d80f51540699f33fed067caf6b7c38df79 (patch)
tree2e8bee26fd19820b85422752724e87639d1b0c77 /main.c
parent3057357c0a5c2507eef2b61eef9ebfb569b30230 (diff)
downloadgunmake-c992c4d80f51540699f33fed067caf6b7c38df79.tar.gz
Add GNU Guile as an optional embedded scripting language for make.
On configure-enabled systems, configure will detect Guile installed (using pkg-config, which is how GNU Guile is distributed) and enable it if so. On all non-configure-enabled systems, currently, the default is for Guile support to be disabled.
Diffstat (limited to 'main.c')
-rw-r--r--main.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/main.c b/main.c
index 86a89ad..589ff5e 100644
--- a/main.c
+++ b/main.c
@@ -910,7 +910,6 @@ open_tmpfile(char **name, const char *template)
#endif
}
-
#ifdef _AMIGA
int
main (int argc, char **argv)
@@ -958,7 +957,7 @@ main (int argc, char **argv, char **envp)
#endif
/* Needed for OS/2 */
- initialize_main(&argc, &argv);
+ initialize_main (&argc, &argv);
reading_file = 0;
@@ -1125,6 +1124,7 @@ main (int argc, char **argv, char **envp)
}
else
directory_before_chdir = xstrdup (current_directory);
+
#ifdef __MSDOS__
/* Make sure we will return to the initial directory, come what may. */
atexit (msdos_return_to_initial_directory);
@@ -1156,6 +1156,11 @@ main (int argc, char **argv, char **envp)
define_variable_cname (".FEATURES", features, o_default, 0);
}
+#ifdef HAVE_GUILE
+ /* Configure GNU Guile support */
+ setup_guile ();
+#endif
+
/* Read in variables from the environment. It is important that this be
done before $(MAKE) is figured out so its definitions will not be
from the environment. */
@@ -2362,7 +2367,7 @@ main (int argc, char **argv, char **envp)
}
/* NOTREACHED */
- return 0;
+ exit(0);
}
/* Parsing of arguments, decoding of switches. */