summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-11-02 01:19:51 (GMT)
committerhobbs <hobbs>2000-11-02 01:19:51 (GMT)
commitb0795fb7df818e89571c8bbc4407a0def9330aa9 (patch)
treec9fd6dc5f9c5960d1627698c40da1b82ffd3e96e
parent2a8f512d80b11ec374dc34e28f29729a48d1e2cb (diff)
downloadtk-b0795fb7df818e89571c8bbc4407a0def9330aa9.zip
tk-b0795fb7df818e89571c8bbc4407a0def9330aa9.tar.gz
tk-b0795fb7df818e89571c8bbc4407a0def9330aa9.tar.bz2
* unix/tcl.m4: removed use of -lbsd and -ldl for AIX-5.
-rw-r--r--ChangeLog10
-rw-r--r--unix/tcl.m489
2 files changed, 46 insertions, 53 deletions
diff --git a/ChangeLog b/ChangeLog
index 9daeb85..13800be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-11-01 Jeff Hobbs <hobbs@ajubasolutions.com>
+
+ * win/tkWinDialog.c (GetFileNameW, GetFileNameA,
+ Tk_ChooseDirectoryObjCmd): created
+ work-around for change in NT5.0/98 that caused no initialdir
+ setting to open the browser up in the user's documents dir.
+
+ * tests/color.test: marked color-2.6 nonPortable as we can't
+ reliably assume what 'red' maps to.
+
2000-11-01 Eric Melski <ericm@ajubasolutions.com>
* win/tkWinDialog.c: Added branch for 0 return from
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 6c3d59f..16aedcc 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -604,32 +604,24 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
+ # AIX-5 has dl* in libc.so
+ DL_LIBS=""
LDFLAGS=""
if test "$using_gcc" = "yes" ; then
LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
else
- LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR} -R${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
fi
- ;;
- AIX-4.[[2-9]])
- if test "${TCL_THREADS}" = "1" -a "$using_gcc" = "no" ; then
- # AIX requires the _r compiler when gcc isn't being used
- if test "${CC}" != "cc_r" ; then
- CC=${CC}_r
+
+ if test "$do64bit" = "yes" ; then
+ if test "$using_gcc" = "no" ; then
+ do64bit_ok=yes
+ EXTRA_CFLAGS="-q64"
+ LDFLAGS="-q64"
+ else
+ AC_MSG_WARN("64bit mode not supported with GCC on $system")
fi
- AC_MSG_RESULT(Using $CC for compiling with threads)
fi
- SHLIB_CFLAGS=""
- SHLIB_LD="$fullSrcDir/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
- SHLIB_LD_LIBS='${LIBS}'
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
- LDFLAGS=""
- LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- TCL_NEEDS_EXP_FILE=1
- TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
;;
AIX-*)
if test "${TCL_THREADS}" = "1" -a "$using_gcc" = "no" ; then
@@ -644,12 +636,35 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
- LIBOBJS="$LIBOBJS tclLoadAix.o"
- DL_LIBS="-lld"
+ DL_LIBS="-ldl"
LDFLAGS=""
LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
TCL_NEEDS_EXP_FILE=1
TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
+
+ # AIX v<=4.1 has some different flags than 4.2+
+ if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
+ LIBOBJS="$LIBOBJS tclLoadAix.o"
+ DL_LIBS="-lld"
+ fi
+
+ # On AIX <=v4 systems, libbsd.a has to be linked in to support
+ # non-blocking file IO. This library has to be linked in after
+ # the MATH_LIBS or it breaks the pow() function. The way to
+ # insure proper sequencing, is to add it to the tail of MATH_LIBS.
+ # This library also supplies gettimeofday.
+ #
+ # AIX does not have a timezone field in struct tm. When the AIX
+ # bsd library is used, the timezone global and the gettimeofday
+ # methods are to be avoided for timezone deduction instead, we
+ # deduce the timezone by comparing the localtime result on a
+ # known GMT value.
+
+ AC_CHECK_LIB(bsd, gettimeofday, libbsd=yes, libbsd=no)
+ if test $libbsd = yes; then
+ MATH_LIBS="$MATH_LIBS -lbsd"
+ AC_DEFINE(USE_DELTA_FOR_TZ)
+ fi
;;
BSD/OS-2.1*|BSD/OS-3*)
SHLIB_CFLAGS=""
@@ -978,7 +993,6 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
SHLIB_LD="/usr/ccs/bin/ld -G -z text"
LDFLAGS=""
- do64bit_ok=no
if test "$do64bit" = "yes" ; then
arch=`isainfo`
if test "$arch" = "sparcv9 sparc" ; then
@@ -1578,20 +1592,6 @@ AC_DEFUN(SC_TIME_HANDLER, [
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))
fi
-
- #
- # AIX does not have a timezone field in struct tm. When the AIX bsd
- # library is used, the timezone global and the gettimeofday methods are
- # to be avoided for timezone deduction instead, we deduce the timezone
- # by comparing the localtime result on a known GMT value.
- #
-
- if test "`uname -s`" = "AIX" ; then
- AC_CHECK_LIB(bsd, gettimeofday, libbsd=yes)
- if test $libbsd = yes; then
- AC_DEFINE(USE_DELTA_FOR_TZ)
- fi
- fi
])
#--------------------------------------------------------------------
@@ -1684,23 +1684,6 @@ AC_DEFUN(SC_TCL_LINK_LIBS, [
AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"])
#--------------------------------------------------------------------
- # On AIX systems, libbsd.a has to be linked in to support
- # non-blocking file IO. This library has to be linked in after
- # the MATH_LIBS or it breaks the pow() function. The way to
- # insure proper sequencing, is to add it to the tail of MATH_LIBS.
- # This library also supplies gettimeofday.
- #--------------------------------------------------------------------
-
- libbsd=no
- if test "`uname -s`" = "AIX" ; then
- AC_CHECK_LIB(bsd, gettimeofday, libbsd=yes)
- if test $libbsd = yes; then
- MATH_LIBS="$MATH_LIBS -lbsd"
- fi
- fi
-
-
- #--------------------------------------------------------------------
# Interactive UNIX requires -linet instead of -lsocket, plus it
# needs net/errno.h to define the socket-related error codes.
#--------------------------------------------------------------------