Make unittests a compile-time option

diff --git a/configure.ac b/configure.ac
index bf60672d78b47586e6e5bd7ff7a05670eb2925c4..40559274167385ad950e3b14488b6a4da8c6caee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,11 +17,17 @@ LT_INIT
 AC_ARG_ENABLE([chainloader],
        AS_HELP_STRING([--disable-chainloader], [Disable chainloading of external programs]))
 
+AC_ARG_ENABLE([unittests],
+       AS_HELP_STRING([--enable-unittests], [Include unit tests in resultant binary.]))
+
 AC_PREFIX_DEFAULT([/corbenik])
 
+UNITTESTS=0
+test "$enable_unittests" = "yes" && UNITTESTS=1
+AC_DEFINE_UNQUOTED([UNITTESTS], [$UNITTESTS])
+
 CHAINLOADER=1
 test "$enable_chainloader" = "no" && CHAINLOADER=0
-
 AC_DEFINE_UNQUOTED([CHAINLOADER], [$CHAINLOADER])
 
 AC_CONFIG_FILES([Makefile source/Makefile external/Makefile include/Makefile])
@@ -46,6 +52,7 @@ ldflags:         ${LDFLAGS}
 ocflags:         ${OCFLAGS}
 
 Chainloader:     ${CHAINLOADER}
+Chainloader:     ${UNITTESTS}
 "
 
 AC_OUTPUT

diff --git a/include/corbconf.h b/include/corbconf.h
index 4e74f00f43f00fdb74e3a8c0f497ffc4e566bb9b..cec84b705fcf3e2b1404d7a918935c652192a1a2 100644 (file)
--- a/include/corbconf.h
+++ b/include/corbconf.h
@@ -3,6 +3,4 @@
 
 #include <config.h>
 
-#define UNITTESTS 1
-
 #endif