From 5805586f0ffb0a2ffc6537d3b29bd8907a158bc1 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Wed, 11 Jan 2006 14:10:41 +0100
Subject: [PATCH]

---
 Makefile.config.in        | 2 +-
 configure.in              | 6 +++---
 src/scripting/Makefile    | 2 +-
 src/scripting/scripting.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index c76bf3f8..3c6cb8b2 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -117,7 +117,7 @@ CONFIG_FTP = @CONFIG_FTP@
 CONFIG_GLOBHIST = @CONFIG_GLOBHIST@
 CONFIG_GNUTLS = @CONFIG_GNUTLS@
 CONFIG_GOPHER = @CONFIG_GOPHER@
-CONFIG_GUILE = @CONFIG_GUILE@
+CONFIG_SCRIPTING_GUILE = @CONFIG_SCRIPTING_GUILE@
 CONFIG_GZIP = @CONFIG_GZIP@
 CONFIG_HTML_HIGHLIGHT = @CONFIG_HTML_HIGHLIGHT@
 CONFIG_INTERLINK = @CONFIG_INTERLINK@
diff --git a/configure.in b/configure.in
index 5334134a..fd8e5796 100644
--- a/configure.in
+++ b/configure.in
@@ -659,7 +659,7 @@ if test "$enable_guile" = "yes"; then
 		GUILE_CFLAGS="`guile-config compile`"
 		LIBS="$GUILE_LIBS $LIBS"
 		CPPFLAGS="$CPPFLAGS $GUILE_CFLAGS"
-		EL_CONFIG(CONFIG_GUILE, [Guile])
+		EL_CONFIG(CONFIG_SCRIPTING_GUILE, [Guile])
 		AC_SUBST(GUILE_CFLAGS)
 		cat <<EOF
 ***********************************************************************
@@ -855,8 +855,8 @@ dnl ===================================================================
 dnl Setup global scripting
 dnl ===================================================================
 
-EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_GUILE CONFIG_SCRIPTING_LUA CONFIG_SCRIPTING_PERL CONFIG_PYTHON CONFIG_RUBY CONFIG_SM_SCRIPTING], [Browser scripting])
-AC_SUBST(CONFIG_GUILE)
+EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_SCRIPTING_GUILE CONFIG_SCRIPTING_LUA CONFIG_SCRIPTING_PERL CONFIG_PYTHON CONFIG_RUBY CONFIG_SM_SCRIPTING], [Browser scripting])
+AC_SUBST(CONFIG_SCRIPTING_GUILE)
 AC_SUBST(CONFIG_SCRIPTING_LUA)
 AC_SUBST(CONFIG_SCRIPTING_PERL)
 AC_SUBST(CONFIG_PYTHON)
diff --git a/src/scripting/Makefile b/src/scripting/Makefile
index 0328b38d..39c4cd5f 100644
--- a/src/scripting/Makefile
+++ b/src/scripting/Makefile
@@ -1,7 +1,7 @@
 top_builddir=../..
 include $(top_builddir)/Makefile.config
 
-SUBDIRS-$(CONFIG_GUILE)		+= guile
+SUBDIRS-$(CONFIG_SCRIPTING_GUILE)		+= guile
 SUBDIRS-$(CONFIG_SCRIPTING_LUA)		+= lua
 SUBDIRS-$(CONFIG_SCRIPTING_PERL)		+= perl
 SUBDIRS-$(CONFIG_PYTHON)	+= python
diff --git a/src/scripting/scripting.c b/src/scripting/scripting.c
index f7de3af0..5ce616f5 100644
--- a/src/scripting/scripting.c
+++ b/src/scripting/scripting.c
@@ -65,7 +65,7 @@ static struct module *scripting_modules[] = {
 #ifdef CONFIG_SCRIPTING_LUA
 	&lua_scripting_module,
 #endif
-#ifdef CONFIG_GUILE
+#ifdef CONFIG_SCRIPTING_GUILE
 	&guile_scripting_module,
 #endif
 #ifdef CONFIG_SCRIPTING_PERL