From 246c3beff30c27cb3f1b3bf6231ede77e244210e Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Thu, 9 Mar 2006 13:04:59 +0000 Subject: [PATCH] * Added a conditional to only build the kernel if --enable-vga was set. --- caca/Makefile.am | 3 ++- configure.ac | 1 + kernel/Makefile.am | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/caca/Makefile.am b/caca/Makefile.am index 672c2e6..8150d93 100644 --- a/caca/Makefile.am +++ b/caca/Makefile.am @@ -14,10 +14,11 @@ libcaca_la_SOURCES = \ driver_conio.c \ driver_gl.c \ driver_ncurses.c \ + driver_network.c \ driver_slang.c \ + driver_vga.c \ driver_win32.c \ driver_x11.c \ - driver_network.c \ $(NULL) libcaca_la_CPPFLAGS = -I$(top_srcdir)/cucul libcaca_la_LDFLAGS = -no-undefined diff --git a/configure.ac b/configure.ac index bcc54a5..be70bd9 100644 --- a/configure.ac +++ b/configure.ac @@ -180,6 +180,7 @@ if test "${enable_vga}" = "yes"; then AC_DEFINE(USE_VGA, 1, Define to activate the VGA backend driver) CACA_DRIVERS="${CACA_DRIVERS} vga" fi +AM_CONDITIONAL(USE_KERNEL, test "${ac_cv_my_have_vga}" = "yes") AC_MSG_CHECKING(valid output drivers) if test -z "${CACA_DRIVERS}"; then diff --git a/kernel/Makefile.am b/kernel/Makefile.am index 6fb0489..a440373 100644 --- a/kernel/Makefile.am +++ b/kernel/Makefile.am @@ -1,6 +1,10 @@ # $Id: Makefile.am 326 2006-03-06 20:57:14Z sam $ -lib_LTLIBRARIES = libkernel.la +lib_LTLIBRARIES = $(libkernel_la) + +if USE_KERNEL +libkernel_la = libkernel.la +endif libkernel_la_SOURCES = \ kernel.c \