diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 17 |
4 files changed, 18 insertions, 28 deletions
@@ -1,3 +1,7 @@ +2008-05-21 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * configure.ac.pamphlet: Don't key all of HyperTex on X11. + 2008-04-27 Gabriel Dos Reis <gdr@cs.tamu.edu> * configure.ac.pamphlet: Check from uint8_t. @@ -25130,11 +25130,7 @@ echo "$as_me: The Garphics component is disabled." >&6;} fi -if test x"$axiom_use_x" != xyes; then - { echo "$as_me:$LINENO: HyperDoc is disabled because it depends on X11" >&5 -echo "$as_me: HyperDoc is disabled because it depends on X11" >&6;} -else - if test "${ac_cv_header_regex_h+set}" = set; then +if test "${ac_cv_header_regex_h+set}" = set; then { echo "$as_me:$LINENO: checking for regex.h" >&5 echo $ECHO_N "checking for regex.h... $ECHO_C" >&6; } if test "${ac_cv_header_regex_h+set}" = set; then @@ -25290,8 +25286,8 @@ echo "${ECHO_T}$ac_cv_header_regex_h" >&6; } fi if test $ac_cv_header_regex_h = yes; then axiom_src_all="$axiom_src_all all-hyper" - axiom_src_subdirs="$axiom_src_subdirs hyper" - ac_config_files="$ac_config_files src/hyper/Makefile:config/var-def.mk:src/hyper/Makefile.in:config/setup-dep.mk" + axiom_src_subdirs="$axiom_src_subdirs hyper" + ac_config_files="$ac_config_files src/hyper/Makefile:config/var-def.mk:src/hyper/Makefile.in:config/setup-dep.mk" else { echo "$as_me:$LINENO: HyperDoc is disabled." >&5 @@ -25299,7 +25295,6 @@ echo "$as_me: HyperDoc is disabled." >&6;} fi -fi axiom_host_has_libbfd= ## Check for these only if we are going to build GCL from source. diff --git a/configure.ac b/configure.ac index 03d52d80..3a6a1320 100644 --- a/configure.ac +++ b/configure.ac @@ -492,15 +492,11 @@ else fi AC_SUBST(axiom_src_all) AC_SUBST(axiom_use_x) -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 +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.])]) axiom_host_has_libbfd= ## Check for these only if we are going to build GCL from source. diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 027ed12d..62861424 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -423,18 +423,13 @@ 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. +drawn in [[Unexpected HT command]] noise. <<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 +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.])]) @ |