1 files changed, 12 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac
index 33109df9..7982258c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,25 +1,25 @@
 AC_INIT([X15], [0.1], [rbraun@sceen.net], [x15])
 
-AC_CONFIG_SRCDIR([kern/printk.c])
+AC_CONFIG_SRCDIR([kern/config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([gnu check-news subdir-objects 1.10])
+AM_INIT_AUTOMAKE([foreign subdir-objects 1.10])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
          [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
 
 AC_PREFIX_DEFAULT([])
 AC_CANONICAL_HOST
-AM_PROG_AS
-AC_PROG_CC([gcc])
 AC_PROG_CPP
-AC_PROG_RANLIB
+AC_PROG_CC
+AM_PROG_AS
 AM_PROG_CC_C_O
 
+m4_include([arch/x86/configfrag.ac])
+
+AS_IF([test x"$arch" = x], [AC_MSG_ERROR([unsupported architecture])])
+AC_SUBST([arch])
 
-#
-# Arguments to configure
-#
 AC_ARG_ENABLE([debug],
               [AS_HELP_STRING([--disable-debug],
                               [disable the debugging facilities])])
@@ -30,37 +30,14 @@ AC_ARG_WITH([max-cpus],
             [opt_max_cpus=$withval],
             [opt_max_cpus=32])
 
-
-#
-# Deduce the output variable `systype' from the configuration parameters.
-#
-AS_CASE(["$host_cpu"],
-        [i?86|x86_64], [m4_include([arch/x86/configfrag.ac])],
-        [AC_MSG_ERROR([unsuported CPU type])])
-
-AC_SUBST([systype])
-
-# XXX Should be in an arch-specific file.
-AM_CONDITIONAL([X86], [test "$systype" = x86])
-AM_CONDITIONAL([I386], [test x"$opt_i386" = xyes])
-AM_CONDITIONAL([AMD64], [test x"$opt_amd64" = xyes])
-
-
-#
-# Options
-#
-AS_IF([test x"$enable_debug" = xno],
-      [AC_DEFINE([NDEBUG], [1], [general debugging])])
-
 AC_DEFINE([__KERNEL__], [1], [kernel code])
-AC_DEFINE_UNQUOTED([ARCH], [$systype], [arch])
+AC_DEFINE_UNQUOTED([ARCH], [$arch], [arch])
+AS_IF([test x"$enable_debug" = xno],
+      [AC_DEFINE([NDEBUG], [1], [disable debugging])])
 AC_DEFINE_UNQUOTED([MAX_CPUS], [$opt_max_cpus],
                    [maximum number of supported processors])
 
-
-#
-# Output
-#
+AH_BOTTOM([#include <kern/config.h>])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT