* configure.ac.pamphlet: Disable HyperDoc if X11 is not available.

	* configure.ac: Regenerate.
	* configure: Likewise.

5 files changed, 225 insertions, 212 deletions

diff --git a/ChangeLog b/ChangeLog
index bdca43cd..9e2a2c5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-03  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* configure.ac.pamphlet: Disable HyperDoc if X11 is not available.
+	* configure.ac: Regenerate.
+	* configure: Likewise.
+
 2007-09-01  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* configure.ac.pamphlet (<<find lisp>>): Keep gcl directory test
diff --git a/configure b/configure
index 6e70ce87..02b5fb71 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for OpenAxiom 1.1.0 (experimental) 2007-08-23.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.1.0 (experimental) 2007-09-03.
 #
 # Report bugs to <open-axiom-devel@lists.sf.org>.
 #
@@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='OpenAxiom 1.1.0 (experimental)'
 PACKAGE_TARNAME='openaxiom-1-1-0--experimental-'
-PACKAGE_VERSION='2007-08-23'
-PACKAGE_STRING='OpenAxiom 1.1.0 (experimental) 2007-08-23'
+PACKAGE_VERSION='2007-09-03'
+PACKAGE_STRING='OpenAxiom 1.1.0 (experimental) 2007-09-03'
 PACKAGE_BUGREPORT='open-axiom-devel@lists.sf.org'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1386,7 +1386,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenAxiom 1.1.0 (experimental) 2007-08-23 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.1.0 (experimental) 2007-09-03 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1456,7 +1456,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.1.0 (experimental) 2007-08-23:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.1.0 (experimental) 2007-09-03:";;
    esac
   cat <<\_ACEOF
 
@@ -1560,7 +1560,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom 1.1.0 (experimental) configure 2007-08-23
+OpenAxiom 1.1.0 (experimental) configure 2007-09-03
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1574,7 +1574,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenAxiom 1.1.0 (experimental) $as_me 2007-08-23, which was
+It was created by OpenAxiom 1.1.0 (experimental) $as_me 2007-09-03, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -22652,171 +22652,6 @@ fi
 
 axiom_src_all="all-input $axiom_src_all"
 
-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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
-echo "${ECHO_T}$ac_cv_header_regex_h" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking regex.h usability" >&5
-echo $ECHO_N "checking regex.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <regex.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking regex.h presence" >&5
-echo $ECHO_N "checking regex.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <regex.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: regex.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: regex.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: regex.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: regex.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: regex.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: regex.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: regex.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: regex.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: regex.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: regex.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: regex.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: regex.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: regex.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: regex.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: regex.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: regex.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------- ##
-## Report this to open-axiom-devel@lists.sf.org ##
-## -------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ 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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_regex_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
-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"
-
-else
-  { echo "$as_me:$LINENO: HyperDoc is disabled." >&5
-echo "$as_me: HyperDoc is disabled." >&6;}
-fi
-
-
 { echo "$as_me:$LINENO: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6; }
 
@@ -24449,6 +24284,176 @@ 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
+  { 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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
+echo "${ECHO_T}$ac_cv_header_regex_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking regex.h usability" >&5
+echo $ECHO_N "checking regex.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <regex.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking regex.h presence" >&5
+echo $ECHO_N "checking regex.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <regex.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: regex.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: regex.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: regex.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: regex.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: regex.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: regex.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: regex.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: regex.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: regex.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: regex.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: regex.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: regex.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: regex.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: regex.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: regex.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: regex.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------- ##
+## Report this to open-axiom-devel@lists.sf.org ##
+## -------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ 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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_regex_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
+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"
+
+else
+  { echo "$as_me:$LINENO: HyperDoc is disabled." >&5
+echo "$as_me: HyperDoc is disabled." >&6;}
+fi
+
+
+fi
 
 axiom_host_has_libbfd=
 if test "${ac_cv_header_bfd_h+set}" = set; then
@@ -25168,7 +25173,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenAxiom 1.1.0 (experimental) $as_me 2007-08-23, which was
+This file was extended by OpenAxiom 1.1.0 (experimental) $as_me 2007-09-03, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25217,7 +25222,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom 1.1.0 (experimental) config.status 2007-08-23
+OpenAxiom 1.1.0 (experimental) config.status 2007-09-03
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -25329,13 +25334,13 @@ do
     "src/booklets/Makefile") CONFIG_FILES="$CONFIG_FILES src/booklets/Makefile:config/var-def.mk:src/booklets/Makefile.in:config/setup-dep.mk" ;;
     "src/clef/Makefile") CONFIG_FILES="$CONFIG_FILES src/clef/Makefile:config/var-def.mk:src/clef/Makefile.in:config/setup-dep.mk" ;;
     "src/sman/Makefile") CONFIG_FILES="$CONFIG_FILES src/sman/Makefile:config/var-def.mk:src/sman/Makefile.in:config/setup-dep.mk" ;;
-    "src/hyper/Makefile") CONFIG_FILES="$CONFIG_FILES src/hyper/Makefile:config/var-def.mk:src/hyper/Makefile.in:config/setup-dep.mk" ;;
     "src/graph/Makefile") CONFIG_FILES="$CONFIG_FILES src/graph/Makefile:config/var-def.mk:src/graph/Makefile.in:config/setup-dep.mk" ;;
     "src/graph/Gdraws/Makefile") CONFIG_FILES="$CONFIG_FILES src/graph/Gdraws/Makefile:config/var-def.mk:src/graph/Gdraws/Makefile.in:config/setup-dep.mk" ;;
     "src/graph/view2D/Makefile") CONFIG_FILES="$CONFIG_FILES src/graph/view2D/Makefile:config/var-def.mk:src/graph/view2D/Makefile.in:config/setup-dep.mk" ;;
     "src/graph/view3D/Makefile") CONFIG_FILES="$CONFIG_FILES src/graph/view3D/Makefile:config/var-def.mk:src/graph/view3D/Makefile.in:config/setup-dep.mk" ;;
     "src/graph/viewAlone/Makefile") CONFIG_FILES="$CONFIG_FILES src/graph/viewAlone/Makefile:config/var-def.mk:src/graph/viewAlone/Makefile.in:config/setup-dep.mk" ;;
     "src/graph/viewman/Makefile") CONFIG_FILES="$CONFIG_FILES src/graph/viewman/Makefile:config/var-def.mk:src/graph/viewman/Makefile.in:config/setup-dep.mk" ;;
+    "src/hyper/Makefile") CONFIG_FILES="$CONFIG_FILES src/hyper/Makefile:config/var-def.mk:src/hyper/Makefile.in:config/setup-dep.mk" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:config/var-def.mk:Makefile.in:config/setup-dep.mk" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile:config/var-def.mk:src/Makefile.in:config/setup-dep.mk" ;;
     "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile:config/var-def.mk:src/lib/Makefile.in:config/setup-dep.mk" ;;
diff --git a/configure.ac b/configure.ac
index 7cb5f339..de723096 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 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])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
@@ -365,11 +365,6 @@ fi
 
 axiom_src_all="all-input $axiom_src_all"
 AC_SUBST(axiom_use_sman)
-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.])])
 AC_PATH_XTRA
 ## Output directives for the C compiler
 AC_SUBST(X_CLFAGS)
@@ -409,6 +404,15 @@ 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
 
 axiom_host_has_libbfd=
 AC_CHECK_HEADER([bfd.h])
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
diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in
index d861f724..36427c4c 100644
--- a/src/clef/Makefile.in
+++ b/src/clef/Makefile.in
@@ -3,18 +3,16 @@ INC=    $(axiom_src_srcdir)/include
 
 bin_PROGRAMS = clef$(EXEEXT)
 
-clef_sources = edible.c
+clef_SOURCES = edible.c
 
-clef_SOURCES = $(addsuffix .pamphlet, $(clef_sources))
-
-clef_objects = $(clef_sources:.c=.lo)
+clef_objects = $(clef_SOURCES:.c=.lo)
 
 clef_LDADD = $(axiom_target_libdir)/libspad.la
 clef_DEPENDENCIES =
 
 subdir = src/clef/
 
-pamphlets = $(clef_SOURCES) Makefile.pamphlet
+pamphlets = Makefile.pamphlet
 
 .PHONY: all all-clef
 all: all-ax
@@ -31,12 +29,8 @@ $(axiom_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .h
-.PRECIOUS: %.c
 .PRECIOUS: %.lo
 
-%.c: $(srcdir)/%.c.pamphlet
-	$(axiom_build_document) --tangle --output=$@ $<
-
 %.lo: ${INC}/useproto.h ${INC}/edible.h \
 	$(axiom_configdir)/axiom-c-macros.h
 
@@ -45,7 +39,6 @@ $(axiom_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
 
 mostlyclean-local:
 	@rm -f $(clef_objects)
-	@rm -f $(clef_sources)
 	@rm -f stamp
 
 clean-local: mostlyclean-local