Bring back tk-Tix package to pkgsrc, in version 8.2.0b1.

Tix is a powerful widget library for Tcl/Tk.

Reviewed and fully buildlinkified by Stoned Elipot.

7 files changed, 721 insertions, 0 deletions

diff --git a/x11/tk-Tix/DESCR b/x11/tk-Tix/DESCR
new file mode 100644
index 00000000000..775d359eb83
--- /dev/null
+++ b/x11/tk-Tix/DESCR
@@ -0,0 +1 @@
+Tix is a library of useful widgets for Tcl/Tk.
diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile
new file mode 100644
index 00000000000..2ca1b80a43e
--- /dev/null
+++ b/x11/tk-Tix/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
+#
+
+DISTNAME=	tix8.2.0b1
+PKGNAME=	tk-Tix-8.2.0b1
+CATEGORIES=	x11 tcl tk
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tixlibrary/}
+
+MAINTAINER=	he@netbsd.org
+HOMEPAGE=	http://tixlibrary.sourceforge.net/
+COMMENT=	Powerful widget library for Tcl/Tk
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-shared --with-tcl=${BUILDLINK_DIR}/lib \
+			--with-tk=${BUILDLINK_DIR}/lib \
+			--disable-stubs
+USE_BUILDLINK_ONLY=	YES
+
+WRKSRC=			${WRKDIR}/tix8.2.0/unix
+
+test:
+	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} test)
+
+.include "../../mk/x11.buildlink.mk"
+.include "../../x11/tk/buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk-Tix/PLIST b/x11/tk-Tix/PLIST
new file mode 100644
index 00000000000..363e8f3be2f
--- /dev/null
+++ b/x11/tk-Tix/PLIST
@@ -0,0 +1,209 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
+bin/tixwish
+lib/libtix82.so
+lib/tix8.2/Balloon.tcl
+lib/tix8.2/BtnBox.tcl
+lib/tix8.2/CObjView.tcl
+lib/tix8.2/ChkList.tcl
+lib/tix8.2/ComboBox.tcl
+lib/tix8.2/Compat.tcl
+lib/tix8.2/Console.tcl
+lib/tix8.2/Control.tcl
+lib/tix8.2/DefSchm.tcl
+lib/tix8.2/DialogS.tcl
+lib/tix8.2/DirBox.tcl
+lib/tix8.2/DirDlg.tcl
+lib/tix8.2/DirList.tcl
+lib/tix8.2/DirTree.tcl
+lib/tix8.2/DragDrop.tcl
+lib/tix8.2/DtlList.tcl
+lib/tix8.2/EFileBox.tcl
+lib/tix8.2/EFileDlg.tcl
+lib/tix8.2/Event.tcl
+lib/tix8.2/FileBox.tcl
+lib/tix8.2/FileCbx.tcl
+lib/tix8.2/FileCmpt.tcl
+lib/tix8.2/FileDlg.tcl
+lib/tix8.2/FileEnt.tcl
+lib/tix8.2/FileUtil.tcl
+lib/tix8.2/FloatEnt.tcl
+lib/tix8.2/Grid.tcl
+lib/tix8.2/HList.tcl
+lib/tix8.2/HListDD.tcl
+lib/tix8.2/IconView.tcl
+lib/tix8.2/Init.tcl
+lib/tix8.2/LabEntry.tcl
+lib/tix8.2/LabFrame.tcl
+lib/tix8.2/LabWidg.tcl
+lib/tix8.2/ListNBk.tcl
+lib/tix8.2/Meter.tcl
+lib/tix8.2/MultView.tcl
+lib/tix8.2/NoteBook.tcl
+lib/tix8.2/OldUtil.tcl
+lib/tix8.2/OptMenu.tcl
+lib/tix8.2/PanedWin.tcl
+lib/tix8.2/PopMenu.tcl
+lib/tix8.2/Primitiv.tcl
+lib/tix8.2/ResizeH.tcl
+lib/tix8.2/SGrid.tcl
+lib/tix8.2/SHList.tcl
+lib/tix8.2/SListBox.tcl
+lib/tix8.2/STList.tcl
+lib/tix8.2/SText.tcl
+lib/tix8.2/SWidget.tcl
+lib/tix8.2/SWindow.tcl
+lib/tix8.2/Select.tcl
+lib/tix8.2/Shell.tcl
+lib/tix8.2/SimpDlg.tcl
+lib/tix8.2/StackWin.tcl
+lib/tix8.2/StatBar.tcl
+lib/tix8.2/StdBBox.tcl
+lib/tix8.2/StdShell.tcl
+lib/tix8.2/TList.tcl
+lib/tix8.2/Tix.tcl
+lib/tix8.2/Tree.tcl
+lib/tix8.2/UnixFile.tcl
+lib/tix8.2/Utils.tcl
+lib/tix8.2/VResize.tcl
+lib/tix8.2/VStack.tcl
+lib/tix8.2/VTree.tcl
+lib/tix8.2/Variable.tcl
+lib/tix8.2/Verify.tcl
+lib/tix8.2/Version.tcl
+lib/tix8.2/WInfo.tcl
+lib/tix8.2/WinFile.tcl
+lib/tix8.2/bitmaps/act_fold.gif
+lib/tix8.2/bitmaps/act_fold.xbm
+lib/tix8.2/bitmaps/act_fold.xpm
+lib/tix8.2/bitmaps/balarrow.xbm
+lib/tix8.2/bitmaps/cbxarrow.xbm
+lib/tix8.2/bitmaps/ck_def.xbm
+lib/tix8.2/bitmaps/ck_off.xbm
+lib/tix8.2/bitmaps/ck_on.xbm
+lib/tix8.2/bitmaps/cross.xbm
+lib/tix8.2/bitmaps/decr.xbm
+lib/tix8.2/bitmaps/drop.xbm
+lib/tix8.2/bitmaps/file.gif
+lib/tix8.2/bitmaps/file.xbm
+lib/tix8.2/bitmaps/file.xpm
+lib/tix8.2/bitmaps/folder.gif
+lib/tix8.2/bitmaps/folder.xbm
+lib/tix8.2/bitmaps/folder.xpm
+lib/tix8.2/bitmaps/harddisk.xbm
+lib/tix8.2/bitmaps/hourglas.mask
+lib/tix8.2/bitmaps/hourglas.xbm
+lib/tix8.2/bitmaps/incr.xbm
+lib/tix8.2/bitmaps/info.gif
+lib/tix8.2/bitmaps/info.xpm
+lib/tix8.2/bitmaps/maximize.xbm
+lib/tix8.2/bitmaps/minimize.xbm
+lib/tix8.2/bitmaps/minus.gif
+lib/tix8.2/bitmaps/minus.xbm
+lib/tix8.2/bitmaps/minus.xpm
+lib/tix8.2/bitmaps/minusarm.gif
+lib/tix8.2/bitmaps/minusarm.xbm
+lib/tix8.2/bitmaps/minusarm.xpm
+lib/tix8.2/bitmaps/mktransgif.tcl
+lib/tix8.2/bitmaps/network.xbm
+lib/tix8.2/bitmaps/no_entry.gif
+lib/tix8.2/bitmaps/no_entry.xpm
+lib/tix8.2/bitmaps/openfile.xbm
+lib/tix8.2/bitmaps/openfold.gif
+lib/tix8.2/bitmaps/openfold.xbm
+lib/tix8.2/bitmaps/openfold.xpm
+lib/tix8.2/bitmaps/plus.gif
+lib/tix8.2/bitmaps/plus.xbm
+lib/tix8.2/bitmaps/plus.xpm
+lib/tix8.2/bitmaps/plusarm.gif
+lib/tix8.2/bitmaps/plusarm.xbm
+lib/tix8.2/bitmaps/plusarm.xpm
+lib/tix8.2/bitmaps/resize1.xbm
+lib/tix8.2/bitmaps/resize2.xbm
+lib/tix8.2/bitmaps/restore.xbm
+lib/tix8.2/bitmaps/srcfile.gif
+lib/tix8.2/bitmaps/srcfile.xbm
+lib/tix8.2/bitmaps/srcfile.xpm
+lib/tix8.2/bitmaps/system.xbm
+lib/tix8.2/bitmaps/textfile.gif
+lib/tix8.2/bitmaps/textfile.xbm
+lib/tix8.2/bitmaps/textfile.xpm
+lib/tix8.2/bitmaps/tick.xbm
+lib/tix8.2/bitmaps/warning.gif
+lib/tix8.2/bitmaps/warning.xpm
+lib/tix8.2/fs.tcl
+lib/tix8.2/pkgIndex.tcl
+lib/tix8.2/pref/12Point.fs
+lib/tix8.2/pref/12Point.fsc
+lib/tix8.2/pref/14Point.fs
+lib/tix8.2/pref/14Point.fsc
+lib/tix8.2/pref/Bisque.cs
+lib/tix8.2/pref/Bisque.csc
+lib/tix8.2/pref/Blue.cs
+lib/tix8.2/pref/Blue.csc
+lib/tix8.2/pref/Gray.cs
+lib/tix8.2/pref/Gray.csc
+lib/tix8.2/pref/Makefile
+lib/tix8.2/pref/Old12Pt.fs
+lib/tix8.2/pref/Old14Pt.fs
+lib/tix8.2/pref/SGIGray.cs
+lib/tix8.2/pref/SGIGray.csc
+lib/tix8.2/pref/TK.cs
+lib/tix8.2/pref/TK.csc
+lib/tix8.2/pref/TK.fs
+lib/tix8.2/pref/TK.fsc
+lib/tix8.2/pref/TixGray.cs
+lib/tix8.2/pref/TixGray.csc
+lib/tix8.2/pref/TkWin.cs
+lib/tix8.2/pref/TkWin.csc
+lib/tix8.2/pref/TkWin.fs
+lib/tix8.2/pref/TkWin.fsc
+lib/tix8.2/pref/tixmkpref
+lib/tix8.2/tclIndex
+man/man1/tixwish.1
+man/mann/TixIntro.n
+man/mann/compound.n
+man/mann/pixmap.n
+man/mann/tix.n
+man/mann/tixBalloon.n
+man/mann/tixButtonBox.n
+man/mann/tixCheckList.n
+man/mann/tixComboBox.n
+man/mann/tixControl.n
+man/mann/tixDestroy.n
+man/mann/tixDirList.n
+man/mann/tixDirSelectDialog.n
+man/mann/tixDirTree.n
+man/mann/tixDisplayStyle.n
+man/mann/tixExFileSelectBox.n
+man/mann/tixExFileSelectDialog.n
+man/mann/tixFileEntry.n
+man/mann/tixFileSelectBox.n
+man/mann/tixFileSelectDialog.n
+man/mann/tixForm.n
+man/mann/tixGetBoolean.n
+man/mann/tixGetInt.n
+man/mann/tixGrid.n
+man/mann/tixHList.n
+man/mann/tixInputOnly.n
+man/mann/tixLabelEntry.n
+man/mann/tixLabelFrame.n
+man/mann/tixListNoteBook.n
+man/mann/tixMeter.n
+man/mann/tixMwm.n
+man/mann/tixNBFrame.n
+man/mann/tixNoteBook.n
+man/mann/tixOptionMenu.n
+man/mann/tixPanedWindow.n
+man/mann/tixPopupMenu.n
+man/mann/tixScrolledHList.n
+man/mann/tixScrolledListBox.n
+man/mann/tixScrolledText.n
+man/mann/tixScrolledWindow.n
+man/mann/tixSelect.n
+man/mann/tixStdButtonBox.n
+man/mann/tixTList.n
+man/mann/tixTree.n
+man/mann/tixUtils.n
+@dirrm lib/tix8.2/pref
+@dirrm lib/tix8.2/bitmaps
+@dirrm lib/tix8.2
diff --git a/x11/tk-Tix/distinfo b/x11/tk-Tix/distinfo
new file mode 100644
index 00000000000..73556615dcb
--- /dev/null
+++ b/x11/tk-Tix/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
+
+SHA1 (tix8.2.0b1.tar.gz) = c9114e56c41fc492532639127439d6f267c51402
+Size (tix8.2.0b1.tar.gz) = 1374621 bytes
+SHA1 (patch-aa) = c77a20a692b3ef79e9092c15e506d5af7961919e
+SHA1 (patch-ab) = 2a46093df4d19c481d58b2a9b8945430d547a12c
+SHA1 (patch-ac) = 9702cf3635c04ce066f5d910d5a5b6ad1d87d96b
diff --git a/x11/tk-Tix/patches/patch-aa b/x11/tk-Tix/patches/patch-aa
new file mode 100644
index 00000000000..8dcd5201186
--- /dev/null
+++ b/x11/tk-Tix/patches/patch-aa
@@ -0,0 +1,48 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
+
+--- Makefile.in.orig	Thu Jan 11 08:43:46 2001
++++ Makefile.in
+@@ -217,6 +217,7 @@
+ STLIB_LD = @STLIB_LD@
+ 
+ TCL_BIN_DIR = @TCL_BIN_DIR@
++TCL_CC = @TCL_CC@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@
+ TCL_LD_FLAGS = @TCL_LD_FLAGS@
+@@ -242,17 +243,20 @@
+ TIX_DEFS = @TIX_DEFS@
+ TIX_SRC_DIR = @TIX_SRC_DIR@
+ 
++X_INCLUDES = @x_includes@
++
+ AUTOCONF = autoconf
+ 
+ LDFLAGS = $(LDFLAGS_DEFAULT)
+ 
+-INCLUDES = -I$(TCL_SRC_DIR)/generic \
+-	   -I$(TCL_SRC_DIR)/unix \
+-	   -I$(TK_SRC_DIR)/generic \
+-	   -I$(TK_SRC_DIR)/unix \
++INCLUDES = -I$(BUILDLINK_DIR)/include/tcl/generic \
++	   -I$(BUILDLINK_DIR)/include/tcl/unix \
++	   -I$(BUILDLINK_DIR)/include/tk/generic \
++	   -I$(BUILDLINK_DIR)/include/tk/unix \
+ 	   -I$(GENERIC_DIR) \
+ 	   -I$(UNIX_DIR) \
+-	   -I$(WIN_DIR)
++	   -I$(WIN_DIR) \
++	   -I$(X_INCLUDES)
+ 
+ EXTRA_CFLAGS = $(TCL_DEFS) $(TK_DEFS) \
+ 	$(PROTO_FLAGS) $(SECURITY_FLAGS) $(MEM_DEBUG_FLAGS) \
+@@ -343,7 +347,8 @@
+ $(TIX_EXE_FILE): tixAppInit.o
+ 	$(CC) @LDFLAGS@ tixAppInit.o \
+ 		@TIX_BUILD_LIB_SPEC@ \
+-		@TK_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ \
++		@TK_LIB_SPEC@ @TCL_LIB_SPEC@ \
++		@TK_LIBS@ @TCL_LIBS@ \
+ 		-o $(TIX_EXE_FILE)
+ 
+ #========================================================================
diff --git a/x11/tk-Tix/patches/patch-ab b/x11/tk-Tix/patches/patch-ab
new file mode 100644
index 00000000000..187a7e0246e
--- /dev/null
+++ b/x11/tk-Tix/patches/patch-ab
@@ -0,0 +1,45 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
+
+--- configure.in.orig	Mon Jan  8 07:15:48 2001
++++ configure.in
+@@ -118,6 +118,7 @@
+ AC_SUBST(TK_STUB_LIB_SPEC)
+ 
+ AC_SUBST(TCL_DBGX)
++AC_SUBST(TCL_CC)
+ 
+ TIX_DEFS=""
+ #--------------------------------------------------------------------
+@@ -315,7 +316,7 @@
+         TIX_EXE_FILE=tixwish${NODOT_VERSION}${DBGX}${EXEEXT}
+     ;;
+     *)
+-        TIX_EXE_FILE=tixwish${VERSION}${DBGX}${EXEEXT}
++        TIX_EXE_FILE=tixwish${DBGX}${EXEEXT}
+     ;;
+ esac
+ 
+@@ -346,14 +347,19 @@
+ if test "$TIX_USE_STUBS" = "yes"; then
+     SHLIB_LD_LIBS="$TK_BUILD_STUB_LIB_SPEC $TCL_BUILD_STUB_LIB_SPEC"
+ else
+-    SHLIB_LD_LIBS="$TK_BUILD_LIB_SPEC $TCL_BUILD_LIB_SPEC"
++    SHLIB_LD_LIBS="$TK_LIB_SPEC $TCL_LIB_SPEC"
+ fi
+ 
+-AC_SUBST(TK_BUILD_LIB_SPEC)
+-AC_SUBST(TCL_BUILD_LIB_SPEC)
++AC_SUBST(TK_LIB_SPEC)
++AC_SUBST(TCL_LIB_SPEC)
+ 
+-TIX_BUILD_LIB_SPEC="-L${TIX_SRC_DIR}/unix -ltix${VERSION}${DBGX}"
++TIX_BUILD_LIB_SPEC="-L${TIX_SRC_DIR}/unix -ltix${NODOT_VERSION}${DBGX}"
+ AC_SUBST(TIX_BUILD_LIB_SPEC)
++
++# Find X includes and libraries
++AC_PATH_X
++AC_SUBST(x_includes)
++AC_SUBST(x_libraries)
+ 
+ #--------------------------------------------------------------------
+ # Finally, substitute all of the various values into the Makefile.
diff --git a/x11/tk-Tix/patches/patch-ac b/x11/tk-Tix/patches/patch-ac
new file mode 100644
index 00000000000..1452e334c63
--- /dev/null
+++ b/x11/tk-Tix/patches/patch-ac
@@ -0,0 +1,385 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
+
+--- configure.orig	Mon Jan  8 07:15:48 2001
++++ configure
+@@ -27,6 +27,8 @@
+   --enable-shared         build and link with shared libraries [--enable-shared]"
+ ac_help="$ac_help
+   --enable-symbols        build with debugging symbols (default=no)"
++ac_help="$ac_help
++  --with-x                use the X Window System"
+ 
+ # Initialize some variables set by options.
+ # The variables have the same names as the options, with
+@@ -1361,6 +1363,7 @@
+ 
+ 
+ 
++
+ TIX_DEFS=""
+ #--------------------------------------------------------------------
+ #
+@@ -1710,7 +1713,7 @@
+         TIX_EXE_FILE=tixwish${NODOT_VERSION}${DBGX}${EXEEXT}
+     ;;
+     *)
+-        TIX_EXE_FILE=tixwish${VERSION}${DBGX}${EXEEXT}
++        TIX_EXE_FILE=tixwish${DBGX}${EXEEXT}
+     ;;
+ esac
+ 
+@@ -1781,13 +1784,331 @@
+ if test "$TIX_USE_STUBS" = "yes"; then
+     SHLIB_LD_LIBS="$TK_BUILD_STUB_LIB_SPEC $TCL_BUILD_STUB_LIB_SPEC"
+ else
+-    SHLIB_LD_LIBS="$TK_BUILD_LIB_SPEC $TCL_BUILD_LIB_SPEC"
++    SHLIB_LD_LIBS="$TK_LIB_SPEC $TCL_LIB_SPEC"
++fi
++
++
++
++
++TIX_BUILD_LIB_SPEC="-L${TIX_SRC_DIR}/unix -ltix${NODOT_VERSION}${DBGX}"
++
++
++# Find X includes and libraries
++echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
++echo "configure:1799: checking how to run the C preprocessor" >&5
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    # This must be in double quotes, not single quotes, because CPP may get
++  # substituted into the Makefile and "${CC-cc}" will confuse make.
++  CPP="${CC-cc} -E"
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp.
++  cat > conftest.$ac_ext <<EOF
++#line 1814 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -E -traditional-cpp"
++  cat > conftest.$ac_ext <<EOF
++#line 1831 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -nologo -E"
++  cat > conftest.$ac_ext <<EOF
++#line 1848 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP=/lib/cpp
++fi
++rm -f conftest*
++fi
++rm -f conftest*
++fi
++rm -f conftest*
++  ac_cv_prog_CPP="$CPP"
++fi
++  CPP="$ac_cv_prog_CPP"
++else
++  ac_cv_prog_CPP="$CPP"
++fi
++echo "$ac_t""$CPP" 1>&6
++
++# If we find X, set shell vars x_includes and x_libraries to the
++# paths, otherwise set no_x=yes.
++# Uses ac_ vars as temps to allow command line to override cache and checks.
++# --without-x overrides everything else, but does not touch the cache.
++echo $ac_n "checking for X""... $ac_c" 1>&6
++echo "configure:1883: checking for X" >&5
++
++# Check whether --with-x or --without-x was given.
++if test "${with_x+set}" = set; then
++  withval="$with_x"
++  :
++fi
++
++# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
++if test "x$with_x" = xno; then
++  # The user explicitly disabled X.
++  have_x=disabled
++else
++  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
++    # Both variables are already set.
++    have_x=yes
++  else
++if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  # One or both of the vars are not set, and there is no cached value.
++ac_x_includes=NO ac_x_libraries=NO
++rm -fr conftestdir
++if mkdir conftestdir; then
++  cd conftestdir
++  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
++  cat > Imakefile <<'EOF'
++acfindx:
++	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
++EOF
++  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
++    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
++    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
++    for ac_extension in a so sl; do
++      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
++        test -f $ac_im_libdir/libX11.$ac_extension; then
++        ac_im_usrlibdir=$ac_im_libdir; break
++      fi
++    done
++    # Screen out bogus values from the imake configuration.  They are
++    # bogus both because they are the default anyway, and because
++    # using them would break gcc on systems where it needs fixed includes.
++    case "$ac_im_incroot" in
++	/usr/include) ;;
++	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
++    esac
++    case "$ac_im_usrlibdir" in
++	/usr/lib | /lib) ;;
++	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
++    esac
++  fi
++  cd ..
++  rm -fr conftestdir
+ fi
+ 
++if test "$ac_x_includes" = NO; then
++  # Guess where to find include files, by looking for this one X11 .h file.
++  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
++
++  # First, try using that file with no special directory specified.
++cat > conftest.$ac_ext <<EOF
++#line 1945 "configure"
++#include "confdefs.h"
++#include <$x_direct_test_include>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  # We can compile using X headers with no special include directory.
++ac_x_includes=
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  # Look for the header file in a standard set of common directories.
++# Check X11 before X11Rn because it is often a symlink to the current release.
++  for ac_dir in               \
++    /usr/X11/include          \
++    /usr/X11R6/include        \
++    /usr/X11R5/include        \
++    /usr/X11R4/include        \
++                              \
++    /usr/include/X11          \
++    /usr/include/X11R6        \
++    /usr/include/X11R5        \
++    /usr/include/X11R4        \
++                              \
++    /usr/local/X11/include    \
++    /usr/local/X11R6/include  \
++    /usr/local/X11R5/include  \
++    /usr/local/X11R4/include  \
++                              \
++    /usr/local/include/X11    \
++    /usr/local/include/X11R6  \
++    /usr/local/include/X11R5  \
++    /usr/local/include/X11R4  \
++                              \
++    /usr/X386/include         \
++    /usr/x386/include         \
++    /usr/XFree86/include/X11  \
++                              \
++    /usr/include              \
++    /usr/local/include        \
++    /usr/unsupported/include  \
++    /usr/athena/include       \
++    /usr/local/x11r5/include  \
++    /usr/lpp/Xamples/include  \
++                              \
++    /usr/openwin/include      \
++    /usr/openwin/share/include \
++    ; \
++  do
++    if test -r "$ac_dir/$x_direct_test_include"; then
++      ac_x_includes=$ac_dir
++      break
++    fi
++  done
++fi
++rm -f conftest*
++fi # $ac_x_includes = NO
++
++if test "$ac_x_libraries" = NO; then
++  # Check for the libraries.
++
++  test -z "$x_direct_test_library" && x_direct_test_library=Xt
++  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
+ 
++  # See if we find them without any special options.
++  # Don't add to $LIBS permanently.
++  ac_save_LIBS="$LIBS"
++  LIBS="-l$x_direct_test_library $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2019 "configure"
++#include "confdefs.h"
++
++int main() {
++${x_direct_test_function}()
++; return 0; }
++EOF
++if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  LIBS="$ac_save_LIBS"
++# We can link X programs with no special library path.
++ac_x_libraries=
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  LIBS="$ac_save_LIBS"
++# First see if replacing the include by lib works.
++# Check X11 before X11Rn because it is often a symlink to the current release.
++for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
++    /usr/X11/lib          \
++    /usr/X11R6/lib        \
++    /usr/X11R5/lib        \
++    /usr/X11R4/lib        \
++                          \
++    /usr/lib/X11          \
++    /usr/lib/X11R6        \
++    /usr/lib/X11R5        \
++    /usr/lib/X11R4        \
++                          \
++    /usr/local/X11/lib    \
++    /usr/local/X11R6/lib  \
++    /usr/local/X11R5/lib  \
++    /usr/local/X11R4/lib  \
++                          \
++    /usr/local/lib/X11    \
++    /usr/local/lib/X11R6  \
++    /usr/local/lib/X11R5  \
++    /usr/local/lib/X11R4  \
++                          \
++    /usr/X386/lib         \
++    /usr/x386/lib         \
++    /usr/XFree86/lib/X11  \
++                          \
++    /usr/lib              \
++    /usr/local/lib        \
++    /usr/unsupported/lib  \
++    /usr/athena/lib       \
++    /usr/local/x11r5/lib  \
++    /usr/lpp/Xamples/lib  \
++    /lib/usr/lib/X11	  \
++                          \
++    /usr/openwin/lib      \
++    /usr/openwin/share/lib \
++    ; \
++do
++  for ac_extension in a so sl; do
++    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
++      ac_x_libraries=$ac_dir
++      break 2
++    fi
++  done
++done
++fi
++rm -f conftest*
++fi # $ac_x_libraries = NO
++
++if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
++  # Didn't find X anywhere.  Cache the known absence of X.
++  ac_cv_have_x="have_x=no"
++else
++  # Record where we found X for the cache.
++  ac_cv_have_x="have_x=yes \
++	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
++fi
++fi
++  fi
++  eval "$ac_cv_have_x"
++fi # $with_x != no
++
++if test "$have_x" != yes; then
++  echo "$ac_t""$have_x" 1>&6
++  no_x=yes
++else
++  # If each of the values was on the command line, it overrides each guess.
++  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
++  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
++  # Update the cache value to reflect the command line values.
++  ac_cv_have_x="have_x=yes \
++		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
++  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
++fi
+ 
+ 
+-TIX_BUILD_LIB_SPEC="-L${TIX_SRC_DIR}/unix -ltix${VERSION}${DBGX}"
+ 
+ 
+ #--------------------------------------------------------------------
+@@ -1975,6 +2296,7 @@
+ s%@TK_STUB_LIB_FILE@%$TK_STUB_LIB_FILE%g
+ s%@TK_STUB_LIB_SPEC@%$TK_STUB_LIB_SPEC%g
+ s%@TCL_DBGX@%$TCL_DBGX%g
++s%@TCL_CC@%$TCL_CC%g
+ s%@TIX_SAM_DEFS@%$TIX_SAM_DEFS%g
+ s%@TIX_SAM_BUNDLES@%$TIX_SAM_BUNDLES%g
+ s%@CLEANFILES@%$CLEANFILES%g
+@@ -1995,8 +2317,11 @@
+ s%@TIX_EXE_FILE@%$TIX_EXE_FILE%g
+ s%@TCLSH_PROG@%$TCLSH_PROG%g
+ s%@TIX_DEFS@%$TIX_DEFS%g
+-s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
++s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
+ s%@TIX_BUILD_LIB_SPEC@%$TIX_BUILD_LIB_SPEC%g
++s%@CPP@%$CPP%g
++s%@x_includes@%$x_includes%g
++s%@x_libraries@%$x_libraries%g
+ 
+ CEOF
+ EOF