diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-09-04 00:36:09 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-09-04 00:36:09 +0000 |
| commit | f9c74d303775dc241544e139f68ec373e02ad78f (patch) | |
| tree | e0b1a74fc4751cd09ea8b6b287d3bf37ae6da4dc /configure.ac.pamphlet | |
| parent | 89cdfc1cf1dd40a8c5faf7fa8820f19bf6828895 (diff) | |
| download | open-axiom-f9c74d303775dc241544e139f68ec373e02ad78f.tar.gz | |
* configure.ac.pamphlet: Disable HyperDoc if X11 is not available.
* configure.ac: Regenerate.
* configure: Likewise.
Diffstat (limited to 'configure.ac.pamphlet')
| -rw-r--r-- | configure.ac.pamphlet | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index ccce5409..ec693209 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -332,25 +332,6 @@ AC_SUBST(axiom_use_sman) \subsection{Graphics} -\subsubsection{HyperDoc} - -The HyperDoc component needs string pattern matching. -We require [[<regex.h>]], with POSIX-conformant definition. We use -to key build of HyperDoc component on the availability of X11 -functionalities. That, however, is a severe restriction. Not all -of the HyperDoc components need X11. Some, such as [[htadd]], don't -need X11 at all. Therefore we have lifted part of the restrictions. -See \File{src/hyper/Makefile} for more details. Note that is we don't -build the HyperDoc component, the compilation of algebra files are -drawn in [[Unexpected HT command]] noise. -<<C headers and libraries>>= -AC_CHECK_HEADER([regex.h], - [axiom_src_all="$axiom_src_all all-hyper" - axiom_src_subdirs="$axiom_src_subdirs hyper" - AXIOM_MAKEFILE([src/hyper/Makefile])], - [AC_MSG_NOTICE([HyperDoc is disabled.])]) -@ - \subsubsection{Where is X11?} One of the thorniest issues with programs that use the X Window System @@ -413,6 +394,31 @@ AC_SUBST(axiom_src_all) AC_SUBST(axiom_use_x) @ +\subsubsection{HyperDoc} + +The HyperDoc component needs string pattern matching. +We require [[<regex.h>]], with POSIX-conformant definition. We used +to key build of HyperDoc component on the availability of X11 +functionalities. That, however, is a severe restriction. Not all +of the HyperDoc components need X11. Some, such as [[htadd]], don't +need X11 at all. Therefore we have lifted part of the restrictions. +See \File{src/hyper/Makefile} for more details. Note that is we don't +build the HyperDoc component, the compilation of algebra files are +drawn in [[Unexpected HT command]] noise. We still haven't clean up +the X11 dependencies, so we are back to the old requirements. +<<C headers and libraries>>= +if test x"$axiom_use_x" != xyes; then + AC_MSG_NOTICE([HyperDoc is disabled because it depends on X11]) +else + AC_CHECK_HEADER([regex.h], + [axiom_src_all="$axiom_src_all all-hyper" + axiom_src_subdirs="$axiom_src_subdirs hyper" + AXIOM_MAKEFILE([src/hyper/Makefile])], + [AC_MSG_NOTICE([HyperDoc is disabled.])]) +fi +@ + + \subsection{Lisp runtime} \subsubsection{Runtime checking} @@ -987,7 +993,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom 1.1.0 (experimental)], [2007-08-23], +AC_INIT([OpenAxiom 1.1.0 (experimental)], [2007-09-03], [open-axiom-devel@lists.sf.org]) @ @@ -1042,7 +1048,6 @@ AC_CONFIG_SRCDIR(src/Makefile.pamphlet) @ - \subsubsection{The [[AXIOM]] variable} The OpenAxiom source files (especially the source files for the |