From dbbd3949ba86d989df83c01493254875ea9b2a70 Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Thu, 21 Sep 2017 01:17:08 +0200 Subject: Remove autotools files --- .gitignore | 11 -- INSTALL | 274 ------------------------------------ Makefile.am | 69 --------- Makefrag.am | 192 ------------------------- arch/x86/Makefrag.am | 79 ----------- arch/x86/configfrag.ac | 47 ------- configure.ac | 177 ----------------------- doc/Makefrag.am | 33 ----- tools/m4/ax_append_compile_flags.m4 | 67 --------- tools/m4/ax_append_flag.m4 | 71 ---------- tools/m4/ax_check_compile_flag.m4 | 74 ---------- tools/m4/ax_prog_a2x.m4 | 46 ------ tools/m4/ax_prog_asciidoc.m4 | 46 ------ tools/m4/ax_prog_highlight.m4 | 46 ------ tools/m4/ax_require_defined.m4 | 37 ----- 15 files changed, 1269 deletions(-) delete mode 100644 INSTALL delete mode 100644 Makefile.am delete mode 100644 Makefrag.am delete mode 100644 arch/x86/Makefrag.am delete mode 100644 arch/x86/configfrag.ac delete mode 100644 configure.ac delete mode 100644 doc/Makefrag.am delete mode 100644 tools/m4/ax_append_compile_flags.m4 delete mode 100644 tools/m4/ax_append_flag.m4 delete mode 100644 tools/m4/ax_check_compile_flag.m4 delete mode 100644 tools/m4/ax_prog_a2x.m4 delete mode 100644 tools/m4/ax_prog_asciidoc.m4 delete mode 100644 tools/m4/ax_prog_highlight.m4 delete mode 100644 tools/m4/ax_require_defined.m4 diff --git a/.gitignore b/.gitignore index 265e3aa5..61d2f516 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,7 @@ *.o -*.a -.deps/ -.dirstamp -Makefile -Makefile.in cscope.out tags x15.lds -/aclocal.m4 -/autom4te.cache/ -/build-aux/ -/config.* -/configure -/stamp-h1 /x15 /x15.sorted_init_ops /doc/*\.[1-9] diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 4dec35a3..00000000 --- a/INSTALL +++ /dev/null @@ -1,274 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006 Free Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - - -X15 Options -=========== - -`--enable-64bits' - Build for a 64-bits target processor. - -`--enable-shell' - Enable the diagnostics shell. Note that some shell commands may have - a real-time unsafe behaviour. - -`--enable-test-module=TEST_MODULE' - Run a test module instead of booting the system. Test module source - files can be found in the test directory, and test module names - inferred from their file name. For example, a test module implemented - in a file named `test_pmap_update_mp.c' would be selected with the - option `--enable-test-module=pmap_update_mp'. - -`--enable-thread-stack-guard' - Enable the use of guard pages around kernel thread stacks to catch - overflows. Note that this feature wastes precious kernel virtual - memory and has some overhead during thread creation and destruction. - -`--with-clock-freq=CLOCK_FREQ - Set the low resolution clock frequency. - -`--with-max-cpus=MAX_CPUS' - Set the maximum number of supported processors. - -`--with-mutex-impl=MUTEX_IMPL' - Select the mutex implementation (adaptive, pi, or plain) - -TODO Improve descriptions - -x86 options ------------ - -`--enable-x86-pae' - Use the PAE (Physical Address Extension) processor feature to address - physical memory beyond 4 GiB (i386 only). diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index efff4f30..00000000 --- a/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -EXTRA_DIST = -MOSTLYCLEANFILES = -AM_CPPFLAGS = -AM_CFLAGS = -SUFFIXES = - -AM_CPPFLAGS += -pipe -AM_CPPFLAGS += -imacros config.h - -# Do not include headers from the hosted environment, but -# do include headers from the compiler. -AM_CPPFLAGS += -nostdinc -AM_CPPFLAGS += -isystem $(shell $(CC) -print-file-name=include) - -AM_CPPFLAGS += \ - -I$(top_srcdir) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/arch/$(arch) - -AM_CFLAGS += -ffreestanding - -AM_CFLAGS += -std=gnu11 - -AM_CFLAGS += \ - -Wall \ - -Wextra \ - -Wshadow \ - -Wmissing-prototypes \ - -Wstrict-prototypes - -AM_CFLAGS += \ - -fsigned-char \ - -fno-common - -AM_CFLAGS += -nostdlib - -SUFFIXES += .lds .lds.S - -.lds.S.lds: - $(AM_V_GEN)$(CPP) -P $(AM_CPPFLAGS) -o $@ $< - -ASCIIDOC_FLAGS = -a toc -d manpage -a revnumber=@PACKAGE_VERSION@ -A2X_FLAGS = -d manpage -a revnumber=@PACKAGE_VERSION@ - -SUFFIXES += .9 .9.html .9.xml .9.txt - -.9.txt.9.html: - $(AM_V_GEN)$(ASCIIDOC) $(ASCIIDOC_FLAGS) -b html5 -o $(abs_top_builddir)/$@ $< - -# Expose intermediate DocBook files for correct parallel builds. -.9.txt.9.xml: - $(AM_V_GEN)$(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -o $(abs_top_builddir)/$@ $< - -.9.xml.9: - $(AM_V_GEN)$(A2X) $(A2X_FLAGS) -f manpage --xsltproc-opts="-o $(abs_top_builddir)/$@" $< - -bin_PROGRAMS = x15 -x15_DEPENDENCIES = arch/$(arch)/x15.lds x15.sorted_init_ops -MOSTLYCLEANFILES += $(x15_DEPENDENCIES) -x15_SOURCES = -x15_LDFLAGS = -nostdlib -Xlinker -T arch/$(arch)/x15.lds -x15_LDADD = -lgcc - -.INTERMEDIATE: x15.sorted_init_ops - -include Makefrag.am - -x15.sorted_init_ops: $(filter %.c,$(x15_SOURCES)) - $(AM_V_GEN)$(top_srcdir)/tools/tsort_init_ops.sh "$(COMPILE)" "$@" $^ diff --git a/Makefrag.am b/Makefrag.am deleted file mode 100644 index 24d700a0..00000000 --- a/Makefrag.am +++ /dev/null @@ -1,192 +0,0 @@ -include arch/x86/Makefrag.am -include doc/Makefrag.am - -EXTRA_DIST += \ - tools/qemu.sh \ - tools/tsort_init_ops.sh - -x15_SOURCES += \ - include/assert.h \ - include/limits.h \ - include/stdio.h \ - include/string.h - -x15_SOURCES += \ - kern/arg.c \ - kern/arg.h \ - kern/atomic.h \ - kern/bitmap.c \ - kern/bitmap.h \ - kern/bitmap_i.h \ - kern/cbuf.c \ - kern/cbuf.h \ - kern/clock.c \ - kern/clock.h \ - kern/clock_i.h \ - kern/condition.c \ - kern/condition.h \ - kern/condition_types.h \ - kern/console.c \ - kern/console.h \ - kern/config.h \ - kern/cpumap.c \ - kern/cpumap.h \ - kern/error.c \ - kern/error.h \ - kern/hash.h \ - kern/hlist.h \ - kern/hlist_types.h \ - kern/fmt.c \ - kern/fmt.h \ - kern/init.c \ - kern/init.h \ - kern/init_i.h \ - kern/intr.c \ - kern/intr.h \ - kern/kernel.c \ - kern/kernel.h \ - kern/kmem.c \ - kern/kmem.h \ - kern/kmem_i.h \ - kern/list.h \ - kern/list_types.h \ - kern/llsync.c \ - kern/llsync.h \ - kern/llsync_i.h \ - kern/log.c \ - kern/log.h \ - kern/log2.h \ - kern/macros.h \ - kern/mutex.c \ - kern/mutex.h \ - kern/mutex_types.h \ - kern/mutex/mutex_adaptive_i.h \ - kern/mutex/mutex_adaptive_types.h \ - kern/mutex/mutex_pi_i.h \ - kern/mutex/mutex_pi_types.h \ - kern/mutex/mutex_plain_i.h \ - kern/mutex/mutex_plain_types.h \ - kern/panic.c \ - kern/panic.h \ - kern/percpu.c \ - kern/percpu.h \ - kern/plist.c \ - kern/plist.h \ - kern/plist_types.h \ - kern/printf.c \ - kern/printf.h \ - kern/rbtree.c \ - kern/rbtree.h \ - kern/rbtree_i.h \ - kern/rdxtree.c \ - kern/rdxtree.h \ - kern/rdxtree_i.h \ - kern/rtmutex.c \ - kern/rtmutex.h \ - kern/rtmutex_i.h \ - kern/rtmutex_types.h \ - kern/semaphore.c \ - kern/semaphore.h \ - kern/semaphore_i.h \ - kern/shutdown.c \ - kern/shutdown.h \ - kern/sleepq.c \ - kern/sleepq.h \ - kern/slist.h \ - kern/slist_types.h \ - kern/spinlock.c \ - kern/spinlock.h \ - kern/spinlock_i.h \ - kern/spinlock_types.h \ - kern/sref.c \ - kern/sref.h \ - kern/sref_i.h \ - kern/string.c \ - kern/string.h \ - kern/syscnt.c \ - kern/syscnt.h \ - kern/syscnt_types.h \ - kern/task.c \ - kern/task.h \ - kern/thread.c \ - kern/thread.h \ - kern/thread_i.h \ - kern/timer.c \ - kern/timer.h \ - kern/timer_i.h \ - kern/turnstile.c \ - kern/turnstile.h \ - kern/turnstile_types.h \ - kern/types.h \ - kern/work.c \ - kern/work.h \ - kern/work_i.h \ - kern/xcall.c \ - kern/xcall.h - -if USE_MUTEX_ADAPTIVE - x15_SOURCES += kern/mutex/mutex_adaptive.c -else -if USE_MUTEX_PLAIN - x15_SOURCES += kern/mutex/mutex_plain.c -endif -endif - -if ENABLE_SHELL -x15_SOURCES += \ - kern/shell.c \ - kern/shell.h -endif ENABLE_SHELL - -x15_SOURCES += \ - vm/vm_adv.h \ - vm/vm_inherit.h \ - vm/vm_kmem.c \ - vm/vm_kmem.h \ - vm/vm_map.c \ - vm/vm_map.h \ - vm/vm_object.c \ - vm/vm_object.h \ - vm/vm_object_types.h \ - vm/vm_page.c \ - vm/vm_page.h \ - vm/vm_prot.h - -x15_SOURCES += \ - test/test.h - -if ENABLE_TEST_LLSYNC_DEFER -x15_SOURCES += test/test_llsync_defer.c -endif ENABLE_TEST_LLSYNC_DEFER - -if ENABLE_TEST_MUTEX -x15_SOURCES += test/test_mutex.c -endif ENABLE_TEST_MUTEX - -if ENABLE_TEST_MUTEX_PI -x15_SOURCES += test/test_mutex_pi.c -endif ENABLE_TEST_MUTEX_PI - -if ENABLE_TEST_PMAP_UPDATE_MP -x15_SOURCES += test/test_pmap_update_mp.c -endif ENABLE_TEST_PMAP_UPDATE_MP - -if ENABLE_TEST_SREF_DIRTY_ZEROES -x15_SOURCES += test/test_sref_dirty_zeroes.c -endif ENABLE_TEST_SREF_DIRTY_ZEROES - -if ENABLE_TEST_SREF_NOREF -x15_SOURCES += test/test_sref_noref.c -endif ENABLE_TEST_SREF_NOREF - -if ENABLE_TEST_SREF_WEAKREF -x15_SOURCES += test/test_sref_weakref.c -endif ENABLE_TEST_SREF_WEAKREF - -if ENABLE_TEST_VM_PAGE_FILL -x15_SOURCES += test/test_vm_page_fill.c -endif ENABLE_TEST_VM_PAGE_FILL - -if ENABLE_TEST_XCALL -x15_SOURCES += test/test_xcall.c -endif ENABLE_TEST_XCALL diff --git a/arch/x86/Makefrag.am b/arch/x86/Makefrag.am deleted file mode 100644 index 016e31c8..00000000 --- a/arch/x86/Makefrag.am +++ /dev/null @@ -1,79 +0,0 @@ -EXTRA_DIST += arch/x86/x15.lds.S - -if X86 - -# Store unwind information in .debug_frame instead of .eh_frame. Unwind -# tables aren't used at runtime, so using a debug section reduces the kernel -# code size. -AM_CFLAGS += -fno-asynchronous-unwind-tables - -# For now, use frame pointers for convenient stack tracing. -AM_CFLAGS += -fno-omit-frame-pointer - -x15_LDFLAGS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 - -if X86_64 - -AM_CPPFLAGS += -m64 -AM_CFLAGS += -mcmodel=kernel -mno-red-zone -x15_LDFLAGS += -m64 - -else !X86_64 - -AM_CPPFLAGS += -m32 -x15_LDFLAGS += -m32 - -endif !X86_64 - -x15_SOURCES += \ - arch/x86/machine/acpi.c \ - arch/x86/machine/acpi.h \ - arch/x86/machine/atcons.c \ - arch/x86/machine/atcons.h \ - arch/x86/machine/atkbd.c \ - arch/x86/machine/atkbd.h \ - arch/x86/machine/asm.h \ - arch/x86/machine/atomic.h \ - arch/x86/machine/biosmem.c \ - arch/x86/machine/biosmem.h \ - arch/x86/machine/boot_asm.S \ - arch/x86/machine/boot.c \ - arch/x86/machine/boot.h \ - arch/x86/machine/config.h \ - arch/x86/machine/cga.c \ - arch/x86/machine/cga.h \ - arch/x86/machine/cpu_asm.S \ - arch/x86/machine/cpu.c \ - arch/x86/machine/cpu.h \ - arch/x86/machine/elf.h \ - arch/x86/machine/io.h \ - arch/x86/machine/ioapic.c \ - arch/x86/machine/ioapic.h \ - arch/x86/machine/lapic.c \ - arch/x86/machine/lapic.h \ - arch/x86/machine/multiboot.h \ - arch/x86/machine/page.h \ - arch/x86/machine/pic.c \ - arch/x86/machine/pic.h \ - arch/x86/machine/pit.c \ - arch/x86/machine/pit.h \ - arch/x86/machine/pmap.c \ - arch/x86/machine/pmap.h \ - arch/x86/machine/pmem.h \ - arch/x86/machine/ssp.c \ - arch/x86/machine/ssp.h \ - arch/x86/machine/strace.c \ - arch/x86/machine/strace.h \ - arch/x86/machine/string.c \ - arch/x86/machine/string.h \ - arch/x86/machine/tcb_asm.S \ - arch/x86/machine/tcb.c \ - arch/x86/machine/tcb.h \ - arch/x86/machine/trap_asm.S \ - arch/x86/machine/trap.c \ - arch/x86/machine/trap.h \ - arch/x86/machine/types.h \ - arch/x86/machine/uart.c \ - arch/x86/machine/uart.h - -endif X86 diff --git a/arch/x86/configfrag.ac b/arch/x86/configfrag.ac deleted file mode 100644 index 0857368a..00000000 --- a/arch/x86/configfrag.ac +++ /dev/null @@ -1,47 +0,0 @@ -m4_define([x86_ENABLE_PAE], - [AC_DEFINE([X15_X86_PAE], [1], [use PAE page translation])]) - -m4_define([x86_SELECT_I386], - [subarch=i386 - AS_IF([test x"$enable_x86_pae" = xyes], [x86_ENABLE_PAE])]) - -m4_define([x86_SELECT_AMD64], - [subarch=amd64 - AS_IF([test x"$enable_x86_pae" = xyes], - [AC_MSG_WARN([pae option available for 32-bits builds only, ignoring])])]) - -m4_define([x86_SELECT], - [arch=x86 - AC_ARG_ENABLE([x86-pae], - [AS_HELP_STRING([--enable-x86-pae], - [enable physical address extension (32-bits only)])], - [], - [enable_x86_pae=no]) - - AS_IF([test -z "$enable_64bits"], - [AS_CASE(["$host_cpu"], - [i?86], [enable_64bits=no], - [x86_64], [enable_64bits=yes])]) - - AS_IF([test x"$enable_64bits" = xyes], [x86_SELECT_AMD64], [x86_SELECT_I386]) - - # Never generate instructions that are unhandled in kernel mode - AX_APPEND_COMPILE_FLAGS([ \ - -mno-mmx \ - -mno-3dnow \ - -mno-sse \ - -mno-sse2 \ - -mno-avx]) - - AC_DEFINE_UNQUOTED([X15_X86_SUBARCH], [$subarch], [subarch]) - - AS_ECHO - AC_MSG_NOTICE([target: $arch ($subarch)]) - AS_IF([test x"$subarch" = xi386], - [AC_MSG_NOTICE([x86: physical address extension: $enable_x86_pae])])]) - -AS_CASE(["$host_cpu"], - [i?86|x86_64], [x86_SELECT]) - -AM_CONDITIONAL([X86], [test x"$arch" = xx86]) -AM_CONDITIONAL([X86_64], [test x"$arch" = xx86 -a x"$enable_64bits" = xyes]) diff --git a/configure.ac b/configure.ac deleted file mode 100644 index c544a5dc..00000000 --- a/configure.ac +++ /dev/null @@ -1,177 +0,0 @@ -AC_PREREQ([2.69]) -AC_INIT([X15], [0.1], [rbraun@sceen.net], [x15]) - -AC_CONFIG_SRCDIR([kern/config.h]) -AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_MACRO_DIR([tools/m4]) - -# Artificially create the doc subdirectory since Automake apparently -# won't do it itself. -AC_CONFIG_COMMANDS([doc/.empty]) - -AM_INIT_AUTOMAKE([foreign subdir-objects 1.13]) - -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) - -AC_CANONICAL_HOST -AC_PROG_CPP -AC_PROG_CC -AM_PROG_AS -AM_PROG_CC_C_O - -AX_PROG_ASCIIDOC([AC_MSG_NOTICE([asciidoc not found, not building html documentation])]) -AX_PROG_HIGHLIGHT([AS_IF([test x"$ASCIIDOC" != x], - [AC_MSG_NOTICE([highlight not found, not building html documentation])])]) -AX_PROG_A2X([AC_MSG_NOTICE([a2x not found, not building man pages])]) - -# Disable PIE if enabled by default -AX_APPEND_COMPILE_FLAGS([-no-pie -fno-pie]) - -AC_HEADER_ASSERT() - -# --enable options - -AC_ARG_ENABLE([64bits], - [AS_HELP_STRING([--enable-64bits], - [build for a 64-bits target processor])], - [], - [enable_64bits=default]) - -AC_ARG_ENABLE([shell], - [AS_HELP_STRING([--enable-shell], - [enable the diagnostics shell])], - [], - [enable_shell=no]) - -AC_ARG_ENABLE([test-module], - [AS_HELP_STRING([--enable-test-module=TEST_MODULE], - [run the given test module instead of booting])], - [enable_test_module=$enableval], - [enable_test_module=]) - -AC_ARG_ENABLE([thread-stack-guard], - [AS_HELP_STRING([--enable-thread-stack-guard], - [enable kernel thread stack guard pages])], - [], - [enable_thread_stack_guard=no]) - -# --with options - -AC_ARG_WITH([clock-freq], - [AS_HELP_STRING([--with-clock-freq=CLOCK_FREQ], - [set the low resolution clock frequency (100-1000 Hz)])], - [opt_clock_freq=$withval], - [opt_clock_freq=200]) - -AC_ARG_WITH([max-cpus], - [AS_HELP_STRING([--with-max-cpus=MAX_CPUS], - [set the maximum number of supported processors])], - [opt_max_cpus=$withval], - [opt_max_cpus=128]) - -AC_ARG_WITH([mutex-impl], - [AS_HELP_STRING([--with-mutex-impl=MUTEX_IMPL], - [select the mutex implementation (adaptive, pi, or plain)])], - [opt_mutex_impl=$withval], - [opt_mutex_impl=plain]) - -# 32/64-bits processor selection - -AS_IF([test -z "$enable_64bits"], [enable_64bits=yes], - [test x"$enable_64bits" = x"default"], [enable_64bits=], - [test x"$enable_64bits" != xyes -a x"$enable_64bits" != xno], - [AC_MSG_ERROR([target processor must be either 32-bits or 64-bits])]) - -# Architecture-specific configuration - -m4_include([arch/x86/configfrag.ac]) - -AS_IF([test x"$arch" = x], [AC_MSG_ERROR([unsupported architecture])]) -AC_SUBST([arch]) - -# Shell selection - -AS_IF([test x"$enable_shell" = xyes], - [AC_DEFINE_UNQUOTED([X15_ENABLE_SHELL], [], - [Enable the diagnostics shell])]) -AM_CONDITIONAL([ENABLE_SHELL], - [test x"$enable_shell" = xyes]) -AC_MSG_NOTICE([diagnostics shell: $enable_shell]) - -# Test module selection - -m4_define([DEFINE_TEST_MODULE], - [AM_CONDITIONAL([$1], [test x"$enable_test_module" = x"$2"]) - AM_COND_IF([$1], [AC_DEFINE_UNQUOTED([X15_RUN_TEST_MODULE], [], - [run test module instead of booting])])]) - -DEFINE_TEST_MODULE(ENABLE_TEST_LLSYNC_DEFER, llsync_defer) -DEFINE_TEST_MODULE(ENABLE_TEST_MUTEX, mutex) -DEFINE_TEST_MODULE(ENABLE_TEST_MUTEX_PI, mutex_pi) -DEFINE_TEST_MODULE(ENABLE_TEST_PMAP_UPDATE_MP, pmap_update_mp) -DEFINE_TEST_MODULE(ENABLE_TEST_SREF_DIRTY_ZEROES, sref_dirty_zeroes) -DEFINE_TEST_MODULE(ENABLE_TEST_SREF_NOREF, sref_noref) -DEFINE_TEST_MODULE(ENABLE_TEST_SREF_WEAKREF, sref_weakref) -DEFINE_TEST_MODULE(ENABLE_TEST_VM_PAGE_FILL, vm_page_fill) -DEFINE_TEST_MODULE(ENABLE_TEST_XCALL, xcall) - -AS_IF([test "$enable_test_module" -a -f test/test_$enable_test_module.c], - [AC_MSG_NOTICE([test module enabled: $enable_test_module])], - [test "$enable_test_module"], - [AC_MSG_ERROR([invalid test module])]) - -# Thread stack guard selection - -AS_IF([test x"$enable_thread_stack_guard" = xyes], - [AC_DEFINE_UNQUOTED([X15_ENABLE_THREAD_STACK_GUARD], [], - [Enable the use of guard pages for thread stacks])]) -AC_MSG_NOTICE([thread stack guard pages: $enable_thread_stack_guard]) - -# Low resolution clock frequency - -AC_DEFINE_UNQUOTED([X15_CLOCK_FREQ], [$opt_clock_freq], - [low resolution clock frequency]) -AC_MSG_NOTICE([low resolution clock frequency: $opt_clock_freq Hz]) - -# Maximum number of supported processors - -AC_DEFINE_UNQUOTED([X15_MAX_CPUS], [$opt_max_cpus], - [maximum number of supported processors]) -AC_MSG_NOTICE([maximum number of supported processors: $opt_max_cpus]) - -# Mutex implementation selection - -m4_define([SELECT_MUTEX_IMPL], - [mutex_impl_desc="$2" - AC_DEFINE_UNQUOTED([$1], [], [$3])]) - -AS_IF([test x"$opt_mutex_impl" = xadaptive], - [SELECT_MUTEX_IMPL([X15_USE_MUTEX_ADAPTIVE], - [adaptive spinning], - [Use adaptive spinning mutex implementation])], - [test x"$opt_mutex_impl" = xpi], - [SELECT_MUTEX_IMPL([X15_USE_MUTEX_PI], - [priority inheritance], - [Use priority inheritance mutex implementation])], - [test x"$opt_mutex_impl" = xplain], - [SELECT_MUTEX_IMPL([X15_USE_MUTEX_PLAIN], - [plain], - [Use plain mutex implementation])], - [AC_MSG_ERROR([invalid mutex implementation])]) -AM_CONDITIONAL([USE_MUTEX_ADAPTIVE], - [test x"$opt_mutex_impl" = xadaptive]) -AM_CONDITIONAL([USE_MUTEX_PI], - [test x"$opt_mutex_impl" = xpi]) -AM_CONDITIONAL([USE_MUTEX_PLAIN], - [test x"$opt_mutex_impl" = xplain]) -AC_MSG_NOTICE([mutex implementation: $mutex_impl_desc]) - -# Output generation - -AS_ECHO - -AH_BOTTOM([#include ]) -AC_CONFIG_HEADER([config.h]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/doc/Makefrag.am b/doc/Makefrag.am deleted file mode 100644 index 4f9083d9..00000000 --- a/doc/Makefrag.am +++ /dev/null @@ -1,33 +0,0 @@ -EXTRA_DIST += doc/asciidoc.conf - -x15_DOCS = \ - doc/cenv.9.txt \ - doc/init.9.txt \ - doc/intro.9.txt \ - doc/style.9.txt - -x15_SOURCES += $(x15_DOCS) - -if HAVE_ASCIIDOC -if HAVE_HIGHLIGHT - -html_DATA = $(x15_DOCS:%.9.txt=%.9.html) -MOSTLYCLEANFILES += $(html_DATA) - -$(html_DATA): doc/asciidoc.conf -html: $(html_DATA) -.PHONY: html - -endif HAVE_HIGHLIGHT -endif HAVE_ASCIIDOC - -if HAVE_A2X - -man9_MANS = $(x15_DOCS:%.9.txt=%.9) -MOSTLYCLEANFILES += $(man9_MANS) - -$(man9_MANS): doc/asciidoc.conf -man: $(man9_MANS) -.PHONY: man - -endif HAVE_A2X diff --git a/tools/m4/ax_append_compile_flags.m4 b/tools/m4/ax_append_compile_flags.m4 deleted file mode 100644 index 5b6f1af5..00000000 --- a/tools/m4/ax_append_compile_flags.m4 +++ /dev/null @@ -1,67 +0,0 @@ -# ============================================================================ -# https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html -# ============================================================================ -# -# SYNOPSIS -# -# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# For every FLAG1, FLAG2 it is checked whether the compiler works with the -# flag. If it does, the flag is added FLAGS-VARIABLE -# -# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. -# CFLAGS) is used. During the check the flag is always added to the -# current language's flags. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: This macro depends on the AX_APPEND_FLAG and -# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with -# AX_APPEND_LINK_FLAGS. -# -# LICENSE -# -# Copyright (c) 2011 Maarten Bosmans -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 6 - -AC_DEFUN([AX_APPEND_COMPILE_FLAGS], -[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) -AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) -for flag in $1; do - AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4]) -done -])dnl AX_APPEND_COMPILE_FLAGS diff --git a/tools/m4/ax_append_flag.m4 b/tools/m4/ax_append_flag.m4 deleted file mode 100644 index e8c5312a..00000000 --- a/tools/m4/ax_append_flag.m4 +++ /dev/null @@ -1,71 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_append_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) -# -# DESCRIPTION -# -# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space -# added in between. -# -# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. -# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains -# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly -# FLAG. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 7 - -AC_DEFUN([AX_APPEND_FLAG], -[dnl -AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF -AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])]) -AS_VAR_SET_IF(FLAGS,[ - AS_CASE([" AS_VAR_GET(FLAGS) "], - [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])], - [ - AS_VAR_APPEND(FLAGS,[" $1"]) - AC_RUN_LOG([: FLAGS="$FLAGS"]) - ]) - ], - [ - AS_VAR_SET(FLAGS,[$1]) - AC_RUN_LOG([: FLAGS="$FLAGS"]) - ]) -AS_VAR_POPDEF([FLAGS])dnl -])dnl AX_APPEND_FLAG diff --git a/tools/m4/ax_check_compile_flag.m4 b/tools/m4/ax_check_compile_flag.m4 deleted file mode 100644 index dcabb92a..00000000 --- a/tools/m4/ax_check_compile_flag.m4 +++ /dev/null @@ -1,74 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the current language's compiler -# or gives an error. (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 5 - -AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_VAR_IF(CACHEVAR,yes, - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_COMPILE_FLAGS diff --git a/tools/m4/ax_prog_a2x.m4 b/tools/m4/ax_prog_a2x.m4 deleted file mode 100644 index 54a2f420..00000000 --- a/tools/m4/ax_prog_a2x.m4 +++ /dev/null @@ -1,46 +0,0 @@ -# SYNOPSIS -# -# AX_PROG_A2X(ACTION-IF-NOT-FOUND) -# -# DESCRIPTION -# -# Check whether the a2x command is available on system, and provide -# the HAVE_A2X Automake conditional. -# -# ACTION-IF-NOT-FOUND is shell commands to execute on failure. -# -# LICENSE -# -# Copyright (c) 2017 Richard Braun -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -AC_DEFUN([AX_PROG_A2X], - [AC_ARG_VAR([A2X], [path to a2x command]) - AC_CHECK_PROG([A2X], [a2x], [a2x]) - AS_IF([test x"$A2X" = x], [$1]) - AM_CONDITIONAL([HAVE_A2X], [test x"$A2X" != x])]) diff --git a/tools/m4/ax_prog_asciidoc.m4 b/tools/m4/ax_prog_asciidoc.m4 deleted file mode 100644 index 6ca34214..00000000 --- a/tools/m4/ax_prog_asciidoc.m4 +++ /dev/null @@ -1,46 +0,0 @@ -# SYNOPSIS -# -# AX_PROG_ASCIIDOC(ACTION-IF-NOT-FOUND) -# -# DESCRIPTION -# -# Check whether the asciidoc command is available on system, and provide -# the HAVE_ASCIIDOC Automake conditional. -# -# ACTION-IF-NOT-FOUND is shell commands to execute on failure. -# -# LICENSE -# -# Copyright (c) 2017 Richard Braun -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -AC_DEFUN([AX_PROG_ASCIIDOC], - [AC_ARG_VAR([ASCIIDOC], [path to asciidoc command]) - AC_CHECK_PROG([ASCIIDOC], [asciidoc], [asciidoc]) - AS_IF([test x"$ASCIIDOC" = x], [$1]) - AM_CONDITIONAL([HAVE_ASCIIDOC], [test x"$ASCIIDOC" != x])]) diff --git a/tools/m4/ax_prog_highlight.m4 b/tools/m4/ax_prog_highlight.m4 deleted file mode 100644 index 4b497384..00000000 --- a/tools/m4/ax_prog_highlight.m4 +++ /dev/null @@ -1,46 +0,0 @@ -# SYNOPSIS -# -# AX_PROG_HIGHLIGHT(ACTION-IF-NOT-FOUND) -# -# DESCRIPTION -# -# Check whether the highlight command is available on system, and provide -# the HAVE_HIGHLIGHT Automake conditional. -# -# ACTION-IF-NOT-FOUND is shell commands to execute on failure. -# -# LICENSE -# -# Copyright (c) 2017 Richard Braun -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -AC_DEFUN([AX_PROG_HIGHLIGHT], - [AC_ARG_VAR([HIGHLIGHT], [path to highlight command]) - AC_CHECK_PROG([HIGHLIGHT], [highlight], [highlight]) - AS_IF([test x"$HIGHLIGHT" = x], [$1]) - AM_CONDITIONAL([HAVE_HIGHLIGHT], [test x"$HIGHLIGHT" != x])]) diff --git a/tools/m4/ax_require_defined.m4 b/tools/m4/ax_require_defined.m4 deleted file mode 100644 index 17c3eab7..00000000 --- a/tools/m4/ax_require_defined.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_REQUIRE_DEFINED(MACRO) -# -# DESCRIPTION -# -# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have -# been defined and thus are available for use. This avoids random issues -# where a macro isn't expanded. Instead the configure script emits a -# non-fatal: -# -# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found -# -# It's like AC_REQUIRE except it doesn't expand the required macro. -# -# Here's an example: -# -# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) -# -# LICENSE -# -# Copyright (c) 2014 Mike Frysinger -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 2 - -AC_DEFUN([AX_REQUIRE_DEFINED], [dnl - m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) -])dnl AX_REQUIRE_DEFINED -- cgit v1.2.3