summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrjohnson <rjohnson>1998-10-20 20:02:36 (GMT)
committerrjohnson <rjohnson>1998-10-20 20:02:36 (GMT)
commit7fd1d51b3339e75468f95c4a81056dd21313492c (patch)
tree98a6c8cdeb7ae95f2ed7e1f445fc7324bcc595ac
parent0fbfe58bf8152bb450a4414115379cc74938595f (diff)
downloadtk-7fd1d51b3339e75468f95c4a81056dd21313492c.zip
tk-7fd1d51b3339e75468f95c4a81056dd21313492c.tar.gz
tk-7fd1d51b3339e75468f95c4a81056dd21313492c.tar.bz2
Changed config & Makefile to support n32 format on IRIX.
-rw-r--r--changes8
-rw-r--r--unix/Makefile.in4
-rw-r--r--unix/configure.in4
3 files changed, 12 insertions, 4 deletions
diff --git a/changes b/changes
index fbc893b..21fcd8c 100644
--- a/changes
+++ b/changes
@@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was
released on March 13, 1991. Changes that aren't backward compatible
are marked specially.
-RCS: @(#) $Id: changes,v 1.24 1998/10/16 00:46:18 rjohnson Exp $
+RCS: @(#) $Id: changes,v 1.25 1998/10/20 20:02:36 rjohnson Exp $
3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from
the interpreter when the main window is deleted (otherwise there will
@@ -4271,3 +4271,9 @@ for submitting this improvement. (RJ)
not allow the empty string as an argument (meaning transparent) even
though every other item type did. Thanks to Sebastian Wangnick
<sebastian.wangnick@eurocontrol.be> for supplying this patch. (RJ)
+
+10/20/98 (feature change) The Makefile and configure scripts have been
+changed for IRIX to build n32 binaries instead of the old 32 abi
+format. If you have extensions built with the o32 abi's you will need
+to update them to n32 for them to work with Tcl. (RJ)
+*** POTENTIAL INCOMPATIBILITY ***
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 072cb59..b4299df 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.10 1998/09/23 20:18:03 build Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.11 1998/10/20 20:02:37 rjohnson Exp $
# Current Tk version; used in various names.
@@ -187,7 +187,7 @@ TK_LD_SEARCH_FLAGS = @TK_LD_SEARCH_FLAGS@
# modify any of this stuff by hand.
#----------------------------------------------------------------
-AC_FLAGS = @DEFS@
+AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@
RANLIB = @RANLIB@
SRC_DIR = @srcdir@/..
TOP_DIR = @srcdir@/..
diff --git a/unix/configure.in b/unix/configure.in
index b818998..71e15d5 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to
dnl generate the file "configure", which is run during Tk installation
dnl to configure the system for the local environment.
AC_INIT(../generic/tk.h)
-# RCS: @(#) $Id: configure.in,v 1.21 1998/10/14 00:59:15 rjohnson Exp $
+# RCS: @(#) $Id: configure.in,v 1.22 1998/10/20 20:02:38 rjohnson Exp $
TK_VERSION=8.0
TK_MAJOR_VERSION=8
@@ -85,6 +85,7 @@ DL_LIBS=$TCL_DL_LIBS
LD_FLAGS=$TCL_LD_FLAGS
CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
+EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
@@ -411,6 +412,7 @@ AC_SUBST(CFLAGS_OPTIMIZE)
AC_SUBST(CFLAGS_WARNING)
AC_SUBST(TK_DBGX)
AC_SUBST(DL_LIBS)
+AC_SUBST(EXTRA_CFLAGS)
AC_SUBST(LD_FLAGS)
AC_SUBST(MATH_LIBS)
AC_SUBST(MAKE_LIB)