aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rwxr-xr-xgdb/configure2
-rw-r--r--gdb/configure.ac2
3 files changed, 7 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index baeb7fd..296ef22 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-26 Andy Wingo <wingo@igalia.com>
+
+ * configure.ac (try_guile_versions): Allow building with guile 2.2.
+ * configure: Regenerate.
+
2014-05-23 Markus Metzger <markus.t.metzger@intel.com>
* symfile-mem.c (symbol_file_add_from_memory): Add BFD sections.
diff --git a/gdb/configure b/gdb/configure
index fd61bb5..d7e5cef 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -8750,7 +8750,7 @@ fi
-try_guile_versions="guile-2.0"
+try_guile_versions="guile-2.2 guile-2.0"
have_libguile=no
case "${with_guile}" in
no)
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 494d711..ff84a2e 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1154,7 +1154,7 @@ AC_MSG_RESULT([$with_guile])
dnl We check guile with pkg-config.
AC_PATH_PROG(pkg_config_prog_path, pkg-config, missing)
-try_guile_versions="guile-2.0"
+try_guile_versions="guile-2.2 guile-2.0"
have_libguile=no
case "${with_guile}" in
no)