diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/configure.in b/configure.in index 1f1e20e8..5abaf129 100644 --- a/configure.in +++ b/configure.in @@ -12,13 +12,11 @@ dnl "AS IS" CONDITION. THE FREE SOFTWARE FOUNDATION DISCLAIMS ANY dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE dnl USE OF THIS SOFTWARE. -AC_INIT(kern/ipc_kobject.c) -AC_PREREQ(2.12) +AC_INIT([GNU Mach], [1.91], [bug-hurd@gnu.org], [gnumach]) +AC_CONFIG_SRCDIR([kern/ipc_kobject.c]) +AC_PREREQ(2.54) AC_CONFIG_HEADER(config.h) -VERSION=1.90 -AC_SUBST(VERSION) - # # Deduce output var `systype' from configuration parms. # @@ -54,11 +52,14 @@ xyes) AC_MSG_WARN([defaulting to max 4 CPUs; use --enable-smp=MAXCPUS]) x[[1-9]]*) MAXCPUS="${enable_smp}" ;; *) AC_MSG_ERROR([must give a numeric argument to --enable-smp]) ;; esac -AC_DEFINE_UNQUOTED(NCPUS, $MAXCPUS) +AC_DEFINE_UNQUOTED(NCPUS, $MAXCPUS, + [Define this to the maximum number of CPUs to support, + i.e. 1 for uniprocessor or 2 or more for SMP.]) AC_ARG_ENABLE(fpe, [ --enable-fpe enable FPU emulator for machines with no FPU], -[test "x$enableval" = xno || AC_DEFINE(FPE)]) +[test "x$enableval" = xno || + AC_DEFINE(FPE, 1, [Enable software FPU emulator for machines with no FPU.])]) # # Programs @@ -66,11 +67,7 @@ AC_ARG_ENABLE(fpe, AC_PROG_INSTALL AC_PROG_AWK - -AC_CHECK_TOOL(CC, gcc) -# That check handles cross-compilation well, but AC_PROG_CC tests for GCC -# and sets default CFLAGS nicely for us, so do that too. -AC_PROG_CC_LOCAL +AC_PROG_CC AC_CHECK_TOOL(LD, ld)AC_SUBST(LDFLAGS) AC_CHECK_TOOL(NM, nm) @@ -84,11 +81,12 @@ NEEDED_OSKIT_VERSION=19991121 AC_REQUIRE_CPP() AC_MSG_CHECKING([for oskit version >= ${NEEDED_OSKIT_VERSION}]) AC_CACHE_VAL(gnumach_cv_oskit_version_${NEEDED_OSKIT_VERSION}, [ -AC_TRY_CPP([#include <oskit/version.h> +AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <oskit/version.h> #if _OSKIT_VERSION < ${NEEDED_OSKIT_VERSION} #error _OSKIT_VERSION < ${NEEDED_OSKIT_VERSION} -#endif], eval gnumach_cv_oskit_version_${NEEDED_OSKIT_VERSION}=yes, -eval gnumach_cv_oskit_version_${NEEDED_OSKIT_VERSION}=no)]) +#endif]])], + [eval gnumach_cv_oskit_version_${NEEDED_OSKIT_VERSION}=yes], + [eval gnumach_cv_oskit_version_${NEEDED_OSKIT_VERSION}=no])]) if eval test \$gnumach_cv_oskit_version_${NEEDED_OSKIT_VERSION} != yes; then AC_MSG_RESULT([no, too old!]) AC_MSG_ERROR([version in <oskit/version.h> less than required ${NEEDED_OSKIT_VERSION}]) @@ -98,7 +96,9 @@ fi AC_CHECK_HEADERS(oskit/dev/stream.h) -AC_CHECK_LIB(oskit_dev, oskit_dev_init_i8042, [AC_DEFINE(HAVE_I8042)], [], +AC_CHECK_LIB(oskit_dev, oskit_dev_init_i8042, + [AC_DEFINE(HAVE_I8042, 1, + [Define if -loskit_dev has the i8042 driver.])], [], [-loskit_lmm -loskit_clientos -loskit_c -loskit_kern -loskit_com]) AC_SUBST(SMP_LIBS)SMP_LIBS= @@ -109,10 +109,11 @@ if test $MAXCPUS -gt 1; then fi # Set up `machine' link in build directory for easier header file location. -AC_LINK_FILES(${systype}/${systype},machine) +AC_CONFIG_LINKS(machine:${systype}/${systype}) test "x${OSKIT_LIBDIR+set}" = xset || OSKIT_LIBDIR=`${CC} -print-file-name=oskit` AC_SUBST(OSKIT_LIBDIR) -AC_OUTPUT(Makefile version.c doc/Makefile) +AC_CONFIG_FILES([Makefile version.c doc/Makefile]) +AC_OUTPUT |