--- SAOImageDS9/ds9/unix/configure.ac.orig	2021-11-08 16:46:07.000000000 +0100
+++ SAOImageDS9/ds9/unix/configure.ac	2022-08-26 18:03:43.306670880 +0200
@@ -29,8 +29,6 @@
 
 TEA_INIT()
 
-AC_CONFIG_AUX_DIR(../tclconfig)
-
 #--------------------------------------------------------------------
 # Load the tclConfig.sh file
 #--------------------------------------------------------------------
@@ -58,15 +56,6 @@
 TEA_PATH_CONFIG(fitsy)
 TEA_LOAD_CONFIG(fitsy)
 
-TEA_PATH_CONFIG(tifftcl)
-TEA_LOAD_CONFIG(tifftcl)
-
-TEA_PATH_CONFIG(jpegtcl)
-TEA_LOAD_CONFIG(jpegtcl)
-
-TEA_PATH_CONFIG(zlibtcl)
-TEA_LOAD_CONFIG(zlibtcl)
-
 TEA_PATH_CONFIG(tcliis)
 TEA_LOAD_CONFIG(tcliis)
 
@@ -79,30 +68,9 @@
 TEA_PATH_CONFIG(tclxml)
 TEA_LOAD_CONFIG(tclxml)
 
-TEA_PATH_CONFIG(tclzipfs)
-TEA_LOAD_CONFIG(tclzipfs)
-
-TEA_PATH_CONFIG(tls)
-TEA_LOAD_CONFIG(tls)
-
-TEA_PATH_CONFIG(tkblt)
-TEA_LOAD_CONFIG(tkblt)
-
 TEA_PATH_CONFIG(tkhtml1)
 TEA_LOAD_CONFIG(tkhtml1)
 
-TEA_PATH_CONFIG(tkimg)
-TEA_LOAD_CONFIG(tkimg)
-
-TEA_PATH_CONFIG(tkimgjpeg)
-TEA_LOAD_CONFIG(tkimgjpeg)
-
-TEA_PATH_CONFIG(tkimgtiff)
-TEA_LOAD_CONFIG(tkimgtiff)
-
-TEA_PATH_CONFIG(tkimgwindow)
-TEA_LOAD_CONFIG(tkimgwindow)
-
 TEA_PATH_CONFIG(tkmpeg)
 TEA_LOAD_CONFIG(tkmpeg)
 
@@ -147,12 +115,46 @@
 
 #TEA_ADD_SOURCES([sample.c tclsample.c])
 #TEA_ADD_HEADERS([])
-TEA_ADD_INCLUDES([-I${prefix}/tk8.6/unix])
+TEA_ADD_INCLUDES([-I/usr/include/tk-private/generic])
+TEA_ADD_INCLUDES([-I/usr/include/tk-private/unix])
 #TEA_ADD_LIBS()
 #TEA_ADD_CFLAGS([])
 #TEA_ADD_STUB_SOURCES([])
 #TEA_ADD_TCL_SOURCES([])
 
+TEA_ADD_LIBS([-lm])
+TEA_ADD_LIBS([-lz])
+TEA_ADD_LIBS([-lpthread])
+TEA_ADD_LIBS([-lX11])
+
+
+TEA_ADD_LIBS([-L$TCL_BIN_DIR/tclxpa -ltclxpa])
+
+Tclxml_BIN_DIR=$TCL_BIN_DIR
+TEA_LOAD_CONFIG([Tclxml])
+
+TEA_ADD_LIBS([-L$TCL_BIN_DIR/tcltls1.7.22 -ltcltls])
+
+tkimg_BIN_DIR=$TK_BIN_DIR
+TEA_LOAD_CONFIG([tkimg])
+
+tkblt_BIN_DIR=$TCL_BIN_DIR
+TEA_LOAD_CONFIG([tkblt])
+TEA_ADD_LIBS([-ltkblt3.2])
+
+jpegtcl_BIN_DIR=$TK_BIN_DIR
+TEA_LOAD_CONFIG([jpegtcl])
+
+pngtcl_BIN_DIR=$TK_BIN_DIR
+TEA_LOAD_CONFIG([pngtcl])
+
+tifftcl_BIN_DIR=$TK_BIN_DIR
+TEA_LOAD_CONFIG([tifftcl])
+
+zlibtcl_BIN_DIR=$TK_BIN_DIR
+TEA_LOAD_CONFIG([zlibtcl])
+
+
 TEA_CONFIG_SYSTEM
 case $system in
     Darwin*)