Index: configure =================================================================== diff -u -r4a30a3a4a4432089ebe2f4ca8962c3226db64324 -r1c256d871fdda3b5f51923b072129b9c589f567e --- configure (.../configure) (revision 4a30a3a4a4432089ebe2f4ca8962c3226db64324) +++ configure (.../configure) (revision 1c256d871fdda3b5f51923b072129b9c589f567e) @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for nsf 2.1.0. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -267,10 +267,10 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: xotcl@alice.wu-wien.ac.at about your system, including -$0: any error possibly output before this message. Then -$0: install a modern shell, or manually run the script -$0: under such a shell if you do have one." +$0: https://sourceforge.net/p/next-scripting/tickets/ about +$0: your system, including any error possibly output before +$0: this message. Then install a modern shell, or manually +$0: run the script under such a shell if you do have one." fi exit 1 fi @@ -582,7 +582,7 @@ PACKAGE_TARNAME='nsf' PACKAGE_VERSION='2.1.0' PACKAGE_STRING='nsf 2.1.0' -PACKAGE_BUGREPORT='xotcl@alice.wu-wien.ac.at' +PACKAGE_BUGREPORT='https://sourceforge.net/p/next-scripting/tickets/' PACKAGE_URL='' # Factoring default headers for most tests. @@ -719,6 +719,8 @@ TCL_BIN_DIR TCL_PATCH_LEVEL TCL_VERSION +NSF_COMMIT +git_installed NSF_PATCH_LEVEL NSF_MINOR_VERSION NSF_MAJOR_VERSION @@ -1421,7 +1423,8 @@ --enable-memcount=yes|trace build nsf with memcount debug support (default: disabled) - --enable-development build nsf with development support (intensive + --enable-development=yes|test + build nsf with development support (intensive runtime checking, etc.; default: disabled) --enable-assertions build nsf with assertion support (default: enabled) --enable-assemble=yes|label|call @@ -1468,7 +1471,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1876,9 +1879,9 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ---------------------------------------- ## -## Report this to xotcl@alice.wu-wien.ac.at ## -## ---------------------------------------- ##" +( $as_echo "## ---------------------------------------------------------------- ## +## Report this to https://sourceforge.net/p/next-scripting/tickets/ ## +## ---------------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2295,12 +2298,12 @@ as_fn_error $? " The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5 fi - if test x"3.9" = x ; then + if test x"3.10" = x ; then as_fn_error $? " TEA version not specified." "$LINENO" 5 - elif test "3.9" != "${TEA_VERSION}" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.9\", have \"${TEA_VERSION}\"" >&5 -$as_echo "warning: requested TEA version \"3.9\", have \"${TEA_VERSION}\"" >&6; } + elif test "3.10" != "${TEA_VERSION}" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&5 +$as_echo "warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5 $as_echo "ok (TEA ${TEA_VERSION})" >&6; } @@ -2517,8 +2520,61 @@ -echo "Configuring next Version $PACKAGE_VERSION" +echo "Configuring NSF Version $PACKAGE_VERSION" +# Extract the first word of "git", so it can be a program name with args. +set dummy git; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_git_installed+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$git_installed"; then + ac_cv_prog_git_installed="$git_installed" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_git_installed=""yes"" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_git_installed" && ac_cv_prog_git_installed=""no"" +fi +fi +git_installed=$ac_cv_prog_git_installed +if test -n "$git_installed"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $git_installed" >&5 +$as_echo "$git_installed" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + +if test "$git_installed" = "yes" -a -d ".git" ; then + nsf_commit=`git describe --dirty` +elif test -f "COMMIT" ; then + nsf_commit=`cat COMMIT` +else + nsf_commit=unknown-${PACKAGE_VERSION} +fi + +NSF_COMMIT=$nsf_commit + + +# AC_DEFINE_UNQUOTED([NSF_COMMIT], "$nsf_commit", +# [Commit ID at the time of the last configure run.]) + #-------------------------------------------------------------------- # Load the tclConfig.sh file #-------------------------------------------------------------------- @@ -5574,7 +5630,12 @@ $as_echo "#define NSF_DEVELOPMENT 1" >>confdefs.h fi +if test "$enable_development" = full; then +$as_echo "#define NSF_DEVELOPMENT_TEST 1" >>confdefs.h + +fi + if test "$enable_memcount" = yes; then $as_echo "#define NSF_MEM_COUNT 1" >>confdefs.h @@ -5692,7 +5753,7 @@ PKG_CFLAGS="$PKG_CFLAGS -DNSF_VERSION=\\\"$NSF_VERSION\\\" -DNSF_PATCHLEVEL=\\\"$NSF_PATCH_LEVEL\\\" \ - $AOL_DEFINES " +-DNSF_COMMIT=\\\"$NSF_COMMIT\\\" $AOL_DEFINES " @@ -9826,7 +9887,7 @@ Configuration files: $config_files -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1