Add a configure switch to enable building of unit tests.

configure.ac

@@ -79,6 +79,11 @@ else
 	CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS"
 fi
 
+AC_ARG_ENABLE([tests],
+              AS_HELP_STRING([--enable-tests], [build unit tests]),
+	      [tests=$enableval],
+	      [tests=no])
+
 AC_ARG_ENABLE([static],
               AS_HELP_STRING([--enable-static], [enable static building of wesnoth]),
 	      [static=$enableval],
@@ -288,6 +293,7 @@ AM_CONDITIONAL([PYTHON_INSTALL], [test x$python_install = xyes])
 AM_CONDITIONAL([GAME], [test x$game = xyes])
 AM_CONDITIONAL([SERVER], [test x$server = xyes])
 AM_CONDITIONAL([CAMPAIGNSERVER], [test x$campaignserver = xyes])
+AM_CONDITIONAL([TESTS], [test x$tests = xyes])
 AM_CONDITIONAL([EDITOR], [test x$editor = xyes])
 AM_CONDITIONAL([USESVN], [test x$svnrev = xyes])
 AM_CONDITIONAL([TOOLS], [test x$tools = xyes])

src/Makefile.am

@@ -21,6 +21,10 @@ if CAMPAIGNSERVER
 bin_PROGRAMS += campaignd
 endif
 
+if TESTS
+bin_PROGRAMS += test
+endif
+
 CLEANFILES = 
 
 if TOOLS
@@ -289,6 +293,17 @@ exploder_DEPENDENCIES=libwesnoth-core.a
 cutter_LDADD = -L. -lwesnoth-core @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBINTL) $(PNG_LIBS)
 cutter_DEPENDENCIES=libwesnoth-core.a
 
+#############################################################################
+#    Castle building helpers                                                #
+#############################################################################
+
+test_SOURCES = \
+	tests/main.cpp \
+	tests/test_util.cpp
+
+test_LDADD = -L. -lwesnoth-core -lboost_unit_test_framework @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBINTL) $(PNG_LIBS) 
+test_DEPENDENCIES=libwesnoth-core.a
+
 #############################################################################
 #    Headers
 #############################################################################