diff options
| author | Bradley Smith | 2008-08-03 20:50:59 +0100 |
|---|---|---|
| committer | Bradley Smith | 2008-08-03 20:50:59 +0100 |
| commit | d2262efed6d2656deceab0249724a46d2057b53b (patch) | |
| tree | 8255763ce687652bf1ce04c94a01460a74f02d78 | |
| parent | Generate Changelog (diff) | |
| download | gnurobots-d2262efed6d2656deceab0249724a46d2057b53b.tar.gz | |
Adjust build system.
Signed-off-by: Bradley Smith <brad@brad-smith.co.uk>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 14 insertions, 6 deletions
@@ -1,5 +1,9 @@ 2008-08-03 Bradley Smith <brad@brad-smith.co.uk> + Adjust build system. + + Generate Changelog + Make minor corrections to build system. Generate Changelog diff --git a/configure.ac b/configure.ac index c3e1af2..f69de6a 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,7 @@ AM_INIT_AUTOMAKE dnl Checks for programs. AC_PROG_CC -PKG_CHECK_MODULES(GUILE, guile-1.8) -AC_SUBST(GUILE_LIBS) -AC_SUBST(GUILE_CFLAGS) +GUILE_FLAGS PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= 2.4) AC_SUBST(GTHREAD2_LIBS) @@ -78,9 +76,15 @@ AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(getopt.h) AC_CHECK_HEADERS(pty.h) -AC_CHECK_LIB(util, openpty, [], AC_MSG_ERROR([ +AC_CHECK_LIB(util, openpty, [], AC_MSG_ERROR([ -You need openpty to build the program. +You need openpty to build this program. + +])) + +AC_CHECK_LIB(guile, scm_to_locale_string, [], AC_MSG_ERROR([ + +You need guile 1.8 to build this program. ])) diff --git a/src/Makefile.am b/src/Makefile.am index 910286b..75522e7 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_LIBS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \ +gnurobots_LDFLAGS = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \ $(GTK2_LIBS) $(VTE_LIBS) -lutil |