bucket_FF/expect

   1 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
   2
   3 NAMEBASE=               expect
   4 VERSION=                5.45.4
   5 REVISION=               1
   6 KEYWORDS=               lang
   7 VARIANTS=               standard
   8 SDESC[standard]=        Tool for automating interactive applications
   9 HOMEPAGE=               https://core.tcl.tk/expect/
  10 CONTACT=                nobody
  11
  12 DOWNLOAD_GROUPS=        main
  13 SITES[main]=            SF/expect/Expect/5.45.4
  14 DISTFILE[1]=            expect5.45.4.tar.gz:main
  15 DF_INDEX=               1
  16 SPKGS[standard]=        complete
  17                         primary
  18                         tools
  19                         dev
  20                         man
  21
  22 OPTIONS_AVAILABLE=      none
  23 OPTIONS_STANDARD=       none
  24
  25 USES=                   autoreconf cpe tcl:tea
  26
  27 DISTNAME=               expect5.45.4
  28
  29 LICENSE=                PUBDOM:primary
  30 LICENSE_FILE=           PUBDOM:{{WRKSRC}}/license.terms
  31 LICENSE_SCHEME=         solo
  32
  33 CPE_VENDOR=             don_libes
  34 FPC_EQUIVALENT=         lang/expect
  35
  36 CONFIGURE_ARGS=         --datadir={{PREFIX}}/share/expect
  37
  38 PLIST_SUB=              PORTVERSION=5.45.4
  39
  40 VAR_OPSYS[darwin]=      VAR1=1.dylib
  41
  42 post-install:
  43         ${LN} -sf expect5.45.4/libexpect5.45.4.${LIBEXT} \
  44                 ${STAGEDIR}${PREFIX}/lib/libexpect.${VAR1:Uso.1}
  45         ${LN} -sf libexpect.${VAR1:Uso.1} ${STAGEDIR}${PREFIX}/lib/libexpect.${LIBEXT}
  46         ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libexpect.${LIBEXT}
  47         ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/expect
  48
  49 [FILE:290:descriptions/desc.primary]
  50 Expect is a program that performs programmed dialogue with other
  51 interactive programs.  It is briefly described by its man page, expect(1).
  52
  53 It uses pseudo-tty's to control the child processes, so it is not affected
  54 by programs that refuse to read from stdin or pipes. (eg: passwd(1) etc).
  55
  56
  57 [FILE:39:descriptions/desc.tools]
  58 This package contains the expect tool.
  59
  60
  61 [FILE:98:distinfo]
  62 49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34       632363 expect5.45.4.tar.gz
  63
  64
  65 [FILE:89:manifests/plist.primary]
  66 lib/libexpect.so.1
  67 lib/expect%%PORTVERSION%%/
  68  libexpect%%PORTVERSION%%.so
  69  pkgIndex.tcl
  70
  71
  72 [FILE:378:manifests/plist.tools]
  73 bin/expect
  74 share/expect/
  75  autoexpect
  76  autoexpect.1
  77  autopasswd
  78  cryptdir
  79  cryptdir.1
  80  decryptdir
  81  decryptdir.1
  82  dislocate
  83  dislocate.1
  84  ftp-rfc
  85  kibitz
  86  kibitz.1
  87  lpunlock
  88  mkpasswd
  89  mkpasswd.1
  90  multixterm
  91  multixterm.1
  92  passmass
  93  passmass.1
  94  rftp
  95  rlogin-cwd
  96  timed-read
  97  timed-run
  98  tknewsbiff
  99  tknewsbiff.1
 100  tkpasswd
 101  unbuffer
 102  unbuffer.1
 103  weather
 104  xkibitz
 105  xkibitz.1
 106  xpstat
 107
 108
 109 [FILE:75:manifests/plist.dev]
 110 include/
 111  expect.h
 112  expect_comm.h
 113  expect_tcl.h
 114  tcldbg.h
 115 lib/libexpect.so
 116
 117
 118 [FILE:57:manifests/plist.man]
 119 share/man/man1/expect.1.gz
 120 share/man/man3/libexpect.3.gz
 121
 122
 123 [FILE:956:patches/patch-Makefile.in]
 124 --- Makefile.in.orig    2018-02-02 19:15:52 UTC
 125 +++ Makefile.in
 126 @@ -236,10 +236,10 @@ install-libraries: libraries $(SCRIPTS)
 127             $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir) ; \
 128         done;
 129  # install standalone scripts and their man pages, if requested
 130 -       @mkdir -p $(DESTDIR)$(prefix)/bin
 131 +       @mkdir -p $(DESTDIR)$(datadir)
 132         -for i in $(SCRIPT_LIST) ; do \
 133           if [ -f $$i ] ; then \
 134 -           $(INSTALL_PROGRAM) $$i $(DESTDIR)$(prefix)/bin/$$i ; \
 135 +           $(INSTALL_SCRIPT) $$i $(DESTDIR)$(datadir)/$$i ; \
 136             rm -f $$i ; \
 137           else true; fi ; \
 138         done
 139 @@ -259,7 +259,7 @@ install-doc: doc
 140         $(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3
 141         -for i in $(SCRIPT_MANPAGE_LIST) ; do \
 142           if [ -f $(srcdir)/example/$$i.man ] ; then \
 143 -           $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/$$i.1 ; \
 144 +           $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(datadir)/$$i.1 ; \
 145           else true; fi ; \
 146         done
 147
 148
 149
 150 [FILE:506:patches/patch-configure]
 151 --- configure.orig      2018-02-04 10:43:58 UTC
 152 +++ configure
 153 @@ -6563,7 +6563,7 @@ fi
 154                 ;;
 155             esac
 156             ;;
 157 -       FreeBSD-*)
 158 +       FreeBSD-*|DragonFly-*|MidnightBSD-*)
 159             # This configuration from FreeBSD Ports.
 160             SHLIB_CFLAGS="-fPIC"
 161             SHLIB_LD="${CC} -shared"
 162 @@ -7150,7 +7150,7 @@ fi
 163             BSD/OS*) ;;
 164             CYGWIN_*) ;;
 165             IRIX*) ;;
 166 -           NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
 167 +           NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*|MidnightBSD-*) ;;
 168             Darwin-*) ;;
 169             SCO_SV-3.2*) ;;
 170             windows) ;;
 171
 172
 173 [FILE:44312:patches/patch-tclconfig_tcl.m4]
 174 --- tclconfig/tcl.m4.orig       2018-02-04 13:55:43 UTC
 175 +++ tclconfig/tcl.m4
 176 @@ -8,14 +8,12 @@
 177  #
 178  # See the file "license.terms" for information on usage and redistribution
 179  # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 180 -#
 181 -# RCS: @(#) $Id: tcl.m4,v 1.6 2010/09/16 20:46:47 hobbs Exp $
 182
 183  AC_PREREQ(2.57)
 184
 185  dnl TEA extensions pass us the version of TEA they think they
 186  dnl are compatible with (must be set in TEA_INIT below)
 187 -dnl TEA_VERSION="3.9"
 188 +dnl TEA_VERSION="3.10"
 189
 190  # Possible values for key variables defined:
 191  #
 192 @@ -140,6 +138,8 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [
 193                         `ls -d /usr/contrib/lib 2>/dev/null` \
 194                         `ls -d /usr/lib 2>/dev/null` \
 195                         `ls -d /usr/lib64 2>/dev/null` \
 196 +                       `ls -d /usr/lib/tcl8.6 2>/dev/null` \
 197 +                       `ls -d /usr/lib/tcl8.5 2>/dev/null` \
 198                         ; do
 199                     if test -f "$i/tclConfig.sh" ; then
 200                         ac_cv_c_tclconfig="`(cd $i; pwd)`"
 201 @@ -170,7 +170,7 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [
 202
 203         if test x"${ac_cv_c_tclconfig}" = x ; then
 204             TCL_BIN_DIR="# no Tcl configs found"
 205 -           AC_MSG_ERROR([Can't find Tcl configuration definitions])
 206 +           AC_MSG_ERROR([Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh])
 207         else
 208             no_tcl=
 209             TCL_BIN_DIR="${ac_cv_c_tclconfig}"
 210 @@ -323,7 +323,7 @@ AC_DEFUN([TEA_PATH_TKCONFIG], [
 211
 212         if test x"${ac_cv_c_tkconfig}" = x ; then
 213             TK_BIN_DIR="# no Tk configs found"
 214 -           AC_MSG_ERROR([Can't find Tk configuration definitions])
 215 +           AC_MSG_ERROR([Can't find Tk configuration definitions. Use --with-tk to specify a directory containing tkConfig.sh])
 216         else
 217             no_tk=
 218             TK_BIN_DIR="${ac_cv_c_tkconfig}"
 219 @@ -344,11 +344,10 @@ AC_DEFUN([TEA_PATH_TKCONFIG], [
 220  #
 221  # Results:
 222  #
 223 -#      Subst the following vars:
 224 +#      Substitutes the following vars:
 225  #              TCL_BIN_DIR
 226  #              TCL_SRC_DIR
 227  #              TCL_LIB_FILE
 228 -#
 229  #------------------------------------------------------------------------
 230
 231  AC_DEFUN([TEA_LOAD_TCLCONFIG], [
 232 @@ -417,25 +416,21 @@ AC_DEFUN([TEA_LOAD_TCLCONFIG], [
 233      AC_SUBST(TCL_STUB_LIB_FLAG)
 234      AC_SUBST(TCL_STUB_LIB_SPEC)
 235
 236 -    case "`uname -s`" in
 237 -       *CYGWIN_*)
 238 -           AC_MSG_CHECKING([for cygwin variant])
 239 -           case ${TCL_EXTRA_CFLAGS} in
 240 -               *-mwin32*|*-mno-cygwin*)
 241 -                   TEA_PLATFORM="windows"
 242 -                   CFLAGS="$CFLAGS -mwin32"
 243 -                   AC_MSG_RESULT([win32])
 244 -                   ;;
 245 -               *)
 246 -                   TEA_PLATFORM="unix"
 247 -                   AC_MSG_RESULT([unix])
 248 -                   ;;
 249 -           esac
 250 -           EXEEXT=".exe"
 251 -           ;;
 252 -       *)
 253 -           ;;
 254 -    esac
 255 +    AC_MSG_CHECKING([platform])
 256 +    hold_cc=$CC; CC="$TCL_CC"
 257 +    AC_TRY_COMPILE(,[
 258 +           #ifdef _WIN32
 259 +               #error win32
 260 +           #endif
 261 +       ], [
 262 +           TEA_PLATFORM="unix"
 263 +           CYGPATH=echo
 264 +       ], [
 265 +           TEA_PLATFORM="windows"
 266 +           AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)   ]
 267 +    )
 268 +    CC=$hold_cc
 269 +    AC_MSG_RESULT($TEA_PLATFORM)
 270
 271      # The BUILD_$pkg is to define the correct extern storage class
 272      # handling when making this package
 273 @@ -443,6 +438,7 @@ AC_DEFUN([TEA_LOAD_TCLCONFIG], [
 274             [Building extension source?])
 275      # Do this here as we have fully defined TEA_PLATFORM now
 276      if test "${TEA_PLATFORM}" = "windows" ; then
 277 +       EXEEXT=".exe"
 278         CLEANFILES="$CLEANFILES *.lib *.dll *.pdb *.exp"
 279      fi
 280
 281 @@ -567,11 +563,11 @@ AC_DEFUN([TEA_LOAD_TKCONFIG], [
 282  #      only for running extension test cases. It should never be
 283  #      or generation of files (like pkgIndex.tcl) at build time.
 284  #
 285 -# Arguments
 286 +# Arguments:
 287  #      none
 288  #
 289 -# Results
 290 -#      Subst's the following values:
 291 +# Results:
 292 +#      Substitutes the following vars:
 293  #              TCLSH_PROG
 294  #------------------------------------------------------------------------
 295
 296 @@ -580,7 +576,15 @@ AC_DEFUN([TEA_PROG_TCLSH], [
 297      if test -f "${TCL_BIN_DIR}/Makefile" ; then
 298          # tclConfig.sh is in Tcl build directory
 299          if test "${TEA_PLATFORM}" = "windows"; then
 300 +          if test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}" ; then
 301              TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}"
 302 +          elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}s${EXEEXT}" ; then
 303 +            TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}s${EXEEXT}"
 304 +          elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}t${EXEEXT}" ; then
 305 +            TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}t${EXEEXT}"
 306 +          elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}st${EXEEXT}" ; then
 307 +            TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}st${EXEEXT}"
 308 +          fi
 309          else
 310              TCLSH_PROG="${TCL_BIN_DIR}/tclsh"
 311          fi
 312 @@ -617,11 +621,11 @@ AC_DEFUN([TEA_PROG_TCLSH], [
 313  #      only for running extension test cases. It should never be
 314  #      or generation of files (like pkgIndex.tcl) at build time.
 315  #
 316 -# Arguments
 317 +# Arguments:
 318  #      none
 319  #
 320 -# Results
 321 -#      Subst's the following values:
 322 +# Results:
 323 +#      Substitutes the following vars:
 324  #              WISH_PROG
 325  #------------------------------------------------------------------------
 326
 327 @@ -630,9 +634,17 @@ AC_DEFUN([TEA_PROG_WISH], [
 328      if test -f "${TK_BIN_DIR}/Makefile" ; then
 329          # tkConfig.sh is in Tk build directory
 330          if test "${TEA_PLATFORM}" = "windows"; then
 331 +          if test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}${EXEEXT}" ; then
 332              WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}${EXEEXT}"
 333 +          elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}s${EXEEXT}" ; then
 334 +            WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}$s{EXEEXT}"
 335 +          elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}t${EXEEXT}" ; then
 336 +            WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}t${EXEEXT}"
 337 +          elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}st${EXEEXT}" ; then
 338 +            WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}st${EXEEXT}"
 339 +          fi
 340          else
 341 -            WISH_PROG="${TK_BIN_DIR}/wish"
 342 +          WISH_PROG="${TK_BIN_DIR}/wish"
 343          fi
 344      else
 345          # tkConfig.sh is in install location
 346 @@ -732,7 +744,6 @@ AC_DEFUN([TEA_ENABLE_SHARED], [
 347  #              TCL_THREADS
 348  #              _REENTRANT
 349  #              _THREAD_SAFE
 350 -#
 351  #------------------------------------------------------------------------
 352
 353  AC_DEFUN([TEA_ENABLE_THREADS], [
 354 @@ -856,12 +867,11 @@ AC_DEFUN([TEA_ENABLE_THREADS], [
 355  #
 356  #      Defines the following vars:
 357  #              CFLAGS_DEFAULT  Sets to $(CFLAGS_DEBUG) if true
 358 -#                              Sets to $(CFLAGS_OPTIMIZE) if false
 359 +#                              Sets to "$(CFLAGS_OPTIMIZE) -DNDEBUG" if false
 360  #              LDFLAGS_DEFAULT Sets to $(LDFLAGS_DEBUG) if true
 361  #                              Sets to $(LDFLAGS_OPTIMIZE) if false
 362  #              DBGX            Formerly used as debug library extension;
 363  #                              always blank now.
 364 -#
 365  #------------------------------------------------------------------------
 366
 367  AC_DEFUN([TEA_ENABLE_SYMBOLS], [
 368 @@ -874,7 +884,7 @@ AC_DEFUN([TEA_ENABLE_SYMBOLS], [
 369         [tcl_ok=$enableval], [tcl_ok=no])
 370      DBGX=""
 371      if test "$tcl_ok" = "no"; then
 372 -       CFLAGS_DEFAULT="${CFLAGS_OPTIMIZE}"
 373 +       CFLAGS_DEFAULT="${CFLAGS_OPTIMIZE} -DNDEBUG"
 374         LDFLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}"
 375         AC_MSG_RESULT([no])
 376      else
 377 @@ -921,7 +931,6 @@ AC_DEFUN([TEA_ENABLE_SYMBOLS], [
 378  #
 379  #      Defines the following vars:
 380  #              HAVE_LANGINFO   Triggers use of nl_langinfo if defined.
 381 -#
 382  #------------------------------------------------------------------------
 383
 384  AC_DEFUN([TEA_ENABLE_LANGINFO], [
 385 @@ -962,7 +971,6 @@ AC_DEFUN([TEA_ENABLE_LANGINFO], [
 386  #      Defines the following var:
 387  #
 388  #      system -        System/platform/version identification code.
 389 -#
 390  #--------------------------------------------------------------------
 391
 392  AC_DEFUN([TEA_CONFIG_SYSTEM], [
 393 @@ -1031,21 +1039,20 @@ AC_DEFUN([TEA_CONFIG_SYSTEM], [
 394  #                       extensions.  An empty string means we don't know how
 395  #                       to use shared libraries on this platform.
 396  #       LIB_SUFFIX -    Specifies everything that comes after the "libfoo"
 397 -#                       in a static or shared library name, using the $VERSION variable
 398 +#                       in a static or shared library name, using the $PACKAGE_VERSION variable
 399  #                       to put the version in the right place.  This is used
 400  #                       by platforms that need non-standard library names.
 401 -#                       Examples:  ${VERSION}.so.1.1 on NetBSD, since it needs
 402 -#                       to have a version after the .so, and ${VERSION}.a
 403 +#                       Examples:  ${PACKAGE_VERSION}.so.1.1 on NetBSD, since it needs
 404 +#                       to have a version after the .so, and ${PACKAGE_VERSION}.a
 405  #                       on AIX, since a shared library needs to have
 406  #                       a .a extension whereas shared objects for loadable
 407  #                       extensions have a .so extension.  Defaults to
 408 -#                       ${VERSION}${SHLIB_SUFFIX}.
 409 +#                       ${PACKAGE_VERSION}${SHLIB_SUFFIX}.
 410  #      CFLAGS_DEBUG -
 411  #                      Flags used when running the compiler in debug mode
 412  #      CFLAGS_OPTIMIZE -
 413  #                      Flags used when running the compiler in optimize mode
 414  #      CFLAGS -        Additional CFLAGS added as necessary (usually 64-bit)
 415 -#
 416  #--------------------------------------------------------------------
 417
 418  AC_DEFUN([TEA_CONFIG_CFLAGS], [
 419 @@ -1087,6 +1094,7 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
 420         AC_DEFINE(MODULE_SCOPE,
 421             [extern __attribute__((__visibility__("hidden")))],
 422             [Compiler support for module scope symbols])
 423 +       AC_DEFINE(HAVE_HIDDEN, [1], [Compiler support for module scope symbols])
 424      ])
 425
 426      # Step 0.d: Disable -rpath support?
 427 @@ -1135,18 +1143,17 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
 428      ECHO_VERSION='`echo ${PACKAGE_VERSION}`'
 429      TCL_LIB_VERSIONS_OK=ok
 430      CFLAGS_DEBUG=-g
 431 -    CFLAGS_OPTIMIZE=-O
 432      AS_IF([test "$GCC" = yes], [
 433 -       # TEA specific:
 434         CFLAGS_OPTIMIZE=-O2
 435         CFLAGS_WARNING="-Wall"
 436 -    ], [CFLAGS_WARNING=""])
 437 -dnl FIXME: Replace AC_CHECK_PROG with AC_CHECK_TOOL once cross compiling is fixed.
 438 -dnl AC_CHECK_TOOL(AR, ar)
 439 -    AC_CHECK_PROG(AR, ar, ar)
 440 +    ], [
 441 +       CFLAGS_OPTIMIZE=-O
 442 +       CFLAGS_WARNING=""
 443 +    ])
 444 +    AC_CHECK_TOOL(AR, ar)
 445      STLIB_LD='${AR} cr'
 446      LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH"
 447 -    AS_IF([test "x$SHLIB_VERSION" = x],[SHLIB_VERSION="1.0"])
 448 +    AS_IF([test "x$SHLIB_VERSION" = x],[SHLIB_VERSION=""],[SHLIB_VERSION=".$SHLIB_VERSION"])
 449      case $system in
 450         # TEA specific:
 451         windows)
 452 @@ -1172,7 +1179,7 @@ dnl AC_CHECK_TOOL(AR, ar)
 453                         PATH64="${MSSDK}/Bin/Win64"
 454                         ;;
 455                 esac
 456 -               if test ! -d "${PATH64}" ; then
 457 +               if test "$GCC" != "yes" -a ! -d "${PATH64}" ; then
 458                     AC_MSG_WARN([Could not find 64-bit $MACHINE SDK to enable 64bit mode])
 459                     AC_MSG_WARN([Ensure latest Platform SDK is installed])
 460                     do64bit="no"
 461 @@ -1247,13 +1254,21 @@ dnl AC_CHECK_TOOL(AR, ar)
 462                 else
 463                     runtime=-MD
 464                 fi
 465 +               case "x`echo \${VisualStudioVersion}`" in
 466 +                   x1[[4-9]]*)
 467 +                       lflags="${lflags} -nodefaultlib:libucrt.lib"
 468 +                       TEA_ADD_LIBS([ucrt.lib])
 469 +                   ;;
 470 +                   *)
 471 +                   ;;
 472 +               esac
 473
 474                  if test "$do64bit" != "no" ; then
 475                     # All this magic is necessary for the Win64 SDK RC1 - hobbs
 476                     CC="\"${PATH64}/cl.exe\""
 477                     CFLAGS="${CFLAGS} -I\"${MSSDK}/Include\" -I\"${MSSDK}/Include/crt\" -I\"${MSSDK}/Include/crt/sys\""
 478                     RC="\"${MSSDK}/bin/rc.exe\""
 479 -                   lflags="-nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\""
 480 +                   lflags="${lflags} -nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\""
 481                     LINKBIN="\"${PATH64}/link.exe\""
 482                     CFLAGS_DEBUG="-nologo -Zi -Od -W3 ${runtime}d"
 483                     CFLAGS_OPTIMIZE="-nologo -O2 -W2 ${runtime}"
 484 @@ -1283,13 +1298,13 @@ dnl AC_CHECK_TOOL(AR, ar)
 485                     CFLAGS_DEBUG="-nologo -Zi -Od"
 486                     CFLAGS_OPTIMIZE="-nologo -Ox"
 487                     lversion=`echo ${CEVERSION} | sed -e 's/\(.\)\(..\)/\1\.\2/'`
 488 -                   lflags="-MACHINE:${ARCH} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,${lversion} -nologo"
 489 +                   lflags="${lflags} -MACHINE:${ARCH} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,${lversion} -nologo"
 490                     LINKBIN="\"${CEBINROOT}/link.exe\""
 491                     AC_SUBST(CELIB_DIR)
 492                 else
 493                     RC="rc"
 494 -                   lflags="-nologo"
 495 -                   LINKBIN="link"
 496 +                   lflags="${lflags} -nologo"
 497 +                   LINKBIN="link"
 498                     CFLAGS_DEBUG="-nologo -Z7 -Od -W3 -WX ${runtime}d"
 499                     CFLAGS_OPTIMIZE="-nologo -O2 -W2 ${runtime}"
 500                 fi
 501 @@ -1297,13 +1312,45 @@ dnl AC_CHECK_TOOL(AR, ar)
 502
 503             if test "$GCC" = "yes"; then
 504                 # mingw gcc mode
 505 -               RC="windres"
 506 +               AC_CHECK_TOOL(RC, windres)
 507                 CFLAGS_DEBUG="-g"
 508                 CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
 509 -               SHLIB_LD="$CC -shared"
 510 +               SHLIB_LD='${CC} -shared'
 511                 UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 512 +       PRACTCL_UNSHARED_LIB_SUFFIX='.a'
 513 +
 514                 LDFLAGS_CONSOLE="-wl,--subsystem,console ${lflags}"
 515                 LDFLAGS_WINDOW="-wl,--subsystem,windows ${lflags}"
 516 +
 517 +               AC_CACHE_CHECK(for cross-compile version of gcc,
 518 +                       ac_cv_cross,
 519 +                       AC_TRY_COMPILE([
 520 +                           #ifdef _WIN32
 521 +                               #error cross-compiler
 522 +                           #endif
 523 +                       ], [],
 524 +                       ac_cv_cross=yes,
 525 +                       ac_cv_cross=no)
 526 +                     )
 527 +                     if test "$ac_cv_cross" = "yes"; then
 528 +                       case "$do64bit" in
 529 +                           amd64|x64|yes)
 530 +                               CC="x86_64-w64-mingw32-gcc"
 531 +                               LD="x86_64-w64-mingw32-ld"
 532 +                               AR="x86_64-w64-mingw32-ar"
 533 +                               RANLIB="x86_64-w64-mingw32-ranlib"
 534 +                               RC="x86_64-w64-mingw32-windres"
 535 +                           ;;
 536 +                           *)
 537 +                               CC="i686-w64-mingw32-gcc"
 538 +                               LD="i686-w64-mingw32-ld"
 539 +                               AR="i686-w64-mingw32-ar"
 540 +                               RANLIB="i686-w64-mingw32-ranlib"
 541 +                               RC="i686-w64-mingw32-windres"
 542 +                           ;;
 543 +                       esac
 544 +               fi
 545 +
 546             else
 547                 SHLIB_LD="${LINKBIN} -dll ${lflags}"
 548                 # link -lib only works when -lib is the first arg
 549 @@ -1409,8 +1456,10 @@ dnl AC_CHECK_TOOL(AR, ar)
 550         CYGWIN_*)
 551             SHLIB_CFLAGS=""
 552             SHLIB_LD='${CC} -shared'
 553 +           SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$[@].a"
 554             SHLIB_SUFFIX=".dll"
 555 -           EXE_SUFFIX=".exe"
 556 +           EXEEXT=".exe"
 557 +           do64bit_ok=yes
 558             CC_SEARCH_FLAGS=""
 559             LD_SEARCH_FLAGS=""
 560             ;;
 561 @@ -1521,7 +1570,7 @@ dnl AC_CHECK_TOOL(AR, ar)
 562                 ])
 563             ])
 564             ;;
 565 -       Linux*)
 566 +       Linux*|GNU*|NetBSD-Debian)
 567             SHLIB_CFLAGS="-fPIC"
 568             SHLIB_SUFFIX=".so"
 569
 570 @@ -1554,17 +1603,6 @@ dnl AC_CHECK_TOOL(AR, ar)
 571             # files in compat/*.c is being linked in.
 572
 573             AS_IF([test x"${USE_COMPAT}" != x],[CFLAGS="$CFLAGS -fno-inline"])
 574 -
 575 -           ;;
 576 -       GNU*)
 577 -           SHLIB_CFLAGS="-fPIC"
 578 -           SHLIB_SUFFIX=".so"
 579 -
 580 -           SHLIB_LD='${CC} -shared'
 581 -           LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 582 -           CC_SEARCH_FLAGS=""
 583 -           LD_SEARCH_FLAGS=""
 584 -           AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
 585             ;;
 586         Lynx*)
 587             SHLIB_CFLAGS="-fPIC"
 588 @@ -1577,35 +1615,51 @@ dnl AC_CHECK_TOOL(AR, ar)
 589                 LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
 590             ;;
 591         OpenBSD-*)
 592 -           SHLIB_CFLAGS="-fPIC"
 593 -           SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
 594 -           SHLIB_SUFFIX=".so"
 595 -           AS_IF([test $doRpath = yes], [
 596 -               CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
 597 -           LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 598 -           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
 599 -           AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
 600 -               AC_EGREP_CPP(yes, [
 601 -#ifdef __ELF__
 602 -       yes
 603 -#endif
 604 -               ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)])
 605 -           AS_IF([test $tcl_cv_ld_elf = yes], [
 606 -               LDFLAGS=-Wl,-export-dynamic
 607 -           ], [LDFLAGS=""])
 608 +           arch=`arch -s`
 609 +           case "$arch" in
 610 +           vax)
 611 +               SHLIB_SUFFIX=""
 612 +               SHARED_LIB_SUFFIX=""
 613 +               LDFLAGS=""
 614 +               ;;
 615 +           *)
 616 +               case "$arch" in
 617 +               alpha|sparc64)
 618 +                   SHLIB_CFLAGS="-fPIC"
 619 +                   ;;
 620 +               *)
 621 +                   SHLIB_CFLAGS="-fpic"
 622 +                   ;;
 623 +               esac
 624 +               SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
 625 +               SHLIB_SUFFIX=".so"
 626 +               AS_IF([test $doRpath = yes], [
 627 +                   CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
 628 +               LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 629 +               SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 630 +               LDFLAGS="-Wl,-export-dynamic"
 631 +               ;;
 632 +           esac
 633 +           case "$arch" in
 634 +           vax)
 635 +               CFLAGS_OPTIMIZE="-O1"
 636 +               ;;
 637 +           *)
 638 +               CFLAGS_OPTIMIZE="-O2"
 639 +               ;;
 640 +           esac
 641             AS_IF([test "${TCL_THREADS}" = "1"], [
 642 -               # OpenBSD builds and links with -pthread, never -lpthread.
 643 +               # On OpenBSD:   Compile with -pthread
 644 +               #               Don't link with -lpthread
 645                 LIBS=`echo $LIBS | sed s/-lpthread//`
 646                 CFLAGS="$CFLAGS -pthread"
 647 -               SHLIB_CFLAGS="$SHLIB_CFLAGS -pthread"
 648             ])
 649             # OpenBSD doesn't do version numbers with dots.
 650             UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 651             TCL_LIB_VERSIONS_OK=nodots
 652             ;;
 653 -       NetBSD-*|FreeBSD-[[3-4]].*)
 654 -           # FreeBSD 3.* and greater have ELF.
 655 -           # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
 656 +       NetBSD-*)
 657 +           # NetBSD has ELF and can use 'cc -shared' to build shared libs
 658             SHLIB_CFLAGS="-fPIC"
 659             SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
 660             SHLIB_SUFFIX=".so"
 661 @@ -1619,35 +1673,31 @@ dnl AC_CHECK_TOOL(AR, ar)
 662                 CFLAGS="$CFLAGS -pthread"
 663                 LDFLAGS="$LDFLAGS -pthread"
 664             ])
 665 -           case $system in
 666 -           FreeBSD-3.*)
 667 -               # FreeBSD-3 doesn't handle version numbers with dots.
 668 -               UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 669 -               SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
 670 -               TCL_LIB_VERSIONS_OK=nodots
 671 -               ;;
 672 -           esac
 673             ;;
 674 -       FreeBSD-*)
 675 +       DragonFly-*|FreeBSD-*|MidnightBSD-*)
 676             # This configuration from FreeBSD Ports.
 677             SHLIB_CFLAGS="-fPIC"
 678             SHLIB_LD="${CC} -shared"
 679 -           TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
 680 +           SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$[@]"
 681             SHLIB_SUFFIX=".so"
 682             LDFLAGS=""
 683             AS_IF([test $doRpath = yes], [
 684                 CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 685 -               LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
 686 +               LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
 687             AS_IF([test "${TCL_THREADS}" = "1"], [
 688                 # The -pthread needs to go in the LDFLAGS, not LIBS
 689                 LIBS=`echo $LIBS | sed s/-pthread//`
 690                 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 691                 LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
 692 -           # Version numbers are dot-stripped by system policy.
 693 -           TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
 694 -           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 695 -           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
 696 -           TCL_LIB_VERSIONS_OK=nodots
 697 +           case $system in
 698 +           FreeBSD-3.*)
 699 +               # Version numbers are dot-stripped by system policy.
 700 +               TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
 701 +               UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 702 +               SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
 703 +               TCL_LIB_VERSIONS_OK=nodots
 704 +               ;;
 705 +           esac
 706             ;;
 707         Darwin-*)
 708             CFLAGS_OPTIMIZE="-Os"
 709 @@ -1706,7 +1756,7 @@ dnl AC_CHECK_TOOL(AR, ar)
 710             AS_IF([test $tcl_cv_ld_single_module = yes], [
 711                 SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
 712             ])
 713 -           # TEA specific: link shlib with current and compatiblity version flags
 714 +           # TEA specific: link shlib with current and compatibility version flags
 715             vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([[0-9]]\{1,5\}\)\(\(\.[[0-9]]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
 716             SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
 717             SHLIB_SUFFIX=".dylib"
 718 @@ -1818,8 +1868,8 @@ dnl AC_CHECK_TOOL(AR, ar)
 719                 SHLIB_CFLAGS="-fPIC -melf"
 720                 LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
 721             ], [
 722 -              SHLIB_CFLAGS="-Kpic -belf"
 723 -              LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
 724 +               SHLIB_CFLAGS="-Kpic -belf"
 725 +               LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
 726             ])
 727             SHLIB_LD="ld -G"
 728             SHLIB_LD_LIBS=""
 729 @@ -1942,6 +1992,24 @@ dnl AC_CHECK_TOOL(AR, ar)
 730                 LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 731             ])
 732             ;;
 733 +       UNIX_SV* | UnixWare-5*)
 734 +           SHLIB_CFLAGS="-KPIC"
 735 +           SHLIB_LD='${CC} -G'
 736 +           SHLIB_LD_LIBS=""
 737 +           SHLIB_SUFFIX=".so"
 738 +           # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers
 739 +           # that don't grok the -Bexport option.  Test that it does.
 740 +           AC_CACHE_CHECK([for ld accepts -Bexport flag], tcl_cv_ld_Bexport, [
 741 +               hold_ldflags=$LDFLAGS
 742 +               LDFLAGS="$LDFLAGS -Wl,-Bexport"
 743 +               AC_TRY_LINK(, [int i;], tcl_cv_ld_Bexport=yes, tcl_cv_ld_Bexport=no)
 744 +               LDFLAGS=$hold_ldflags])
 745 +           AS_IF([test $tcl_cv_ld_Bexport = yes], [
 746 +               LDFLAGS="$LDFLAGS -Wl,-Bexport"
 747 +           ])
 748 +           CC_SEARCH_FLAGS=""
 749 +           LD_SEARCH_FLAGS=""
 750 +           ;;
 751      esac
 752
 753      AS_IF([test "$do64bit" = yes -a "$do64bit_ok" = no], [
 754 @@ -1966,7 +2034,7 @@ dnl # preprocessing tests use only CPPFL
 755         case $system in
 756             AIX-*) ;;
 757             BSD/OS*) ;;
 758 -           CYGWIN_*) ;;
 759 +           CYGWIN_*|MINGW32_*) ;;
 760             IRIX*) ;;
 761             NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
 762             Darwin-*) ;;
 763 @@ -1978,15 +2046,111 @@ dnl # preprocessing tests use only CPPFL
 764      AS_IF([test "$tcl_cv_cc_visibility_hidden" != yes], [
 765         AC_DEFINE(MODULE_SCOPE, [extern],
 766             [No Compiler support for module scope symbols])
 767 -       AC_DEFINE(NO_VIZ, [], [No visibility hidden passed to zlib?])
 768      ])
 769
 770      AS_IF([test "$SHARED_LIB_SUFFIX" = ""], [
 771 -       # TEA specific: use PACKAGE_VERSION instead of VERSION
 772 -       SHARED_LIB_SUFFIX='${PACKAGE_VERSION}${SHLIB_SUFFIX}'])
 773 +    # TEA specific: use PACKAGE_VERSION instead of VERSION
 774 +    SHARED_LIB_SUFFIX='${PACKAGE_VERSION}${SHLIB_SUFFIX}'
 775 +               ])
 776      AS_IF([test "$UNSHARED_LIB_SUFFIX" = ""], [
 777 -       # TEA specific: use PACKAGE_VERSION instead of VERSION
 778 -       UNSHARED_LIB_SUFFIX='${PACKAGE_VERSION}.a'])
 779 +    # TEA specific: use PACKAGE_VERSION instead of VERSION
 780 +    UNSHARED_LIB_SUFFIX='${PACKAGE_VERSION}.a'
 781 +               ])
 782 +
 783 +    if test "${GCC}" = "yes" -a ${SHLIB_SUFFIX} = ".dll"; then
 784 +       AC_CACHE_CHECK(for SEH support in compiler,
 785 +           tcl_cv_seh,
 786 +       AC_TRY_RUN([
 787 +#define WIN32_LEAN_AND_MEAN
 788 +#include <windows.h>
 789 +#undef WIN32_LEAN_AND_MEAN
 790 +
 791 +           int main(int argc, char** argv) {
 792 +               int a, b = 0;
 793 +               __try {
 794 +                   a = 666 / b;
 795 +               }
 796 +               __except (EXCEPTION_EXECUTE_HANDLER) {
 797 +                   return 0;
 798 +               }
 799 +               return 1;
 800 +           }
 801 +       ],
 802 +           tcl_cv_seh=yes,
 803 +           tcl_cv_seh=no,
 804 +           tcl_cv_seh=no)
 805 +       )
 806 +       if test "$tcl_cv_seh" = "no" ; then
 807 +           AC_DEFINE(HAVE_NO_SEH, 1,
 808 +                   [Defined when mingw does not support SEH])
 809 +       fi
 810 +
 811 +       #
 812 +       # Check to see if the excpt.h include file provided contains the
 813 +       # definition for EXCEPTION_DISPOSITION; if not, which is the case
 814 +       # with Cygwin's version as of 2002-04-10, define it to be int,
 815 +       # sufficient for getting the current code to work.
 816 +       #
 817 +       AC_CACHE_CHECK(for EXCEPTION_DISPOSITION support in include files,
 818 +           tcl_cv_eh_disposition,
 819 +           AC_TRY_COMPILE([
 820 +#          define WIN32_LEAN_AND_MEAN
 821 +#          include <windows.h>
 822 +#          undef WIN32_LEAN_AND_MEAN
 823 +           ],[
 824 +               EXCEPTION_DISPOSITION x;
 825 +           ],
 826 +               tcl_cv_eh_disposition=yes,
 827 +               tcl_cv_eh_disposition=no)
 828 +       )
 829 +       if test "$tcl_cv_eh_disposition" = "no" ; then
 830 +       AC_DEFINE(EXCEPTION_DISPOSITION, int,
 831 +               [Defined when cygwin/mingw does not support EXCEPTION DISPOSITION])
 832 +       fi
 833 +
 834 +       # Check to see if winnt.h defines CHAR, SHORT, and LONG
 835 +       # even if VOID has already been #defined. The win32api
 836 +       # used by mingw and cygwin is known to do this.
 837 +
 838 +       AC_CACHE_CHECK(for winnt.h that ignores VOID define,
 839 +           tcl_cv_winnt_ignore_void,
 840 +           AC_TRY_COMPILE([
 841 +#define VOID void
 842 +#define WIN32_LEAN_AND_MEAN
 843 +#include <windows.h>
 844 +#undef WIN32_LEAN_AND_MEAN
 845 +           ], [
 846 +               CHAR c;
 847 +               SHORT s;
 848 +               LONG l;
 849 +           ],
 850 +        tcl_cv_winnt_ignore_void=yes,
 851 +        tcl_cv_winnt_ignore_void=no)
 852 +       )
 853 +       if test "$tcl_cv_winnt_ignore_void" = "yes" ; then
 854 +           AC_DEFINE(HAVE_WINNT_IGNORE_VOID, 1,
 855 +                   [Defined when cygwin/mingw ignores VOID define in winnt.h])
 856 +       fi
 857 +    fi
 858 +
 859 +       # See if the compiler supports casting to a union type.
 860 +       # This is used to stop gcc from printing a compiler
 861 +       # warning when initializing a union member.
 862 +
 863 +       AC_CACHE_CHECK(for cast to union support,
 864 +           tcl_cv_cast_to_union,
 865 +           AC_TRY_COMPILE([],
 866 +           [
 867 +                 union foo { int i; double d; };
 868 +                 union foo f = (union foo) (int) 0;
 869 +           ],
 870 +           tcl_cv_cast_to_union=yes,
 871 +           tcl_cv_cast_to_union=no)
 872 +       )
 873 +       if test "$tcl_cv_cast_to_union" = "yes"; then
 874 +           AC_DEFINE(HAVE_CAST_TO_UNION, 1,
 875 +                   [Defined when compiler supports casting to union type.])
 876 +       fi
 877
 878      AC_SUBST(CFLAGS_DEBUG)
 879      AC_SUBST(CFLAGS_OPTIMIZE)
 880 @@ -1994,6 +2158,7 @@ dnl # preprocessing tests use only CPPFL
 881
 882      AC_SUBST(STLIB_LD)
 883      AC_SUBST(SHLIB_LD)
 884 +               AC_SUBST(SHLIB_SUFFIX)
 885
 886      AC_SUBST(SHLIB_LD_LIBS)
 887      AC_SUBST(SHLIB_CFLAGS)
 888 @@ -2025,7 +2190,6 @@ dnl # preprocessing tests use only CPPFL
 889  #              USE_TERMIOS
 890  #              USE_TERMIO
 891  #              USE_SGTTY
 892 -#
 893  #--------------------------------------------------------------------
 894
 895  AC_DEFUN([TEA_SERIAL_PORT], [
 896 @@ -2237,7 +2401,6 @@ closedir(d);
 897  #              XINCLUDES
 898  #              XLIBSW
 899  #              PKG_LIBS (appends to)
 900 -#
 901  #--------------------------------------------------------------------
 902
 903  AC_DEFUN([TEA_PATH_X], [
 904 @@ -2251,9 +2414,9 @@ AC_DEFUN([TEA_PATH_UNIX_X], [
 905      not_really_there=""
 906      if test "$no_x" = ""; then
 907         if test "$x_includes" = ""; then
 908 -           AC_TRY_CPP([#include <X11/XIntrinsic.h>], , not_really_there="yes")
 909 +           AC_TRY_CPP([#include <X11/Xlib.h>], , not_really_there="yes")
 910         else
 911 -           if test ! -r $x_includes/X11/Intrinsic.h; then
 912 +           if test ! -r $x_includes/X11/Xlib.h; then
 913                 not_really_there="yes"
 914             fi
 915         fi
 916 @@ -2261,11 +2424,11 @@ AC_DEFUN([TEA_PATH_UNIX_X], [
 917      if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
 918         AC_MSG_CHECKING([for X11 header files])
 919         found_xincludes="no"
 920 -       AC_TRY_CPP([#include <X11/Intrinsic.h>], found_xincludes="yes", found_xincludes="no")
 921 +       AC_TRY_CPP([#include <X11/Xlib.h>], found_xincludes="yes", found_xincludes="no")
 922         if test "$found_xincludes" = "no"; then
 923             dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
 924             for i in $dirs ; do
 925 -               if test -r $i/X11/Intrinsic.h; then
 926 +               if test -r $i/X11/Xlib.h; then
 927                     AC_MSG_RESULT([$i])
 928                     XINCLUDES=" -I$i"
 929                     found_xincludes="yes"
 930 @@ -2333,7 +2496,6 @@ AC_DEFUN([TEA_PATH_UNIX_X], [
 931  #              HAVE_SYS_FILIO_H
 932  #              USE_FIONBIO
 933  #              O_NONBLOCK
 934 -#
 935  #--------------------------------------------------------------------
 936
 937  AC_DEFUN([TEA_BLOCKING_STYLE], [
 938 @@ -2368,7 +2530,6 @@ AC_DEFUN([TEA_BLOCKING_STYLE], [
 939  #              HAVE_TM_GMTOFF
 940  #              HAVE_TM_TZADJ
 941  #              HAVE_TIMEZONE_VAR
 942 -#
 943  #--------------------------------------------------------------------
 944
 945  AC_DEFUN([TEA_TIME_HANDLER], [
 946 @@ -2437,7 +2598,6 @@ AC_DEFUN([TEA_TIME_HANDLER], [
 947  #
 948  #      Might defines some of the following vars:
 949  #              strtod (=fixstrtod)
 950 -#
 951  #--------------------------------------------------------------------
 952
 953  AC_DEFUN([TEA_BUGGY_STRTOD], [
 954 @@ -2488,7 +2648,7 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [
 955  #
 956  # Results:
 957  #
 958 -#      Subst's the following var:
 959 +#      Substitutes the following vars:
 960  #              TCL_LIBS
 961  #              MATH_LIBS
 962  #
 963 @@ -2497,7 +2657,6 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [
 964  #
 965  #      Might define the following vars:
 966  #              HAVE_NET_ERRNO_H
 967 -#
 968  #--------------------------------------------------------------------
 969
 970  AC_DEFUN([TEA_TCL_LINK_LIBS], [
 971 @@ -2575,7 +2734,6 @@ AC_DEFUN([TEA_TCL_LINK_LIBS], [
 972  #              _ISOC99_SOURCE
 973  #              _LARGEFILE64_SOURCE
 974  #              _LARGEFILE_SOURCE64
 975 -#
 976  #--------------------------------------------------------------------
 977
 978  AC_DEFUN([TEA_TCL_EARLY_FLAG],[
 979 @@ -2623,7 +2781,6 @@ AC_DEFUN([TEA_TCL_EARLY_FLAGS],[
 980  #              HAVE_STRUCT_DIRENT64
 981  #              HAVE_STRUCT_STAT64
 982  #              HAVE_TYPE_OFF64_T
 983 -#
 984  #--------------------------------------------------------------------
 985
 986  AC_DEFUN([TEA_TCL_64BIT_FLAGS], [
 987 @@ -2655,7 +2812,7 @@ AC_DEFUN([TEA_TCL_64BIT_FLAGS], [
 988         # Now check for auxiliary declarations
 989         AC_CACHE_CHECK([for struct dirent64], tcl_cv_struct_dirent64,[
 990             AC_TRY_COMPILE([#include <sys/types.h>
 991 -#include <sys/dirent.h>],[struct dirent64 p;],
 992 +#include <dirent.h>],[struct dirent64 p;],
 993                 tcl_cv_struct_dirent64=yes,tcl_cv_struct_dirent64=no)])
 994         if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
 995             AC_DEFINE(HAVE_STRUCT_DIRENT64, 1, [Is 'struct dirent64' in <sys/types.h>?])
 996 @@ -2725,12 +2882,12 @@ AC_DEFUN([TEA_TCL_64BIT_FLAGS], [
 997  AC_DEFUN([TEA_INIT], [
 998      # TEA extensions pass this us the version of TEA they think they
 999      # are compatible with.
1000 -    TEA_VERSION="3.9"
1001 +    TEA_VERSION="3.10"
1002
1003      AC_MSG_CHECKING([for correct TEA configuration])
1004      if test x"${PACKAGE_NAME}" = x ; then
1005         AC_MSG_ERROR([
1006 -The PACKAGE_NAME variable must be defined by your TEA configure.in])
1007 +The PACKAGE_NAME variable must be defined by your TEA configure.ac])
1008      fi
1009      if test x"$1" = x ; then
1010         AC_MSG_ERROR([
1011 @@ -2740,21 +2897,36 @@ TEA version not specified.])
1012      else
1013         AC_MSG_RESULT([ok (TEA ${TEA_VERSION})])
1014      fi
1015 +
1016 +    # If the user did not set CFLAGS, set it now to keep macros
1017 +    # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2".
1018 +    if test "${CFLAGS+set}" != "set" ; then
1019 +       CFLAGS=""
1020 +    fi
1021 +
1022      case "`uname -s`" in
1023         *win32*|*WIN32*|*MINGW32_*)
1024 -           AC_CHECK_PROG(CYGPATH, cygpath, cygpath -w, echo)
1025 +           AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)
1026             EXEEXT=".exe"
1027             TEA_PLATFORM="windows"
1028             ;;
1029         *CYGWIN_*)
1030 -           CYGPATH=echo
1031             EXEEXT=".exe"
1032 -           # TEA_PLATFORM is determined later in LOAD_TCLCONFIG
1033 +           # CYGPATH and TEA_PLATFORM are determined later in LOAD_TCLCONFIG
1034             ;;
1035         *)
1036             CYGPATH=echo
1037 -           EXEEXT=""
1038 -           TEA_PLATFORM="unix"
1039 +           # Maybe we are cross-compiling....
1040 +           case ${host_alias} in
1041 +               *mingw32*)
1042 +               EXEEXT=".exe"
1043 +               TEA_PLATFORM="windows"
1044 +               ;;
1045 +           *)
1046 +               EXEEXT=""
1047 +               TEA_PLATFORM="unix"
1048 +               ;;
1049 +           esac
1050             ;;
1051      esac
1052
1053 @@ -3061,7 +3233,7 @@ AC_DEFUN([TEA_PREFIX], [
1054  # TEA_SETUP_COMPILER_CC --
1055  #
1056  #      Do compiler checks the way we want.  This is just a replacement
1057 -#      for AC_PROG_CC in TEA configure.in files to make them cleaner.
1058 +#      for AC_PROG_CC in TEA configure.ac files to make them cleaner.
1059  #
1060  # Arguments:
1061  #      none
1062 @@ -3074,16 +3246,22 @@ AC_DEFUN([TEA_SETUP_COMPILER_CC], [
1063      # Don't put any macros that use the compiler (e.g. AC_TRY_COMPILE)
1064      # in this macro, they need to go into TEA_SETUP_COMPILER instead.
1065
1066 -    # If the user did not set CFLAGS, set it now to keep
1067 -    # the AC_PROG_CC macro from adding "-g -O2".
1068 -    if test "${CFLAGS+set}" != "set" ; then
1069 -       CFLAGS=""
1070 -    fi
1071 -
1072      AC_PROG_CC
1073      AC_PROG_CPP
1074
1075 -    AC_PROG_INSTALL
1076 +    INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
1077 +    INSTALL_DATA_DIR='${INSTALL} -d -m 755'
1078 +    INSTALL_DATA='${INSTALL} -m 644'
1079 +    INSTALL_PROGRAM='${INSTALL}'
1080 +    INSTALL_SCRIPT='${INSTALL}'
1081 +    INSTALL_LIBRARY='${INSTALL_DATA}'
1082 +
1083 +    AC_SUBST(INSTALL)
1084 +    AC_SUBST(INSTALL_DATA_DIR)
1085 +    AC_SUBST(INSTALL_DATA)
1086 +    AC_SUBST(INSTALL_PROGRAM)
1087 +    AC_SUBST(INSTALL_SCRIPT)
1088 +    AC_SUBST(INSTALL_LIBRARY)
1089
1090      #--------------------------------------------------------------------
1091      # Checks to see if the make program sets the $MAKE variable.
1092 @@ -3095,7 +3273,7 @@ AC_DEFUN([TEA_SETUP_COMPILER_CC], [
1093      # Find ranlib
1094      #--------------------------------------------------------------------
1095
1096 -    AC_PROG_RANLIB
1097 +    AC_CHECK_TOOL(RANLIB, ranlib)
1098
1099      #--------------------------------------------------------------------
1100      # Determines the correct binary file extension (.o, .obj, .exe etc.)
1101 @@ -3176,92 +3354,128 @@ AC_DEFUN([TEA_SETUP_COMPILER], [
1102  #      MAKE_STUB_LIB   Makefile rule for building a stub library
1103  #      VC_MANIFEST_EMBED_DLL Makefile rule for embedded VC manifest in DLL
1104  #      VC_MANIFEST_EMBED_EXE Makefile rule for embedded VC manifest in EXE
1105 +#
1106 +# PRACTCL_TOOLSET     What toolset is in use (gcc or msvc)
1107 +#      PRACTCL_SHARED_LIB      Template rule for building a shared library
1108 +#      PRACTCL_STATIC_LIB      Template rule for building a static library
1109 +#      PRACTCL_STUB_LIB          Template rule for building a stub library
1110 +# PRACTCL_VC_MANIFEST_EMBED_DLL Template rule for embedded VC manifest in DLL
1111 +# PRACTCL_VC_MANIFEST_EMBED_EXE Template rule for embedded VC manifest in EXE
1112 +# PRACTCL_NAME_LIBRARY Template rule for naming libraries
1113 +#
1114  #------------------------------------------------------------------------
1115
1116  AC_DEFUN([TEA_MAKE_LIB], [
1117 -    if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then
1118 -       MAKE_STATIC_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_OBJECTS)"
1119 -       MAKE_SHARED_LIB="\${SHLIB_LD} \${SHLIB_LD_LIBS} \${LDFLAGS_DEFAULT} -out:\[$]@ \$(PKG_OBJECTS)"
1120 -       AC_EGREP_CPP([manifest needed], [
1121 +  PRACTCL_TOOLSET="gcc"
1122 +       PRACTCL_VC_MANIFEST_EMBED_DLL=:
1123 +       PRACTCL_VC_MANIFEST_EMBED_EXE=:
1124 +  if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then
1125 +         PRACTCL_TOOLSET="msvc"
1126 +         PRACTCL_STATIC_LIB="%STLIB_LD% -out:%OUTFILE% %LIBRARY_OBJECTS%"
1127 +         PRACTCL_SHARED_LIB="%SHLIB_LD% %SHLIB_LD_LIBS% %LDFLAGS_DEFAULT% -out:%OUTFILE% %LIBRARY_OBJECTS%"
1128 +         MAKE_STATIC_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_OBJECTS)"
1129 +         MAKE_SHARED_LIB="\${SHLIB_LD} \${SHLIB_LD_LIBS} \${LDFLAGS_DEFAULT} -out:\[$]@ \$(PKG_OBJECTS)"
1130 +         AC_EGREP_CPP([manifest needed], [
1131  #if defined(_MSC_VER) && _MSC_VER >= 1400
1132  print("manifest needed")
1133  #endif
1134 -       ], [
1135 -       # Could do a CHECK_PROG for mt, but should always be with MSVC8+
1136 -       VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi"
1137 -       VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi"
1138 -       MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}"
1139 -       TEA_ADD_CLEANFILES([*.manifest])
1140 -       ])
1141 -       MAKE_STUB_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_STUB_OBJECTS)"
1142 -    else
1143 -       MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)"
1144 -       MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
1145 -       MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)"
1146 -    fi
1147 -
1148 -    if test "${SHARED_BUILD}" = "1" ; then
1149 -       MAKE_LIB="${MAKE_SHARED_LIB} "
1150 -    else
1151 -       MAKE_LIB="${MAKE_STATIC_LIB} "
1152 -    fi
1153 -
1154 -    #--------------------------------------------------------------------
1155 -    # Shared libraries and static libraries have different names.
1156 -    # Use the double eval to make sure any variables in the suffix is
1157 -    # substituted. (@@@ Might not be necessary anymore)
1158 -    #--------------------------------------------------------------------
1159 -
1160 -    if test "${TEA_PLATFORM}" = "windows" ; then
1161 -       if test "${SHARED_BUILD}" = "1" ; then
1162 +         ], [
1163 +           # Could do a CHECK_PROG for mt, but should always be with MSVC8+
1164 +           PRACTCL_VC_MANIFEST_EMBED_DLL="mt.exe -nologo -manifest %OUTFILE%.manifest -outputresource:%OUTFILE%\;2"
1165 +           PRACTCL_VC_MANIFEST_EMBED_EXE="mt.exe -nologo -manifest %OUTFILE%.manifest -outputresource:%OUTFILE%\;1"
1166 +           VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi"
1167 +           VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi"
1168 +           MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}"
1169 +           TEA_ADD_CLEANFILES([*.manifest])
1170 +         ])
1171 +               PRACTCL_STUB_LIB="%STLIB_LD% -nodefaultlib -out:%OUTFILE% %LIBRARY_OBJECTS%"
1172 +         MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\[$]@ \$(PKG_STUB_OBJECTS)"
1173 +  else
1174 +         MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)"
1175 +         MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
1176 +         MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)"
1177 +
1178 +         PRACTCL_STATIC_LIB="%STLIB_LD% %OUTFILE% %LIBRARY_OBJECTS%"
1179 +         PRACTCL_SHARED_LIB="%SHLIB_LD% -o %OUTFILE% %LIBRARY_OBJECTS% %SHLIB_LD_LIBS%"
1180 +    PRACTCL_STUB_LIB="%STLIB_LD% %OUTFILE% %LIBRARY_OBJECTS%"
1181 +  fi
1182 +
1183 +  if test "${SHARED_BUILD}" = "1" ; then
1184 +         MAKE_LIB="${MAKE_SHARED_LIB} "
1185 +  else
1186 +         MAKE_LIB="${MAKE_STATIC_LIB} "
1187 +  fi
1188 +
1189 +  #--------------------------------------------------------------------
1190 +  # Shared libraries and static libraries have different names.
1191 +  # Use the double eval to make sure any variables in the suffix is
1192 +  # substituted. (@@@ Might not be necessary anymore)
1193 +  #--------------------------------------------------------------------
1194 +  if test "${TEA_PLATFORM}" = "windows" ; then
1195 +         PRACTCL_NAME_LIBRARY="%LIBRARY_PREFIX%%LIBRARY_NAME%%LIBRARY_VERSION_NODOTS%"
1196 +         if test "${SHARED_BUILD}" = "1" ; then
1197             # We force the unresolved linking of symbols that are really in
1198             # the private libraries of Tcl and Tk.
1199 -           SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
1200             if test x"${TK_BIN_DIR}" != x ; then
1201 -               SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
1202 +                         SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
1203             fi
1204 -           eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
1205 -       else
1206 -           eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
1207 -       fi
1208 -       # Some packages build their own stubs libraries
1209 -       eval eval "PKG_STUB_LIB_FILE=${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
1210 -       if test "$GCC" = "yes"; then
1211 -           PKG_STUB_LIB_FILE=lib${PKG_STUB_LIB_FILE}
1212 -       fi
1213 -       # These aren't needed on Windows (either MSVC or gcc)
1214 -       RANLIB=:
1215 -       RANLIB_STUB=:
1216 -    else
1217 -       RANLIB_STUB="${RANLIB}"
1218 -       if test "${SHARED_BUILD}" = "1" ; then
1219 -           SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TCL_STUB_LIB_SPEC}"
1220 -           if test x"${TK_BIN_DIR}" != x ; then
1221 -               SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
1222 +           SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
1223 +           if test "$GCC" = "yes"; then
1224 +        SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
1225             fi
1226 -           eval eval "PKG_LIB_FILE=lib${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
1227 -           RANLIB=:
1228 -       else
1229 -           eval eval "PKG_LIB_FILE=lib${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
1230 -       fi
1231 -       # Some packages build their own stubs libraries
1232 -       eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
1233 +           eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
1234 +         else
1235 +           eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
1236 +           if test "$GCC" = "yes"; then
1237 +        PKG_LIB_FILE=lib${PKG_LIB_FILE}
1238 +           fi
1239 +         fi
1240 +         # Some packages build their own stubs libraries
1241 +         eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
1242 +    if test "$GCC" = "yes"; then
1243 +      PKG_STUB_LIB_FILE=lib${PKG_STUB_LIB_FILE}
1244 +    fi
1245 +         # These aren't needed on Windows (either MSVC or gcc)
1246 +         RANLIB=:
1247 +         RANLIB_STUB=:
1248 +  else
1249 +         PRACTCL_NAME_LIBRARY="lib%LIBRARY_PREFIX%%LIBRARY_NAME%%LIBRARY_VERSION%"
1250 +         RANLIB_STUB="${RANLIB}"
1251 +         if test "${SHARED_BUILD}" = "1" ; then
1252 +      SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TCL_STUB_LIB_SPEC}"
1253 +      if test x"${TK_BIN_DIR}" != x ; then
1254 +        SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
1255 +      fi
1256 +      eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
1257 +      RANLIB=:
1258 +    else
1259 +      eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
1260      fi
1261 -
1262 -    # These are escaped so that only CFLAGS is picked up at configure time.
1263 -    # The other values will be substituted at make time.
1264 -    CFLAGS="${CFLAGS} \${CFLAGS_DEFAULT} \${CFLAGS_WARNING}"
1265 -    if test "${SHARED_BUILD}" = "1" ; then
1266 -       CFLAGS="${CFLAGS} \${SHLIB_CFLAGS}"
1267 -    fi
1268 -
1269 -    AC_SUBST(MAKE_LIB)
1270 -    AC_SUBST(MAKE_SHARED_LIB)
1271 -    AC_SUBST(MAKE_STATIC_LIB)
1272 -    AC_SUBST(MAKE_STUB_LIB)
1273 -    AC_SUBST(RANLIB_STUB)
1274 -    AC_SUBST(VC_MANIFEST_EMBED_DLL)
1275 -    AC_SUBST(VC_MANIFEST_EMBED_EXE)
1276 +    # Some packages build their own stubs libraries
1277 +    eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
1278 +  fi
1279 +
1280 +  # These are escaped so that only CFLAGS is picked up at configure time.
1281 +  # The other values will be substituted at make time.
1282 +  CFLAGS="${CFLAGS} \${CFLAGS_DEFAULT} \${CFLAGS_WARNING}"
1283 +  if test "${SHARED_BUILD}" = "1" ; then
1284 +    CFLAGS="${CFLAGS} \${SHLIB_CFLAGS}"
1285 +  fi
1286 +
1287 +  AC_SUBST(MAKE_LIB)
1288 +  AC_SUBST(MAKE_SHARED_LIB)
1289 +  AC_SUBST(MAKE_STATIC_LIB)
1290 +  AC_SUBST(MAKE_STUB_LIB)
1291 +  AC_SUBST(RANLIB_STUB)
1292 +  AC_SUBST(VC_MANIFEST_EMBED_DLL)
1293 +  AC_SUBST(VC_MANIFEST_EMBED_EXE)
1294 +  AC_SUBST(PRACTCL_TOOLSET)
1295 +  AC_SUBST(PRACTCL_SHARED_LIB)
1296 +  AC_SUBST(PRACTCL_STATIC_LIB)
1297 +  AC_SUBST(PRACTCL_STUB_LIB)
1298 +  AC_SUBST(PRACTCL_VC_MANIFEST_EMBED_DLL)
1299 +  AC_SUBST(PRACTCL_VC_MANIFEST_EMBED_EXE)
1300 +       AC_SUBST(PRACTCL_NAME_LIBRARY)
1301  ])
1302
1303  #------------------------------------------------------------------------
1304 @@ -3350,7 +3564,7 @@ AC_DEFUN([TEA_LIB_SPEC], [
1305  #
1306  # Results:
1307  #
1308 -#      Substs the following vars:
1309 +#      Substitutes the following vars:
1310  #              TCL_TOP_DIR_NATIVE
1311  #              TCL_INCLUDES
1312  #------------------------------------------------------------------------
1313 @@ -3389,12 +3603,9 @@ AC_DEFUN([TEA_PRIVATE_TCL_HEADERS], [
1314              # the framework's Headers and PrivateHeaders directories
1315              case ${TCL_DEFS} in
1316                 *TCL_FRAMEWORK*)
1317 -                   if test -d "${TCL_BIN_DIR}/Headers"; then
1318 -                       if test -d "${TCL_BIN_DIR}/PrivateHeaders"; then
1319 -                           TCL_INCLUDES="-I\"${TCL_BIN_DIR}/Headers\" -I\"${TCL_BIN_DIR}/PrivateHeaders\" ${TCL_INCLUDES}"
1320 -                       elif test -d "${TCL_BIN_DIR}/Headers/tcl-private"; then
1321 -                           TCL_INCLUDES="-I\"${TCL_BIN_DIR}/Headers\" -I\"${TCL_BIN_DIR}/Headers/tcl-private\" ${TCL_INCLUDES}"
1322 -                       fi
1323 +                   if test -d "${TCL_BIN_DIR}/Headers" -a \
1324 +                           -d "${TCL_BIN_DIR}/PrivateHeaders"; then
1325 +                       TCL_INCLUDES="-I\"${TCL_BIN_DIR}/Headers\" -I\"${TCL_BIN_DIR}/PrivateHeaders\" ${TCL_INCLUDES}"
1326                     else
1327                         TCL_INCLUDES="${TCL_INCLUDES} ${TCL_INCLUDE_SPEC} `echo "${TCL_INCLUDE_SPEC}" | sed -e 's/Headers/PrivateHeaders/'`"
1328                     fi
1329 @@ -3431,7 +3642,7 @@ AC_DEFUN([TEA_PRIVATE_TCL_HEADERS], [
1330  #      Adds a --with-tclinclude switch to configure.
1331  #      Result is cached.
1332  #
1333 -#      Substs the following vars:
1334 +#      Substitutes the following vars:
1335  #              TCL_INCLUDES
1336  #------------------------------------------------------------------------
1337
1338 @@ -3521,7 +3732,7 @@ AC_DEFUN([TEA_PUBLIC_TCL_HEADERS], [
1339  #
1340  # Results:
1341  #
1342 -#      Substs the following vars:
1343 +#      Substitutes the following vars:
1344  #              TK_INCLUDES
1345  #------------------------------------------------------------------------
1346
1347 @@ -3610,7 +3821,7 @@ AC_DEFUN([TEA_PRIVATE_TK_HEADERS], [
1348  #      Adds a --with-tkinclude switch to configure.
1349  #      Result is cached.
1350  #
1351 -#      Substs the following vars:
1352 +#      Substitutes the following vars:
1353  #              TK_INCLUDES
1354  #------------------------------------------------------------------------
1355
1356 @@ -3828,11 +4039,10 @@ AC_DEFUN([TEA_PATH_CONFIG], [
1357  #
1358  # Results:
1359  #
1360 -#      Subst the following vars:
1361 +#      Substitutes the following vars:
1362  #              $1_SRC_DIR
1363  #              $1_LIB_FILE
1364  #              $1_LIB_SPEC
1365 -#
1366  #------------------------------------------------------------------------
1367
1368  AC_DEFUN([TEA_LOAD_CONFIG], [
1369 @@ -3893,7 +4103,6 @@ AC_DEFUN([TEA_LOAD_CONFIG], [
1370  #
1371  # Results:
1372  #      Adds to LIBS the appropriate extension library
1373 -#
1374  #------------------------------------------------------------------------
1375  AC_DEFUN([TEA_LOAD_CONFIG_LIB], [
1376      AC_MSG_CHECKING([For $1 library for LIBS])
1377 @@ -3925,8 +4134,7 @@ AC_DEFUN([TEA_LOAD_CONFIG_LIB], [
1378  #              $1
1379  #
1380  # Results:
1381 -#      Subst the following vars:
1382 -#
1383 +#      Substitutes the following vars:
1384  #------------------------------------------------------------------------
1385
1386  AC_DEFUN([TEA_EXPORT_CONFIG], [
1387 @@ -3943,12 +4151,12 @@ AC_DEFUN([TEA_EXPORT_CONFIG], [
1388         eval $1_LIB_FLAG="-l$1`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
1389         eval $1_STUB_LIB_FLAG="-l$1stub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
1390      fi
1391 -    $1_BUILD_LIB_SPEC="-L`pwd` ${$1_LIB_FLAG}"
1392 -    $1_LIB_SPEC="-L${pkglibdir} ${$1_LIB_FLAG}"
1393 -    $1_BUILD_STUB_LIB_SPEC="-L`pwd` [$]{$1_STUB_LIB_FLAG}"
1394 -    $1_STUB_LIB_SPEC="-L${pkglibdir} [$]{$1_STUB_LIB_FLAG}"
1395 -    $1_BUILD_STUB_LIB_PATH="`pwd`/[$]{PKG_STUB_LIB_FILE}"
1396 -    $1_STUB_LIB_PATH="${pkglibdir}/[$]{PKG_STUB_LIB_FILE}"
1397 +    $1_BUILD_LIB_SPEC="-L`$CYGPATH $(pwd)` ${$1_LIB_FLAG}"
1398 +    $1_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${$1_LIB_FLAG}"
1399 +    $1_BUILD_STUB_LIB_SPEC="-L`$CYGPATH $(pwd)` [$]{$1_STUB_LIB_FLAG}"
1400 +    $1_STUB_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` [$]{$1_STUB_LIB_FLAG}"
1401 +    $1_BUILD_STUB_LIB_PATH="`$CYGPATH $(pwd)`/[$]{PKG_STUB_LIB_FILE}"
1402 +    $1_STUB_LIB_PATH="`$CYGPATH ${pkglibdir}`/[$]{PKG_STUB_LIB_FILE}"
1403
1404      AC_SUBST($1_BUILD_LIB_SPEC)
1405      AC_SUBST($1_LIB_SPEC)
1406 @@ -4029,8 +4237,6 @@ AC_DEFUN([TEA_PATH_CELIB], [
1407         fi
1408      fi
1409  ])
1410 -
1411 -
1412  # Local Variables:
1413  # mode: autoconf
1414  # End:
1415