Fisheye: Tag 8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8 refers to a dead (removed) revision in file `apps/utils/getstubs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: configure =================================================================== diff -u -r4619c8c851c573ae6876375f8e7fdd9d9ffaa3a1 -r8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8 --- configure (.../configure) (revision 4619c8c851c573ae6876375f8e7fdd9d9ffaa3a1) +++ configure (.../configure) (revision 8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8) @@ -5558,12 +5558,8 @@ # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- +stubdir=stubs${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} -echo "==================== put version-specific stub files in place (needed for Tcl 8.6)" -make getstubs -echo "==================== getstubs done" - - vars="nsf.c nsfError.c nsfObjectData.c nsfProfile.c \ nsfDebug.c nsfUtil.c nsfObj.c nsfPointer.c nsfEnumerationType.c \ nsfCmdDefinitions.c nsfShadow.c nsfCompile.c aolstub.c nsfStubInit.c" @@ -5601,7 +5597,7 @@ - vars="generic/nsf.h generic/nsfInt.h generic/nsfDecls.h generic/nsfIntDecls.h" + vars="generic/nsf.h generic/nsfInt.h generic/${stubdir}/nsfDecls.h generic/${stubdir}/nsfIntDecls.h" for i in $vars; do # check for existence, be strict because it is installed if test ! -f "${srcdir}/$i" ; then Index: configure.ac =================================================================== diff -u -r4619c8c851c573ae6876375f8e7fdd9d9ffaa3a1 -r8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8 --- configure.ac (.../configure.ac) (revision 4619c8c851c573ae6876375f8e7fdd9d9ffaa3a1) +++ configure.ac (.../configure.ac) (revision 8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8) @@ -218,15 +218,11 @@ # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- - -echo "==================== put version-specific stub files in place (needed for Tcl 8.6)" -make getstubs -echo "==================== getstubs done" - +stubdir=stubs${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} TEA_ADD_SOURCES([nsf.c nsfError.c nsfObjectData.c nsfProfile.c \ nsfDebug.c nsfUtil.c nsfObj.c nsfPointer.c nsfEnumerationType.c \ nsfCmdDefinitions.c nsfShadow.c nsfCompile.c aolstub.c nsfStubInit.c]) -TEA_ADD_HEADERS([generic/nsf.h generic/nsfInt.h generic/nsfDecls.h generic/nsfIntDecls.h]) +TEA_ADD_HEADERS([generic/nsf.h generic/nsfInt.h generic/${stubdir}/nsfDecls.h generic/${stubdir}/nsfIntDecls.h]) TEA_ADD_INCLUDES([]) TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([-DNSF_VERSION=\\\"$NSF_VERSION\\\" -DNSF_PATCHLEVEL=\\\"$NSF_PATCH_LEVEL\\\" \ Index: generic/nsf.h =================================================================== diff -u -r0e9d5ded9b89798e10f64e8a172d8684d75bc85f -r8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8 --- generic/nsf.h (.../nsf.h) (revision 0e9d5ded9b89798e10f64e8a172d8684d75bc85f) +++ generic/nsf.h (.../nsf.h) (revision 8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8) @@ -466,7 +466,11 @@ * Include the public function declarations that are accessible via * the stubs table. */ -#include "nsfDecls.h" +#if defined(NRE) +# include "stubs8.6/nsfDecls.h" +#else +# include "stubs8.5/nsfDecls.h" +#endif /* * Nsf_InitStubs is used by extensions that can be linked Index: generic/nsfInt.h =================================================================== diff -u -r46e91441fa18c0dbcabc216779c00c607740a883 -r8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8 --- generic/nsfInt.h (.../nsfInt.h) (revision 46e91441fa18c0dbcabc216779c00c607740a883) +++ generic/nsfInt.h (.../nsfInt.h) (revision 8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8) @@ -953,12 +953,15 @@ /* * - * internally used API functions + * Internally used API functions * */ +#if defined(NRE) +# include "stubs8.6/nsfIntDecls.h" +#else +# include "stubs8.5/nsfIntDecls.h" +#endif -#include "nsfIntDecls.h" - /* * Profiling functions */