diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-01-05 08:57:06 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-01-05 08:57:06 +0000 |
| commit | 3545eca90d734224e7a468251ac686e1ca41d910 (patch) | |
| tree | 5bcf2cd44f29efeace31a299ec57cc8709aac66a /configure.ac.pamphlet | |
| parent | 915b5b3272b0babc886c1c3c0605c9977cd36feb (diff) | |
| download | open-axiom-3545eca90d734224e7a468251ac686e1ca41d910.tar.gz | |
2008-01-05 Gabriel Dos Reis <gdr@cs.tamu.edu>
* configure.ac.pamphlet: For mingw host, default $prefix to
C:/Program Files/OpenAxiom.
Don't instantiate src/script/axiom.
Instantiate src/driver/Makefile. Tidy.
* Makefile.pamphlet: Tidy.
* config/axiom-c-macros.h.in: Update.
src/
2008-01-05 Gabriel Dos Reis <gdr@cs.tamu.edu>
* scripts/axiom.in: Remove.
* driver: New directory.
* driver/main.c: New. Now implement driver as native
application.
Diffstat (limited to 'configure.ac.pamphlet')
| -rw-r--r-- | configure.ac.pamphlet | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index f50a3c31..89bba2ac 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -112,6 +112,10 @@ or \textsl{kernel--system} (such as [[linux-gnu]]). Here is how we get the canonical names for the above three platforms: <<host build target platfoms>>= AC_CANONICAL_SYSTEM + +open_axiom_installdir=$libdir/open-axiom/$target/$PACKAGE_VERSION +AC_SUBST(open_axiom_installdir) + @ After that call, the configuration names of the three platforms are available in the shell variables [[build]], [[host]], and [[target]]. @@ -312,7 +316,7 @@ AC_CHECK_DECLS([fork], [], [#include <unistd.h>]) -axiom_use_sman=yes +axiom_use_sman=1 if test x"$ac_cv_have_decl_fork" = xyes \ -a x"$ac_cv_have_decl_wait" = xyes; then \ axiom_c_runtime="$axiom_c_runtime terminal_io" @@ -321,12 +325,15 @@ if test x"$ac_cv_have_decl_fork" = xyes \ AXIOM_MAKEFILE([src/clef/Makefile]) AXIOM_MAKEFILE([src/sman/Makefile]) else - axiom_use_sman=no + axiom_use_sman=0 AC_MSG_NOTICE([Superman component is disabled.]) fi +AC_DEFINE_UNQUOTED([OPENAXIOM_USE_SMAN], [$axiom_use_sman], + [Whether to use the session manager as driver.]) + axiom_src_all="all-input $axiom_src_all" -AC_SUBST(axiom_use_sman) + @ @@ -626,6 +633,10 @@ AC_SUBST(axiom_cflags) ## What is the extension of object files on this platform? AC_OBJEXT + +AC_DEFINE_UNQUOTED([OPENAXIOM_EXEEXT], ["$ac_cv_exeext"], + [Extension of executable file.]) + @ \paragraph{File utils} @@ -1008,7 +1019,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.1.0-2007-12-27], +AC_INIT([OpenAxiom], [1.1.0-2008-01-05], [open-axiom-bugs@lists.sf.net]) @ @@ -1077,6 +1088,7 @@ build start --- or else, it will fail. AXIOM_MAKEFILE([Makefile]) AXIOM_MAKEFILE([src/Makefile]) AXIOM_MAKEFILE([src/lib/Makefile]) +AXIOM_MAKEFILE([src/driver/Makefile]) AXIOM_MAKEFILE([src/lisp/Makefile]) AXIOM_MAKEFILE([src/boot/Makefile]) AXIOM_MAKEFILE([src/interp/Makefile]) @@ -1085,7 +1097,6 @@ AXIOM_MAKEFILE([src/algebra/Makefile]) AXIOM_MAKEFILE([src/input/Makefile]) AXIOM_MAKEFILE([src/etc/Makefile]) AXIOM_MAKEFILE([src/doc/Makefile]) -AC_CONFIG_FILES([src/scripts/axiom], [chmod +x src/scripts/axiom]) ## We now generate the "document" script and support files at configure time. @@ -1163,8 +1174,17 @@ AC_SUBST(axiom_src_subdirs) <<host build target platfoms>> -open_axiom_installdir=$libdir/open-axiom/$target/$PACKAGE_VERSION -AC_SUBST(open_axiom_installdir) +## On Windows system, we prefer the default installation +## location to be 'C:/Program Files/OpenAxiom', following Windows +## convention. We cannot use AC_PREFIX_DEFAULT directly as it seems +## to operate unconditionally. Therefore, we resort to this dirty +## trick stepping over Autoconf's internals. +case $host in + *mingw*) + ac_default_prefix="C:/Program Files/OpenAxiom" + ;; + *) ;; +esac <<build utils>> |