Polished configuration scripts.

diff --git a/Makefile b/Makefile
index 226437e9869a679280442dff27583c17a39e1bb0..a9e357236156d0376d251390e1f3ee4b2876377e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,10 @@ include $(s)/box/Makefile
 include $(s)/utils/Makefile
 include $(s)/eval/Makefile
 include $(s)/judge/Makefile
+
+ifdef CONFIG_SUBMIT
 include $(s)/submit/Makefile
+endif
 
 # And finally the default rules of the build system
 include $(s)/build/Makebottom

diff --git a/TODO b/TODO
index 258ee52aa4d52bffc2ba36073c403173a3afa609..272cd0a1826dd1bb3a17ea2d00771713e9d6a38b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,7 @@
 New directory layout
 ~~~~~~~~~~~~~~~~~~~~
 mop/ and public/ are broken
+sync with main libucw repo
 
 Evaluator
 ~~~~~~~~~

diff --git a/default.cfg b/default.cfg
index 703863c2255fc6b50b51fcc131917c37f4310a1b..749fa103533377ea45a48c4c00e177bf2545b57d 100644 (file)
--- a/default.cfg
+++ b/default.cfg
@@ -1,5 +1,8 @@
 # Default configuration file for MO-Eval
 
+# Compile the submit server
+Set("CONFIG_SUBMIT" => 1);
+
 # Settings of libucw
 UnSet("CONFIG_SHARED");
 UnSet("CONFIG_UCW_THREADS");

diff --git a/lib/default.cfg b/lib/default.cfg
index ceb6d58680fad665067ef07cbe31a2cf36032674..d61c2e906b1f6e496e817aaab21b3de5a4ba4e10 100644 (file)
--- a/lib/default.cfg
+++ b/lib/default.cfg
@@ -19,7 +19,7 @@ UnSet("CONFIG_SHARED");
 # If your system doesn't contain GNU libc 2.3 or newer, it's recommended to let Sherlock
 # use its own regex library (a copy of the glibc one), because the default regex library
 # is likely to be crappy.
-Set("CONFIG_OWN_REGEX");
+UnSet("CONFIG_OWN_REGEX");
 
 # If your system can't reset getopt with 'optind = 0', you need to compile our internal copy
 # of GNU libc's getopt. This should not be necessary on GNU libc.