Index: configure =================================================================== diff -u -r35c67391973a07983d0b0dfe70706e6a69fbdbfc -raf4326a00a0f2d0b2f1e0369af71637f48c2d56a --- configure (.../configure) (revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc) +++ configure (.../configure) (revision af4326a00a0f2d0b2f1e0369af71637f48c2d56a) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for next 2.0.0. +# Generated by GNU Autoconf 2.61 for nx 2.0.0. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -570,10 +570,10 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME='next' -PACKAGE_TARNAME='next' +PACKAGE_NAME='nx' +PACKAGE_TARNAME='nx' PACKAGE_VERSION='2.0.0' -PACKAGE_STRING='next 2.0.0' +PACKAGE_STRING='nx 2.0.0' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -661,10 +661,10 @@ PKG_LIBS PKG_CFLAGS subdirs -XOTCL_VERSION -XOTCL_MAJOR_VERSION -XOTCL_MINOR_VERSION -XOTCL_RELEASE_LEVEL +NX_VERSION +NX_MAJOR_VERSION +NX_MINOR_VERSION +NX_RELEASE_LEVEL TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR @@ -734,24 +734,24 @@ MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG -XOTCL_COMPATIBLE_TCLSH +NX_COMPATIBLE_TCLSH PKG_DIR pkgdatadir pkglibdir pkgincludedir SHARED_LIB_SUFFIX UNSHARED_LIB_SUFFIX -XOTCL_BUILD_LIB_SPEC -XOTCL_LIB_SPEC -XOTCL_BUILD_STUB_LIB_SPEC -XOTCL_STUB_LIB_SPEC -XOTCL_BUILD_STUB_LIB_PATH -XOTCL_STUB_LIB_PATH -XOTCL_SRC_DIR -XOTCLSH +NX_BUILD_LIB_SPEC +NX_LIB_SPEC +NX_BUILD_STUB_LIB_SPEC +NX_STUB_LIB_SPEC +NX_BUILD_STUB_LIB_PATH +NX_STUB_LIB_PATH +NX_SRC_DIR +NXSH XOWISH -XOTCL_BUILD_INCLUDE_DIR -XOTCL_BUILD_INCLUDE_SPEC +NX_BUILD_INCLUDE_DIR +NX_BUILD_INCLUDE_SPEC test_actiweb libdirs_actiweb apps_actiweb @@ -1270,7 +1270,7 @@ # 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 next 2.0.0 to adapt to many kinds of systems. +\`configure' configures nx 2.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/next] + --docdir=DIR documentation root [DATAROOTDIR/doc/nx] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1331,7 +1331,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of next 2.0.0:";; + short | recursive ) echo "Configuration of nx 2.0.0:";; esac cat <<\_ACEOF @@ -1358,8 +1358,8 @@ --without-aolserver3 disables build of AOLserver 3 module --with-actiweb=yes|no, --without-actiweb disables actiweb components - --with-xotclsh=yes|no, - --without-xotclsh disables built of xotclsh + --with-nxsh=yes|no, + --without-nxsh disables built of nxsh --with-xowish=yes|no, --without-xowish disables built of xowish --with-all=yes|no, @@ -1447,7 +1447,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -next configure 2.0.0 +nx configure 2.0.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1461,7 +1461,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by next $as_me 2.0.0, which was +It was created by nx $as_me 2.0.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1989,11 +1989,11 @@ fi -# Check whether --with-xotclsh was given. -if test "${with_xotclsh+set}" = set; then - withval=$with_xotclsh; with_xotclsh=$withval +# Check whether --with-nxsh was given. +if test "${with_nxsh+set}" = set; then + withval=$with_nxsh; with_nxsh=$withval else - with_xotclsh=no + with_nxsh=no fi @@ -2031,7 +2031,7 @@ if test "$with_all" = yes; then with_actiweb=yes - with_xotclsh=yes + with_nxsh=yes with_xowish=yes with_gdbm=yes fi @@ -2059,7 +2059,7 @@ if test "$with_tk" = no; then with_xowish="" ; fi -if test "$with_xotclsh" = yes; then XOTCLSH="nxsh" ; else XOTCLSH=""; fi +if test "$with_nxsh" = yes; then NXSH="nxsh" ; else NXSH=""; fi if test "$with_xowish" = yes; then XOWISH="xowish" ; else XOWISH=""; fi @@ -2071,13 +2071,14 @@ # other systems. #-------------------------------------------------------------------- -# do not modify the following lines manually, they are generated with changeXOTclVersion -XOTCL_MAJOR_VERSION=2 -XOTCL_MINOR_VERSION=0 -XOTCL_RELEASE_LEVEL=.0 +# do not modify the following lines manually, they are generated with +# the script changeXOTclVersion +NX_MAJOR_VERSION=2 +NX_MINOR_VERSION=0 +NX_RELEASE_LEVEL=.0 -XOTCL_VERSION=${XOTCL_MAJOR_VERSION}.${XOTCL_MINOR_VERSION} -NODOT_VERSION=${XOTCL_MAJOR_VERSION}${XOTCL_MINOR_VERSION} +NX_VERSION=${NX_MAJOR_VERSION}.${NX_MINOR_VERSION} +NODOT_VERSION=${NX_MAJOR_VERSION}${NX_MINOR_VERSION} @@ -7083,7 +7084,7 @@ vars="xotcl.c xotclError.c xotclMetaData.c xotclObjectData.c xotclProfile.c \ - xotclTrace.c xotclUtil.c xotclShadow.c xotclCompile.c aolstub.c xotclStubInit.c" + xotclTrace.c xotclUtil.c xotclShadow.c xotclCompile.c aolstub.c nxStubInit.c" for i in $vars; do case $i in \$*) @@ -7119,7 +7120,7 @@ - vars="generic/xotcl.h generic/xotclInt.h generic/xotclDecls.h generic/xotclIntDecls.h" + vars="generic/xotcl.h generic/xotclInt.h generic/nxDecls.h generic/nxIntDecls.h" for i in $vars; do # check for existence, be strict because it is installed if test ! -f "${srcdir}/$i" ; then @@ -7150,12 +7151,12 @@ - PKG_CFLAGS="$PKG_CFLAGS -DXOTCLVERSION=\\\"$XOTCL_VERSION\\\" -DXOTCLPATCHLEVEL=\\\"$XOTCL_RELEASE_LEVEL\\\" \ + PKG_CFLAGS="$PKG_CFLAGS -DNXVERSION=\\\"$NX_VERSION\\\" -DNXPATCHLEVEL=\\\"$NX_RELEASE_LEVEL\\\" \ $AOL_DEFINES $HAVE_TCL_COMPILE_H" - vars="xotclStubLib.c" + vars="nxStubLib.c" for i in $vars; do # check for existence - allows for generic/win/unix VPATH if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ @@ -11264,17 +11265,17 @@ -# Without the following two eval statements, XOTCL_SHARED_LIB_SUFFIX +# Without the following two eval statements, NX_SHARED_LIB_SUFFIX # in xotclConfig.sh has $PACKAGE_VERSION unresolved. When another # app links against xotcl, the PACKAGE_VERSIONs are confused. # # Without the first eval, we get -# XOTCL_SHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}${SHLIB_SUFFIX} -# XOTCL_UNSHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}.a +# NX_SHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}${SHLIB_SUFFIX} +# NX_UNSHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}.a # # after the first eval, we get -# XOTCL_SHARED_LIB_SUFFIX=1.2.1${DBGX}.so -# XOTCL_UNSHARED_LIB_SUFFIX=1.2.1${DBGX}.a +# NX_SHARED_LIB_SUFFIX=1.2.1${DBGX}.so +# NX_UNSHARED_LIB_SUFFIX=1.2.1${DBGX}.a # after the second eval, all variables are resolved. @@ -11481,7 +11482,7 @@ # make this available, for such as xotclConfig.sh -XOTCL_COMPATIBLE_TCLSH=${TCLSH_PROG} +NX_COMPATIBLE_TCLSH=${TCLSH_PROG} # resolve the variables @@ -11506,34 +11507,34 @@ if test "${TEA_PLATFORM}" != "windows" ; then -XOTCL_BUILD_LIB_SPEC="-L`pwd` -lxotcl${PACKAGE_VERSION}" -XOTCL_LIB_SPEC="-L${pkglibdir} -lxotcl${PACKAGE_VERSION}" +NX_BUILD_LIB_SPEC="-L`pwd` -lnext${PACKAGE_VERSION}" +NX_LIB_SPEC="-L${pkglibdir} -lnext${PACKAGE_VERSION}" # stub libs are not build for 8.0 if test "${TCL_MAJOR_VERSION}" = "8" -a "${TCL_MINOR_VERSION}" = "0"; then - XOTCL_BUILD_STUB_LIB_PATH="" - XOTCL_STUB_LIB_PATH="" - XOTCL_BUILD_STUB_LIB_SPEC="" - XOTCL_STUB_LIB_SPEC="" + NX_BUILD_STUB_LIB_PATH="" + NX_STUB_LIB_PATH="" + NX_BUILD_STUB_LIB_SPEC="" + NX_STUB_LIB_SPEC="" else - XOTCL_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" - XOTCL_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" - XOTCL_BUILD_STUB_LIB_SPEC="-L`pwd` -lxotclstub${PACKAGE_VERSION}" - XOTCL_STUB_LIB_SPEC="-L${pkglibdir} -lxotclstub${PACKAGE_VERSION}" + NX_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" + NX_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" + NX_BUILD_STUB_LIB_SPEC="-L`pwd` -lnextstub${PACKAGE_VERSION}" + NX_STUB_LIB_SPEC="-L${pkglibdir} -lnextstub${PACKAGE_VERSION}" cat >>confdefs.h <<\_ACEOF -#define COMPILE_XOTCL_STUBS 1 +#define COMPILE_NX_STUBS 1 _ACEOF fi else -XOTCL_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}" -XOTCL_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}" -XOTCL_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" -XOTCL_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" -XOTCL_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}" -XOTCL_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}" +NX_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}" +NX_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}" +NX_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" +NX_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" +NX_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}" +NX_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}" fi @@ -11545,14 +11546,14 @@ -XOTCL_SRC_DIR=$srcdir +NX_SRC_DIR=$srcdir # include dir of xotcl during build process (i.e., does not assume installed) -XOTCL_BUILD_INCLUDE_DIR="${XOTCL_SRC_DIR}/generic" -XOTCL_BUILD_INCLUDE_SPEC="-I${XOTCL_BUILD_INCLUDE_DIR}" +NX_BUILD_INCLUDE_DIR="${NX_SRC_DIR}/generic" +NX_BUILD_INCLUDE_SPEC="-I${NX_BUILD_INCLUDE_DIR}" @@ -12014,7 +12015,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by next $as_me 2.0.0, which was +This file was extended by nx $as_me 2.0.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12057,7 +12058,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -next config.status 2.0.0 +nx config.status 2.0.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -12271,10 +12272,10 @@ PKG_LIBS!$PKG_LIBS$ac_delim PKG_CFLAGS!$PKG_CFLAGS$ac_delim subdirs!$subdirs$ac_delim -XOTCL_VERSION!$XOTCL_VERSION$ac_delim -XOTCL_MAJOR_VERSION!$XOTCL_MAJOR_VERSION$ac_delim -XOTCL_MINOR_VERSION!$XOTCL_MINOR_VERSION$ac_delim -XOTCL_RELEASE_LEVEL!$XOTCL_RELEASE_LEVEL$ac_delim +NX_VERSION!$NX_VERSION$ac_delim +NX_MAJOR_VERSION!$NX_MAJOR_VERSION$ac_delim +NX_MINOR_VERSION!$NX_MINOR_VERSION$ac_delim +NX_RELEASE_LEVEL!$NX_RELEASE_LEVEL$ac_delim TCL_VERSION!$TCL_VERSION$ac_delim TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim @@ -12385,24 +12386,24 @@ MAKE_STUB_LIB!$MAKE_STUB_LIB$ac_delim RANLIB_STUB!$RANLIB_STUB$ac_delim TCLSH_PROG!$TCLSH_PROG$ac_delim -XOTCL_COMPATIBLE_TCLSH!$XOTCL_COMPATIBLE_TCLSH$ac_delim +NX_COMPATIBLE_TCLSH!$NX_COMPATIBLE_TCLSH$ac_delim PKG_DIR!$PKG_DIR$ac_delim pkgdatadir!$pkgdatadir$ac_delim pkglibdir!$pkglibdir$ac_delim pkgincludedir!$pkgincludedir$ac_delim SHARED_LIB_SUFFIX!$SHARED_LIB_SUFFIX$ac_delim UNSHARED_LIB_SUFFIX!$UNSHARED_LIB_SUFFIX$ac_delim -XOTCL_BUILD_LIB_SPEC!$XOTCL_BUILD_LIB_SPEC$ac_delim -XOTCL_LIB_SPEC!$XOTCL_LIB_SPEC$ac_delim -XOTCL_BUILD_STUB_LIB_SPEC!$XOTCL_BUILD_STUB_LIB_SPEC$ac_delim -XOTCL_STUB_LIB_SPEC!$XOTCL_STUB_LIB_SPEC$ac_delim -XOTCL_BUILD_STUB_LIB_PATH!$XOTCL_BUILD_STUB_LIB_PATH$ac_delim -XOTCL_STUB_LIB_PATH!$XOTCL_STUB_LIB_PATH$ac_delim -XOTCL_SRC_DIR!$XOTCL_SRC_DIR$ac_delim -XOTCLSH!$XOTCLSH$ac_delim +NX_BUILD_LIB_SPEC!$NX_BUILD_LIB_SPEC$ac_delim +NX_LIB_SPEC!$NX_LIB_SPEC$ac_delim +NX_BUILD_STUB_LIB_SPEC!$NX_BUILD_STUB_LIB_SPEC$ac_delim +NX_STUB_LIB_SPEC!$NX_STUB_LIB_SPEC$ac_delim +NX_BUILD_STUB_LIB_PATH!$NX_BUILD_STUB_LIB_PATH$ac_delim +NX_STUB_LIB_PATH!$NX_STUB_LIB_PATH$ac_delim +NX_SRC_DIR!$NX_SRC_DIR$ac_delim +NXSH!$NXSH$ac_delim XOWISH!$XOWISH$ac_delim -XOTCL_BUILD_INCLUDE_DIR!$XOTCL_BUILD_INCLUDE_DIR$ac_delim -XOTCL_BUILD_INCLUDE_SPEC!$XOTCL_BUILD_INCLUDE_SPEC$ac_delim +NX_BUILD_INCLUDE_DIR!$NX_BUILD_INCLUDE_DIR$ac_delim +NX_BUILD_INCLUDE_SPEC!$NX_BUILD_INCLUDE_SPEC$ac_delim test_actiweb!$test_actiweb$ac_delim libdirs_actiweb!$libdirs_actiweb$ac_delim apps_actiweb!$apps_actiweb$ac_delim