--- tclx8.3/unix/Common.mk.in.makecfg	Mon Aug 28 23:58:00 2000
+++ tclx8.3/unix/Common.mk.in	Tue Aug  7 23:54:14 2001
@@ -37,7 +37,7 @@
 # Programs and options used by build
 #
 CC           = @CC@
-CFLAGS       = @CFLAGS@ @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
+CFLAGS       = -O2 @TCL_EXTRA_CFLAGS@ -fPIC
 SYSCFLAGS    = @SYSCFLAGS@
 RANLIB       = @RANLIB@
 AR           = ar
@@ -72,6 +72,13 @@
 bldbasedir   = @bldbasedir@
 prefix       = @prefix@
 exec_prefix  = @exec_prefix@
+libdir     = @exec_prefix@/lib
+
+# Path to use at runtime to refer to LIB_INSTALL_DIR:
+LIB_RUNTIME_DIR = 
+
+# Directory in which to install the .a or .so binary.
+LIB_INSTALL_DIR = 
 
 TCLX_PREFIX="${prefix}"
 TCLX_EXEC_PREFIX="${exec_prefix}"
@@ -82,7 +89,7 @@
 # TclX configuration information determined by configure.
 #
 TKX_BUILD    = @TKX_BUILD@
-TCLX_DEFS    = @DEFS@
+TCLX_DEFS    = -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void
 TCLX_LIBS    = @TCLX_LIBS@
 
 #------------------------------------------------------------------------------
@@ -91,13 +98,13 @@
 TCL_STLIB_NAME  = @TCL_STLIB_NAME@
 TK_STLIB_NAME   = @TK_STLIB_NAME@
 
-TCLX_SHLIB_NAME = @TCLX_SHLIB_NAME@
-TCLX_STLIB_NAME = @TCLX_STLIB_NAME@
-TCLX_LIB_NAME   = @TCLX_LIB_NAME@
-
-TKX_SHLIB_NAME  = @TKX_SHLIB_NAME@
-TKX_STLIB_NAME  = @TKX_STLIB_NAME@
-TKX_LIB_NAME    = @TKX_LIB_NAME@
+TCLX_SHLIB_NAME = libtclx.so
+TCLX_STLIB_NAME = libtclx${DBGX}.a
+TCLX_LIB_NAME   = libtclx.so
+
+TKX_SHLIB_NAME  = libtkx.so
+TKX_STLIB_NAME  = libtkx${DBGX}.a
+TKX_LIB_NAME    = libtkx.so
 
 #------------------------------------------------------------------------------
 # Compiler flag to use when generating shared object files.  Unixware cc will
@@ -108,8 +115,8 @@
 #------------------------------------------------------------------------------
 # Linker arguments to pick up TclX libraries.
 #
-TCLX_BUILD_LIB_SPEC  = @TCLX_BUILD_LIB_SPEC@
-TKX_BUILD_LIB_SPEC   = @TKX_BUILD_LIB_SPEC@
+TCLX_BUILD_LIB_SPEC  = -L${TCLX_UNIX_SRC_DIR} -ltclx
+TKX_BUILD_LIB_SPEC   = -L${TKX_UNIX_SRC_DIR} -ltkx
 
 #------------------------------------------------------------------------------
 # Configuration information from tclConfig.sh.
--- tclx8.3/tcl/unix/Makefile.in.makecfg	Mon Aug 28 23:58:00 2000
+++ tclx8.3/tcl/unix/Makefile.in	Wed Aug  8 16:45:51 2001
@@ -67,24 +67,24 @@
 
 GENERIC_SOBJS = \
     @TCLX_BUILD_DUMMY_STANDALONE@ \
-    tclXbsearch@SHOBJ_SUFFIX@    tclXchmod@SHOBJ_SUFFIX@    \
-    tclXcmdInit@SHOBJ_SUFFIX@    tclXcmdloop@SHOBJ_SUFFIX@  \
-    tclXdebug@SHOBJ_SUFFIX@      tclXdup@SHOBJ_SUFFIX@      \
-    tclXfcntl@SHOBJ_SUFFIX@      tclXfilecmds@SHOBJ_SUFFIX@ \
-    tclXfilescan@SHOBJ_SUFFIX@   tclXflock@SHOBJ_SUFFIX@    \
-    tclXfstat@SHOBJ_SUFFIX@      tclXgeneral@SHOBJ_SUFFIX@  \
-    tclXhandles@SHOBJ_SUFFIX@    tclXunixId@SHOBJ_SUFFIX@   \
-    tclXinit@SHOBJ_SUFFIX@       tclXkeylist@SHOBJ_SUFFIX@  \
-    tclXlib@SHOBJ_SUFFIX@        tclXlist@SHOBJ_SUFFIX@     \
-    tclXmath@SHOBJ_SUFFIX@       tclXmsgcat@SHOBJ_SUFFIX@   \
-    tclXlibInit@SHOBJ_SUFFIX@    tclXprocess@SHOBJ_SUFFIX@  \
-    tclXprofile@SHOBJ_SUFFIX@    \
-    tclXselect@SHOBJ_SUFFIX@     tclXunixSock@SHOBJ_SUFFIX@ \
-    tclXsignal@SHOBJ_SUFFIX@     tclXshell@SHOBJ_SUFFIX@    \
-    tclXstring@SHOBJ_SUFFIX@     tclXsocket@SHOBJ_SUFFIX@   \
-    tclXunixCmds@SHOBJ_SUFFIX@   tclXutil@SHOBJ_SUFFIX@     \
-    tclXunixOS@SHOBJ_SUFFIX@     tclXoscmds@SHOBJ_SUFFIX@   \
-    tclXunixDup@SHOBJ_SUFFIX@    tclXlgets@SHOBJ_SUFFIX@
+    tclXbsearch.o    tclXchmod.o    \
+    tclXcmdInit.o    tclXcmdloop.o  \
+    tclXdebug.o      tclXdup.o      \
+    tclXfcntl.o      tclXfilecmds.o \
+    tclXfilescan.o   tclXflock.o    \
+    tclXfstat.o      tclXgeneral.o  \
+    tclXhandles.o    tclXunixId.o   \
+    tclXinit.o       tclXkeylist.o  \
+    tclXlib.o        tclXlist.o     \
+    tclXmath.o       tclXmsgcat.o   \
+    tclXlibInit.o    tclXprocess.o  \
+    tclXprofile.o    \
+    tclXselect.o     tclXunixSock.o \
+    tclXsignal.o     tclXshell.o    \
+    tclXstring.o     tclXsocket.o   \
+    tclXunixCmds.o   tclXutil.o     \
+    tclXunixOS.o     tclXoscmds.o   \
+    tclXunixDup.o    tclXlgets.o
 
 COMPAT_OBJS = @LIBOBJS@
 
@@ -121,7 +121,7 @@
     stringfile.o     tcllib.o         fmath.o          buildhelp.o \
     buildidx.o       autoload.o       tclx.o
 
-HELP_DIR = @HELP_DIR@/tcl
+HELP_DIR = ${srcbasedir}/tcl/help
 
 TEST_OBJS = tclTest.o tclTestObj.o tclUnixTest.o tclXtest.o \
 	tclThreadTest.o tclXunixTest.o
@@ -146,15 +146,15 @@
 
 standalone: tcl.standalone tclXtest.standalone hello
 
-tcl: tclXAppInit.o @TCLX_SHLIB_BUILD_REF@ @TCLX_STLIB_BUILD_REF@ Makefile
+tcl: tclXAppInit.o libtclx.so libtclx.so.0 libtclx${DBGX}.a Makefile
 	${CC} ${LD_SWITCHES} tclXAppInit.o ${ALL_LIBS} \
 	    -o $@ || (rm -f $@; exit 1)
 
-tcl.static: tclXAppInit.o @TCLX_STLIB_BUILD_REF@ Makefile
+tcl.static: tclXAppInit.o libtclx${DBGX}.a Makefile
 	${CC} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} \
 	    -o $@ || (rm -f $@; exit 1)
 
-tcl.standalone: tclXAppInitSA.o @TCLX_STLIB_BUILD_REF@ Makefile
+tcl.standalone: tclXAppInitSA.o libtclx${DBGX}.a Makefile
 	${CC} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} \
 	    -o $@ || (rm -f $@; exit 1)
 
@@ -162,12 +162,12 @@
 	${AR} cr ${TCLX_STLIB_NAME} ${OBJS}
 	${RANLIB} ${TCLX_STLIB_NAME}
 
-@TCLX_SHLIB_BUILD_TARGET@: ${SOBJS}
+libtclx.so.0: ${SOBJS}
 	rm -f ${TCLX_SHLIB_NAME}
-	PATH=${TCL_UNIX_DIR}:${PATH}; export PATH; \
-	TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \
-	LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
-	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
+	${CC} -pipe -shared -Wl,-soname,$@ -o $@ ${SOBJS} ${TCL_SHLIB_LD_LIBS} -L${TCL_UNIX_DIR} -ltcl
+
+libtclx.so: libtclx.so.0
+	ln -sf $< $@
 
 hello:	hello.c
 	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
@@ -311,9 +311,9 @@
 BUILDHELP=@BUILDHELP@
 buildhelp: tcl tcl.tndx
 	rm -rf ${HELP_DIR} help help.tmp
-	if test ! -d @HELP_DIR@ ; then \
-	    mkdir @HELP_DIR@ ; \
-	fi
+#	if test ! -d ${HELP_DIR} ; then \
+#	    mkdir ${HELP_DIR} ; \
+#	fi
 	mkdir ${HELP_DIR}
 	${BLDMANHELP} ${TCL_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
 	    ${HELP_DIR} Tcl.brf
@@ -349,7 +349,8 @@
 	fi
 	${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
 	if test "@SHARED_BUILD@" = "1"; then \
-	    ${INSTCOPY} ${TCLX_SHLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
+	    ${INSTCOPY} libtclx.so.0 ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
+	    cp -fd libtclx.so ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
 	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
 	fi
 
--- tclx8.3/tk/unix/Makefile.in.makecfg	Mon Aug 28 23:58:00 2000
+++ tclx8.3/tk/unix/Makefile.in	Wed Aug  8 17:27:07 2001
@@ -72,7 +72,7 @@
 LIBTCLX = ../../tcl/unix/${TCLX_STLIB_NAME}
 TCL = ../../tcl/unix/tcl
 
-HELP_DIR = @HELP_DIR@/tk
+HELP_DIR = ${srcbasedir}/tk/help
 
 TEST_OBJS = tkTest.o tkSquare.o tclThreadTest.o tkXunixTest.o
 
@@ -95,27 +95,28 @@
 
 standalone: wishx.standalone tktest.standalone hello
 
-wishx: tkXAppInit.o @TKX_SHLIB_BUILD_REF@ @TKX_STLIB_BUILD_REF@ ${TCL} Makefile
+wishx: tkXAppInit.o libtkx.so.0 libtkx.so libtkx${DBGX}.a ${TCL} Makefile
 	${CC} ${LD_SWITCHES} tkXAppInit.o ${ALL_LIBS} \
 	    -o $@ || (rm -f $@; exit 1)
 
-wishx.static: tkXAppInit.o ${TKX_STLIB_NAME} ${LIBTCLX} Makefile
+wishx.static: tkXAppInit.o libtkx${DBGX}.a ${LIBTCLX} Makefile
 	${CC} ${LD_SWITCHES} tkXAppInit.o ${STATIC_LIBS} -o $@ || \
 	    (rm -f $@; exit 1)
 
-wishx.standalone: tkXAppInitSA.o ${TKX_STLIB_NAME} ${LIBTCLX} Makefile
+wishx.standalone: tkXAppInitSA.o libtkx${DBGX}.a ${LIBTCLX} Makefile
 	${CC} ${LD_SWITCHES} tkXAppInitSA.o ${STATIC_LIBS} -o $@ || \
 	    (rm -f $@; exit 1)
 
-${TKX_STLIB_NAME}: ${OBJS}
-	${AR} cr ${TKX_STLIB_NAME} ${OBJS}
-	${RANLIB} ${TKX_STLIB_NAME}
+libtkx${DBGX}.a: ${OBJS}
+	${AR} cr $@ ${OBJS}
+	${RANLIB} $@
 
-@TKX_SHLIB_BUILD_TARGET@: ${SOBJS}
+libtkx.so.0: ${SOBJS}
 	rm -f ${TKX_SHLIB_NAME}
-	${TCL_SHLIB_LD} -o ${TKX_SHLIB_NAME} ${SOBJS} \
-	    ${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \
-	    ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}
+	${CC} -pipe -shared -Wl,-soname,$@ -o $@ ${SOBJS} ${TCL_SHLIB_LD_LIBS} -L${TCL_UNIX_DIR} -ltcl -L${TK_UNIX_DIR} -ltk ${TCLX_BUILD_LIB_SPEC}
+
+libtkx.so: libtkx.so.0
+	ln -sf $< $@
 
 hello:	hello.c
 	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
@@ -157,15 +158,15 @@
 # Generate the test program.
 #
 
-tktest: ${TEST_OBJS} @TKX_SHLIB_BUILD_REF@ @TKX_STLIB_BUILD_REF@ ${TCL}
+tktest: ${TEST_OBJS} libtkx.so.0 libtkx.so libtkx${DBGX}.a ${TCL}
 	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${ALL_LIBS} \
 	    -o $@ || (rm -f $@; exit 1)
 
-tktest.static: ${TEST_OBJS} @TKX_STLIB_BUILD_REF@ ${TCL}
+tktest.static: ${TEST_OBJS} libtkx${DBGX}.a ${TCL}
 	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \
 	    -o $@ || (rm -f $@; exit 1)
 
-tktest.standalone: ${TEST_SAOBJS} @TKX_STLIB_BUILD_REF@ ${TCL}
+tktest.standalone: ${TEST_SAOBJS} libtkx${DBGX}.a ${TCL}
 	${CC} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} \
 	    -o $@ || (rm -f $@; exit 1)
 
@@ -203,9 +204,9 @@
 BUILDHELP=@BUILDHELP@
 buildhelp:
 	rm -rf ${HELP_DIR} help help.tmp
-	if test ! -d @HELP_DIR@ ; then \
-	    mkdir @HELP_DIR@ ;\
-	fi
+#	if test ! -d ${HELP_DIR} ; then \
+#	    mkdir ${HELP_DIR} ;\
+#	fi
 	mkdir ${HELP_DIR}
 	${BLDMANHELP} ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
 	    ${HELP_DIR} Tk.brf
@@ -237,7 +238,8 @@
 	fi
 	${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB}
 	if test "@SHARED_BUILD@" = "1"; then \
-	    ${INSTCOPY} ${TKX_SHLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB} ;\
+	    ${INSTCOPY} libtkx.so.0 ${INSTALL_ROOT}${TKX_INST_LIB} ;\
+	    cp -df libtkx.so ${INSTALL_ROOT}${TKX_INST_LIB} ;\
 	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ;\
 	fi
 	${INSTCOPY} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN}
--- tclx8.3/tcl/unix/tclxConfig.sh.in.makecfg	Mon Aug 28 23:58:00 2000
+++ tclx8.3/tcl/unix/tclxConfig.sh.in	Wed Aug  8 17:36:05 2001
@@ -18,7 +18,7 @@
 #
 # Defines for cpp.
 #
-TCLX_DEFS='@DEFS@'
+TCLX_DEFS=' -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void '
 
 #
 # Additional libraries added by TclX.
@@ -35,12 +35,12 @@
 # String to pass to linker to pick up the TclX library from its
 # installed directory.
 #
-TCLX_LIB_SPEC='@TCLX_LIB_SPEC@'
+TCLX_LIB_SPEC='-ltclx'
 
 #
 # Search flags that specify how to find the TclX shared libraries at run time
 # on some systems.
 #
-TCLX_LD_SEARCH_FLAGS='@TCLX_LD_SEARCH_FLAGS@'
+TCLX_LD_SEARCH_FLAGS=''
 
 
--- tclx8.3/tk/unix/tkxConfig.sh.in.makecfg	Mon Aug 28 23:58:00 2000
+++ tclx8.3/tk/unix/tkxConfig.sh.in	Wed Aug  8 17:39:35 2001
@@ -19,7 +19,7 @@
 #
 # Defines for cpp.
 #
-TKX_DEFS='@DEFS@'
+TKX_DEFS=' -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void '
 
 #
 # Additional libraries added by TclX.
@@ -36,6 +36,6 @@
 # String to pass to linker to pick up the TclX library from its
 # installed directory.
 #
-TKX_LIB_SPEC='@TKX_LIB_SPEC@'
+TKX_LIB_SPEC='-ltkx'