All configuration options (except for custom attributes which still dwell

in lib/custom.h) are now stored in config.mk to make them available to both
makefiles (conditional linking etc.) and C programs (lib/autoconf.h is
generated from config.mk by a simple shell script).

This gives an easy way how to create special-purpose modules (like the
SQL gatherer) which need extra libraries -- just make them a compile-time
option ;)

diff --git a/lib/config.h b/lib/config.h
index 566a06d88426f70d33db6bffb6fac9549415e356..66cc25a020295224912d5924a45e91a2786f631d 100644 (file)
--- a/lib/config.h
+++ b/lib/config.h
@@ -9,25 +9,13 @@
 
 /* Custom configuration */
 
+#include "lib/autoconf.h"
 #include "lib/custom.h"
 
 /* Version */
 
 #define SHER_VER "2.2a" SHER_SUFFIX
 
-/* CPU characteristics */
-
-#define CPU_I386
-#define CPU_LITTLE_ENDIAN
-#undef CPU_BIG_ENDIAN
-#define CPU_ALLOW_UNALIGNED
-#define CPU_STRUCT_ALIGN 4
-#undef CPU_64BIT_POINTERS
-
-/* OS characteristics */
-
-#define CONFIG_LINUX
-
 /* Paths */
 
 #define DEFAULT_CONFIG "cf/sherlock"