diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-03-01 17:50:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-03-01 17:50:10 (GMT) |
| commit | eb7f2f1944b8c4d250bee80842c3125f72e04272 (patch) | |
| tree | d558d9855ca4be3edbc7871f7620dfb05ea1efdc | |
| parent | d151599c49a650c1915a39a60b3c21b5f818f0a3 (diff) | |
| download | tk-eb7f2f1944b8c4d250bee80842c3125f72e04272.zip tk-eb7f2f1944b8c4d250bee80842c3125f72e04272.tar.gz tk-eb7f2f1944b8c4d250bee80842c3125f72e04272.tar.bz2 | |
* unix/tcl.m4 (SC_CONFIG_CFLAGS): Allow 64-bit enabling on
IRIX64-6.5* systems. [Bug 218561]
* unix/configure: autoconf-2.57
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | unix/configure | 31 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 |
3 files changed, 23 insertions, 16 deletions
@@ -1,3 +1,9 @@ +2004-03-01 Don Porter <dgp@users.sourceforge.net> + + * unix/tcl.m4 (SC_CONFIG_CFLAGS): Allow 64-bit enabling on + IRIX64-6.5* systems. [Bug 218561] + * unix/configure: autoconf-2.57 + 2004-02-28 Vince Darley <vincentdarley@users.sourceforge.net> * generic/tkTextIndex.c: remove use of internal Tcl interface diff --git a/unix/configure b/unix/configure index f37a755..e9b009e 100755 --- a/unix/configure +++ b/unix/configure @@ -1324,17 +1324,18 @@ echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" > # then check for a private Tcl installation if test x"${ac_cv_c_tclconfig}" = x ; then for i in \ - ../tcl \ - `ls -dr ../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \ - `ls -dr ../tcl[8-9].[0-9] 2>/dev/null` \ - `ls -dr ../tcl[8-9].[0-9]* 2>/dev/null` \ - ../../tcl \ - `ls -dr ../../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \ `ls -dr ../../tcl[8-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tcl[8-9].[0-9]* 2>/dev/null` \ - ../../../tcl \ - `ls -dr ../../../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \ - `ls -dr ../../../tcl[8-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tcl[8-9].[0-9]* 2>/dev/null` ; do + ../tcl \ + `ls -dr ../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \ + `ls -dr ../tcl[8-9].[0-9] 2>/dev/null` \ + `ls -dr ../tcl[8-9].[0-9]* 2>/dev/null` \ + ../../tcl \ + `ls -dr ../../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \ + `ls -dr ../../tcl[8-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tcl[8-9].[0-9]* 2>/dev/null` \ + ../../../tcl \ + `ls -dr ../../../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \ + `ls -dr ../../../tcl[8-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tcl[8-9].[0-9]* 2>/dev/null` ; do if test -f "$i/unix/tclConfig.sh" ; then ac_cv_c_tclconfig=`(cd $i/unix; pwd)` break @@ -1360,9 +1361,9 @@ echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" > if test x"${ac_cv_c_tclconfig}" = x ; then for i in \ ${srcdir}/../tcl \ - `ls -dr ${srcdir}/../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tcl[8-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tcl[8-9].[0-9]* 2>/dev/null` ; do + `ls -dr ${srcdir}/../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tcl[8-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tcl[8-9].[0-9]* 2>/dev/null` ; do if test -f "$i/unix/tclConfig.sh" ; then ac_cv_c_tclconfig=`(cd $i/unix; pwd)` break @@ -4351,7 +4352,7 @@ fi EXTRA_CFLAGS="" LDFLAGS="" ;; - IRIX-6.*|IRIX64-6.5*) + IRIX-6.*) SHLIB_CFLAGS="" SHLIB_LD="ld -n32 -shared -rdata_shared" SHLIB_LD_LIBS='${LIBS}' diff --git a/unix/tcl.m4 b/unix/tcl.m4 index e36f85d..6c5c4c1 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1081,7 +1081,7 @@ dnl AC_CHECK_TOOL(AR, ar) EXTRA_CFLAGS="" LDFLAGS="" ;; - IRIX-6.*|IRIX64-6.5*) + IRIX-6.*) SHLIB_CFLAGS="" SHLIB_LD="ld -n32 -shared -rdata_shared" SHLIB_LD_LIBS='${LIBS}' |