summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBradley Smith2008-08-03 17:03:07 +0100
committerBradley Smith2008-08-03 17:03:07 +0100
commitbfb0bea90c2817950264dd2dc4622ace29985c9e (patch)
treee375b5c0dcea6ff28c1b2532f7e660b47aae5e71
parentFix bootstraping. (diff)
downloadgnurobots-bfb0bea90c2817950264dd2dc4622ace29985c9e.tar.gz
Use pkg-config to check for Guile 1.8.
Signed-off-by: Bradley Smith <brad@brad-smith.co.uk>
-rw-r--r--configure.ac5
-rw-r--r--src/Makefile.am2
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index d355154..8fb7b15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,9 @@ AM_INIT_AUTOMAKE
dnl Checks for programs.
AC_PROG_CC
-dnl Check for guile
-GUILE_FLAGS
+PKG_CHECK_MODULES(GUILE, guile-1.8)
+AC_SUBST(GUILE_LIBS)
+AC_SUBST(GUILE_CFLAGS)
PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= 2.4)
AC_SUBST(GTHREAD2_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 75522e7..910286b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,5 +28,5 @@ INCLUDES = $(GUILE_CFLAGS) $(READLINE_CFLAGS) $(GTK2_CFLAGS) $(VTE_CFLAGS) \
gnurobots_SOURCES = main.c api.c map.c grobot.c \
ui-window.c ui-cmdwin.c ui-arena.c
-gnurobots_LDFLAGS = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \
+gnurobots_LDFLAGS = $(GUILE_LIBS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \
$(GTK2_LIBS) $(VTE_LIBS) -lutil