Move Guile setup stuff down under 'External libraries'.

1 files changed, 59 insertions, 58 deletions

diff --git a/configure.in b/configure.in
index b8d677e5e8..f38838d1be 100644
--- a/configure.in
+++ b/configure.in
@@ -88,17 +88,6 @@ AC_ARG_ENABLE(profile-mode,
 opt_profiler_mode=$enableval)
 AC_MSG_RESULT($opt_profiler_mode)
 
-opt_guile_bindings=yes
-AC_MSG_CHECKING([whether building Guile bindings])
-AC_ARG_ENABLE(guile,
-	AS_HELP_STRING([--enable-guile], [build GNU Guile bindings]),
-opt_guile_bindings=$enableval)
-AC_MSG_RESULT($opt_guile_bindings)
-
-AC_ARG_WITH([--with-guile-site-dir],
-  [AS_HELP_STRING([--with-guile-site-dir],
-     [use the given directory as the Guile site (use with care)])])
-
 AC_MSG_RESULT([***
 *** Checking for compilation programs...
 ])
@@ -118,54 +107,7 @@ if test "x$GAA" = "x"; then
 *** you may want to get it from http://gaa.sourceforge.net/
 ***]])
 fi
-
-if test "x$opt_guile_bindings" = "xyes"; then
-   AC_MSG_RESULT([***
-*** Detecting GNU Guile...
-])
-
-   AC_PATH_PROG([guile_snarf], [guile-snarf])
-   if test "x$guile_snarf" = "x"; then
-      AC_MSG_WARN([`guile-snarf' from Guile 1.8 not found.  Guile bindings not built.])
-      opt_guile_bindings=no
-   else
-      GUILE_PROGS
-      GUILE_FLAGS
-
-      AC_MSG_CHECKING([whether GNU Guile 1.8 or later is available])
-      GUILE_CHECK([is_guile_1_8],
-         [(exit (string>=? (version) (number->string 1.8)))])
-
-      if test $is_guile_1_8 -eq 0; then
-        AC_MSG_RESULT([yes])
-	case "x$with_guile_site_dir" in 
-	     xno)
-		# Use the default $(GUILE_SITE).
-		GUILE_SITE_DIR
-		;;
-	     x|xyes)
-		# Automatically derive $(GUILE_SITE) from $(pkgdatadir).  This
-		# hack is used to allow `distcheck' to work (see
-		# `DISTCHECK_CONFIGURE_FLAGS' in the top-level `Makefile.am').
-		GUILE_SITE="\$(datadir)/guile/site"
-		AC_SUBST(GUILE_SITE)
-		;;
-	     *)
-		# Use the user-specified directory as $(GUILE_SITE).
-		GUILE_SITE="$with_guile_site_dir"
-		AC_SUBST(GUILE_SITE)
-		;;
-	esac
-      else
-        AC_MSG_RESULT([no])
-        AC_MSG_WARN([GNU Guile 1.8 or later is required.  Guile bindings not built.])
-        opt_guile_bindings=no
-      fi
-   fi
-fi
-
 AM_CONDITIONAL(HAVE_GCC,   test "x$GCC" = "xyes")
-AM_CONDITIONAL(HAVE_GUILE, test "x$opt_guile_bindings" = "xyes")
 
 
 AC_MSG_RESULT([***
@@ -343,6 +285,65 @@ AC_MSG_RESULT([***
 *** Checking for external libraries...
 ])
 
+# For Guile bindings.
+
+opt_guile_bindings=yes
+AC_MSG_CHECKING([whether building Guile bindings])
+AC_ARG_ENABLE(guile,
+	AS_HELP_STRING([--enable-guile], [build GNU Guile bindings]),
+opt_guile_bindings=$enableval)
+AC_MSG_RESULT($opt_guile_bindings)
+
+AC_ARG_WITH([--with-guile-site-dir],
+  [AS_HELP_STRING([--with-guile-site-dir],
+     [use the given directory as the Guile site (use with care)])])
+
+if test "x$opt_guile_bindings" = "xyes"; then
+   AC_MSG_RESULT([***
+*** Detecting GNU Guile...
+])
+
+   AC_PATH_PROG([guile_snarf], [guile-snarf])
+   if test "x$guile_snarf" = "x"; then
+      AC_MSG_WARN([`guile-snarf' from Guile 1.8 not found.  Guile bindings not built.])
+      opt_guile_bindings=no
+   else
+      GUILE_PROGS
+      GUILE_FLAGS
+
+      AC_MSG_CHECKING([whether GNU Guile 1.8 or later is available])
+      GUILE_CHECK([is_guile_1_8],
+         [(exit (string>=? (version) (number->string 1.8)))])
+
+      if test $is_guile_1_8 -eq 0; then
+        AC_MSG_RESULT([yes])
+	case "x$with_guile_site_dir" in 
+	     xno)
+		# Use the default $(GUILE_SITE).
+		GUILE_SITE_DIR
+		;;
+	     x|xyes)
+		# Automatically derive $(GUILE_SITE) from $(pkgdatadir).  This
+		# hack is used to allow `distcheck' to work (see
+		# `DISTCHECK_CONFIGURE_FLAGS' in the top-level `Makefile.am').
+		GUILE_SITE="\$(datadir)/guile/site"
+		AC_SUBST(GUILE_SITE)
+		;;
+	     *)
+		# Use the user-specified directory as $(GUILE_SITE).
+		GUILE_SITE="$with_guile_site_dir"
+		AC_SUBST(GUILE_SITE)
+		;;
+	esac
+      else
+        AC_MSG_RESULT([no])
+        AC_MSG_WARN([GNU Guile 1.8 or later is required.  Guile bindings not built.])
+        opt_guile_bindings=no
+      fi
+   fi
+fi
+AM_CONDITIONAL(HAVE_GUILE, test "x$opt_guile_bindings" = "xyes")
+
 AM_PATH_LIBGCRYPT($GNUTLS_GCRYPT_VERSION,,
 dnl Can't disable - gnutls depends on gcrypt
  	AC_MSG_ERROR([[