Merge pull request #247 from kyrias/with-guile

Add support for --with-guile configure flag

3 files changed, 35 insertions, 13 deletions

diff --git a/Makefile.in b/Makefile.in
index 216cbab..8873ea8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,6 +93,7 @@ stamps/build-binutils-linux: $(srcdir)/riscv-binutils-gdb
 		--prefix=$(INSTALL_DIR) \
 		--with-sysroot=$(SYSROOT) \
 		$(MULTILIB_FLAGS) \
+		@with_guile@ \
 		--disable-werror \
 		--disable-nls
 	$(MAKE) -C $(notdir $@)
@@ -212,6 +213,7 @@ stamps/build-binutils-newlib: $(srcdir)/riscv-binutils-gdb
 		--target=$(NEWLIB_TUPLE) \
 		$(CONFIGURE_HOST) \
 		--prefix=$(INSTALL_DIR) \
+		@with_guile@ \
 		--disable-werror
 	$(MAKE) -C $(notdir $@)
 	$(MAKE) -C $(notdir $@) install
diff --git a/configure b/configure
index 6b7e218..fa2f823 100755
--- a/configure
+++ b/configure
@@ -584,6 +584,7 @@ PACKAGE_URL=''
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+with_guile
 with_system_zlib
 configure_host
 cmodel
@@ -629,7 +630,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -661,6 +661,7 @@ enable_gcc_checking
 with_cmodel
 with_host
 with_system_zlib
+with_guile
 '
       ac_precious_vars='build_alias
 host_alias
@@ -708,7 +709,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -961,15 +961,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1107,7 +1098,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1260,7 +1251,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1311,6 +1301,7 @@ Optional Packages:
                           Sets the host for the tools, you probably want
                           nothing
   --without-system-zlib   use the builtin copy of zlib from GCC
+  --with-guile            Set which guile to use, if any
 
 Some influential environment variables:
   CC          C compiler command
@@ -3376,6 +3367,24 @@ else
 
 fi
 
+
+# Check whether --with-guile was given.
+if test "${with_guile+set}" = set; then :
+  withval=$with_guile;
+else
+  with_guile=default
+
+fi
+
+
+if test "x$with_guile" != xdefault; then :
+  with_guile=--with-guile=$with_guile
+
+else
+  with_guile=""
+
+fi
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/configure.ac b/configure.ac
index 01b72da..f9c7733 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,4 +146,15 @@ AS_IF([test "x$with_system_zlib" != xno],
 	[AC_SUBST(with_system_zlib,--with-system-zlib)],
 	[AC_SUBST(with_system_zlib,--without-system-zlib)])
 
+AC_ARG_WITH(guile,
+	[AC_HELP_STRING([--with-guile],
+			[Set which guile to use, if any])],
+	[],
+	[with_guile=default]
+	)
+
+AS_IF([test "x$with_guile" != xdefault],
+	[AC_SUBST(with_guile,--with-guile=$with_guile)],
+	[AC_SUBST(with_guile,"")])
+
 AC_OUTPUT