summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-10-15 21:09:19 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-10-15 21:09:19 (GMT)
commitd0041f33437e9af324059ed08c7f158fbb1fef19 (patch)
tree6dc596d1dec134b918a87da4b26faaf1a4d27a64
parent71bcf95b719518cd64e068921561bcd2a503598e (diff)
downloadtcl-d0041f33437e9af324059ed08c7f158fbb1fef19.zip
tcl-d0041f33437e9af324059ed08c7f158fbb1fef19.tar.gz
tcl-d0041f33437e9af324059ed08c7f158fbb1fef19.tar.bz2
-I${BUILD_DIR}/.. doesn't work when BUILD_DIR != "unix".
Reported by Matthias Kraft
-rw-r--r--unix/dltest/Makefile.in2
-rw-r--r--unix/dltest/pkgooa.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index f64b6d5..25b9376 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -22,7 +22,7 @@ LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
LDFLAGS = @LDFLAGS_DEFAULT@ @LDFLAGS@
-CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -I${BUILD_DIR}/.. -DTCL_MEM_DEBUG \
+CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX} pkgua${SHLIB_SUFFIX} pkgooa${SHLIB_SUFFIX}
diff --git a/unix/dltest/pkgooa.c b/unix/dltest/pkgooa.c
index 7b14ca0..78af376 100644
--- a/unix/dltest/pkgooa.c
+++ b/unix/dltest/pkgooa.c
@@ -11,7 +11,7 @@
*/
#undef STATIC_BUILD
-#include "tclOOInt.h"
+#include "tclOO.h"
#include <string.h>
/*
@@ -64,6 +64,8 @@ Pkgooa_StubsOKObjCmd(
*----------------------------------------------------------------------
*/
+extern void *tclOOIntStubsPtr;
+
static TclOOStubs stubsCopy = {
TCL_STUB_MAGIC,
NULL,