summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain R. Learmonth2014-09-15 13:11:22 -0500
committerJoshua Judson Rosen2017-03-28 01:43:27 -0400
commitda3b84b952d7aeb1a419ebc7a91206b619e53342 (patch)
tree4ac97769e4664006ddb3f380c9dc2d9da038df27
parentVC: ignore "compile" script inserted by Autotools (diff)
downloadgnurobots-da3b84b952d7aeb1a419ebc7a91206b619e53342.tar.gz
Migrate to guile 2.0
Fixes: <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746000>
-rw-r--r--configure.ac4
-rw-r--r--include/api.h2
-rw-r--r--src/ui-cmdwin.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 12cfeba..4c6fbb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,9 +82,9 @@ You need openpty to build this program.
]))
-AC_CHECK_LIB(guile, scm_to_locale_string, [], AC_MSG_ERROR([
+AC_CHECK_LIB(guile-2.0, scm_to_locale_string, [], AC_MSG_ERROR([
-You need guile 1.8 to build this program.
+You need guile 2.0 to build this program.
]))
diff --git a/include/api.h b/include/api.h
index 240312d..eb58783 100644
--- a/include/api.h
+++ b/include/api.h
@@ -21,7 +21,7 @@
#define _API_H
#include <glib.h>
-#include <guile/gh.h> /* GNU Guile high */
+#include <libguile.h> /* GNU Guile high */
void api_init (void);
diff --git a/src/ui-cmdwin.c b/src/ui-cmdwin.c
index 71f7b53..c96388e 100644
--- a/src/ui-cmdwin.c
+++ b/src/ui-cmdwin.c
@@ -22,7 +22,7 @@
#include <pty.h>
#include <vte/vte.h>
-#include <readline.h>
+#include <readline/readline.h>
#include <history.h>
struct _UICmdWinPrivate