Index: configure.ac =================================================================== diff -u -r0228cdf0ec65ab129536c20196a05d593ceb59b4 -rfccf09e0f22cd91e00f937625d6510dcf35dbcd4 --- configure.ac (.../configure.ac) (revision 0228cdf0ec65ab129536c20196a05d593ceb59b4) +++ configure.ac (.../configure.ac) (revision fccf09e0f22cd91e00f937625d6510dcf35dbcd4) @@ -14,7 +14,7 @@ AC_PREREQ([2.69]) define(NsfVersion, 2.1.0) -AC_INIT([nsf],[NsfVersion], [xotcl@alice.wu-wien.ac.at]) +AC_INIT([nsf], [NsfVersion], [https://sourceforge.net/p/next-scripting/tickets/]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([tclconfig]) @@ -24,7 +24,7 @@ # This will define a ${TEA_PLATFORM} variable == "unix" or "windows". #-------------------------------------------------------------------- -TEA_INIT([3.9]) +TEA_INIT([3.10]) #-------------------------------------------------------------------- # specify some extra flags @@ -57,7 +57,7 @@ [build nsf with memcount debug support (default: disabled)]), [enable_memcount=$enableval], [enable_memcount=no]) AC_ARG_ENABLE([development], - AS_HELP_STRING([--enable-development], + AS_HELP_STRING([--enable-development=yes|test], [build nsf with development support (intensive runtime checking, etc.; default: disabled)]), [enable_development=$enableval], [enable_development=no]) AC_ARG_ENABLE([assertions], @@ -104,8 +104,24 @@ AC_SUBST([NSF_MINOR_VERSION]) AC_SUBST([NSF_PATCH_LEVEL]) -echo "Configuring next Version $PACKAGE_VERSION" +echo "Configuring NSF Version $PACKAGE_VERSION" +AC_CHECK_PROG(git_installed,git,"yes", "no") + +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_SUBST([NSF_COMMIT]) + +# AC_DEFINE_UNQUOTED([NSF_COMMIT], "$nsf_commit", +# [Commit ID at the time of the last configure run.]) + #-------------------------------------------------------------------- # Load the tclConfig.sh file #-------------------------------------------------------------------- @@ -181,6 +197,9 @@ if test "$enable_development" = yes; then AC_DEFINE([NSF_DEVELOPMENT], [1], [Are we building with development support?]) fi +if test "$enable_development" = full; then + AC_DEFINE([NSF_DEVELOPMENT_TEST], [1], [Are we building with development support and intesive testing?]) +fi if test "$enable_memcount" = yes; then AC_DEFINE([NSF_MEM_COUNT], [1], [Are we building with memcount support?]) @@ -226,7 +245,7 @@ TEA_ADD_INCLUDES([]) TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([-DNSF_VERSION=\\\"$NSF_VERSION\\\" -DNSF_PATCHLEVEL=\\\"$NSF_PATCH_LEVEL\\\" \ - $AOL_DEFINES ]) +-DNSF_COMMIT=\\\"$NSF_COMMIT\\\" $AOL_DEFINES ]) TEA_ADD_STUB_SOURCES([nsfStubLib.c]) TEA_ADD_TCL_SOURCES([])