From 18da38f7b3f2484255769f506b0fc0cc76508baf Mon Sep 17 00:00:00 2001 From: stanton Date: Thu, 10 Dec 1998 19:13:46 +0000 Subject: merged 8.0 changes --- unix/dltest/Makefile.in | 5 +++-- unix/dltest/configure.in | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in index 1f1035f..75d268d 100644 --- a/unix/dltest/Makefile.in +++ b/unix/dltest/Makefile.in @@ -1,10 +1,11 @@ # This Makefile is used to create several test cases for Tcl's load # command. It also illustrates how to take advantage of configuration # exported by Tcl to set up Makefiles for shared libraries. -# RCS: @(#) $Id: Makefile.in,v 1.1.2.1 1998/09/24 23:59:47 stanton Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.1.2.2 1998/12/10 19:13:46 stanton Exp $ CC = @CC@ LIBS = @TCL_BUILD_LIB_SPEC@ @TCL_LIBS@ -lc +AC_FLAGS = @EXTRA_CFLAGS@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_SUFFIX = @SHLIB_SUFFIX@ @@ -14,7 +15,7 @@ TCL_VERSION= @TCL_VERSION@ CFLAGS = -g CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \ - ${SHLIB_CFLAGS} + ${SHLIB_CFLAGS} ${AC_FLAGS} all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX} diff --git a/unix/dltest/configure.in b/unix/dltest/configure.in index ee3df12..9b3724e 100644 --- a/unix/dltest/configure.in +++ b/unix/dltest/configure.in @@ -2,7 +2,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run to configure the dnl Makefile in this directory. AC_INIT(pkga.c) -# RCS: @(#) $Id: configure.in,v 1.1.2.1 1998/09/24 23:59:47 stanton Exp $ +# RCS: @(#) $Id: configure.in,v 1.1.2.2 1998/12/10 19:13:46 stanton Exp $ # Recover information that Tcl computed with its configure script. @@ -12,6 +12,8 @@ CC=$TCL_CC AC_SUBST(CC) SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS AC_SUBST(SHLIB_CFLAGS) +EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS +AC_SUBST(EXTRA_CFLAGS) SHLIB_LD=$TCL_SHLIB_LD AC_SUBST(SHLIB_LD) SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS -- cgit v0.12