From bfb0bea90c2817950264dd2dc4622ace29985c9e Mon Sep 17 00:00:00 2001 From: Bradley Smith Date: Sun, 3 Aug 2008 17:03:07 +0100 Subject: Use pkg-config to check for Guile 1.8. Signed-off-by: Bradley Smith --- configure.ac | 5 +++-- src/Makefile.am | 2 +- 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 -- cgit v1.1