diff options
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/sman/sman.c | 3 |
4 files changed, 17 insertions, 12 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for OpenAxiom 1.5.0-2011-06-15. +# Generated by GNU Autoconf 2.65 for OpenAxiom 1.5.0-2011-06-30. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.5.0-2011-06-15' -PACKAGE_STRING='OpenAxiom 1.5.0-2011-06-15' +PACKAGE_VERSION='1.5.0-2011-06-30' +PACKAGE_STRING='OpenAxiom 1.5.0-2011-06-30' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' PACKAGE_URL='' @@ -1493,7 +1493,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.5.0-2011-06-15 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.5.0-2011-06-30 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1568,7 +1568,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2011-06-15:";; + short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2011-06-30:";; esac cat <<\_ACEOF @@ -1679,7 +1679,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.5.0-2011-06-15 +OpenAxiom configure 1.5.0-2011-06-30 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2669,7 +2669,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 $as_me 1.5.0-2011-06-15, which was +It was created by OpenAxiom $as_me 1.5.0-2011-06-30, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -5568,7 +5568,7 @@ fi # Define the identity of the package. PACKAGE='openaxiom' - VERSION='1.5.0-2011-06-15' + VERSION='1.5.0-2011-06-30' cat >>confdefs.h <<_ACEOF @@ -21558,7 +21558,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.5.0-2011-06-15, which was +This file was extended by OpenAxiom $as_me 1.5.0-2011-06-30, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21624,7 +21624,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenAxiom config.status 1.5.0-2011-06-15 +OpenAxiom config.status 1.5.0-2011-06-30 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 48dea112..f48b2b0e 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ dnl Makefiles for building OpenAxiom interpreter, compiler, libraries, and dnl auxiliary tools where appropriate. dnl -AC_INIT([OpenAxiom], [1.5.0-2011-06-15], +AC_INIT([OpenAxiom], [1.5.0-2011-06-30], [open-axiom-bugs@lists.sf.net]) dnl Most of the macros used in this configure.ac are defined in files diff --git a/src/ChangeLog b/src/ChangeLog index 7b78d0b3..b1ec2b77 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-06-30 Gabriel Dos Reis <gdr@cs.tamu.edu> + * sman/sman.c (main): Don't start Hyperdoc if no X11 server is running. + +2011-06-30 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/modemap.boot: Cleanup inactive codes. 2011-06-27 Gabriel Dos Reis <gdr@cs.tamu.edu> diff --git a/src/sman/sman.c b/src/sman/sman.c index b1fe4a0d..be21226d 100644 --- a/src/sman/sman.c +++ b/src/sman/sman.c @@ -776,7 +776,8 @@ main(int argc, char *argv[]) start_the_session_manager(); if (start_spadclient) start_the_spadclient(); if (start_local_spadclient) start_the_local_spadclient(); - if (start_ht) start_the_hypertex(); + if (start_ht and in_X()) + start_the_hypertex(); if (start_graphics and in_X()) start_the_graphics(); openaxiom_sleep(1); |