From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 30 Nov 1999 14:05:58 +0000 (+0000)
Subject: Updated for new location of YAZ headers.
X-Git-Tag: IRTCL.1.4~20
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=cdd0717baa6ed75b645c1c0bcabec5fa59335cf3;p=ir-tcl-moved-to-github.git

Updated for new location of YAZ headers.
---

diff --git a/Makefile.in b/Makefile.in
index fbdc30f..a9281c7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 # (c) Index Data 1995-1999
 # See the file LICENSE for details.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.51 1999-06-11 14:26:40 adam Exp $
+# $Id: Makefile.in,v 1.52 1999-11-30 14:05:58 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
@@ -14,14 +14,16 @@ prefix = @prefix@
 # Directory prefix with machine dependent files (executables, libraries)
 exec_prefix = @exec_prefix@
 
+# RPM Root
+BUILD=@build_root@
+
+# Install directories
 BINDIR=$(exec_prefix)/bin
 LIBDIR=$(exec_prefix)/lib
 MANDIR=$(prefix)/man
 INCDIR=$(prefix)/include
 IRTCLDIR=$(prefix)/lib/irtcl
 
-YAZDIR=@YAZDIR@
-
 CC=@CC@
 
 # Tcl libraries and include files
@@ -38,20 +40,18 @@ SHLIB_LD = @SHLIB_LD@
 SHLIB_SUFFIX = @SHLIB_SUFFIX@
 SHLIB_VERSION = @SHLIB_VERSION@
 
-# MOSI settings, directory with libmosi.a and source
-MOSI=@MOSI@
-MOSIDIR=@MOSIDIR@
-MOSILIB=@MOSILIB@
-MOSIINC=@MOSIINC@
-
-# All YAZ libraries - including MOSI libraries.
-YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB)
+# Where are Yaz libraries located?
+YAZLIB=@YAZLIB@
+# Where are Yaz header files located?
+YAZINC=@YAZINC@
+# If Yaz is compiled with mosi support uncomment and specify.
+#OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
 
 # All include paths
-INCLUDE=-I. -I$(YAZDIR)/include $(TKINC) $(TCLINC) $(MOSIINC)
+INCLUDE=-I. $(YAZINC) $(TKINC) $(TCLINC) 
 
 # All command line options except CFLAGS
-DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=$(MOSI) -DIRTCLDIR=\"$(IRTCLDIR)\" \
+DEFS=-DCCL2RPN=0 @DEFS@ -DIRTCLDIR=\"$(IRTCLDIR)\" \
 	$(INCLUDE) -DIR_TCL_VERSION=\"$(VERSION)\"
 
 INSTALL = @INSTALL@
@@ -92,76 +92,52 @@ wais-tcl.o: wais-tcl.c
 	$(CC) -c $(CFLAGS) -I$(WAISDIR)/ir $(DEFS) wais-tcl.c
 
 install.man:
-	@echo "Installation of man-pages"
-	@if [ ! -d $(MANDIR) ]; then \
-		echo Making $(MANDIR); \
-		mkdir $(MANDIR); \
-	fi
-	@if [ ! -d $(MANDIR)/mann ]; then \
-		echo Making $(MANDIR)/mann; \
-		mkdir $(MANDIR)/mann; \
-	fi
-	@cd doc; if [ -d $(MANDIR)/mann ]; then \
+	$(INSTALL) -d $(BUILD)$(MANDIR)/mann
+	@cd doc; if [ -d $(BUILD)$(MANDIR)/mann ]; then \
 		for p in *.n; do \
-			echo "Installing $$p"; \
-			$(INSTALL_DATA) $$p $(MANDIR)/mann; \
+			$(INSTALL_DATA) $$p $(BUILD)$(MANDIR)/mann; \
 		done; \
 	fi
 
 install: @ALL_SPEC@
-	@for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
-		if [ ! -d $$d ]; then \
-			echo Making $$d; \
-			mkdir $$d; \
-			chmod 755 $$d; \
-		fi; \
-	done;
+	$(INSTALL) -d $(BUILD)$(IRTCLDIR)/formats
+	$(INSTALL) -d $(BUILD)$(IRTCLDIR)/bitmaps
+	$(INSTALL) -d $(BUILD)$(BINDIR)
 	@if [ -f ir-tcl ]; then \
-		echo "Installing ir-tcl"; \
-		$(INSTALL_PROGRAM) ir-tcl $(BINDIR); \
+		$(INSTALL_PROGRAM) ir-tcl $(BUILD)$(BINDIR); \
 	fi
 	@if [ -f @SHLIB_IRTCL@ ]; then \
-		echo "Installing @SHLIB_IRTCL@"; \
-		$(INSTALL_PROGRAM) @SHLIB_IRTCL@ $(IRTCLDIR); \
+		$(INSTALL_PROGRAM) @SHLIB_IRTCL@ $(BUILD)$(IRTCLDIR); \
 	fi
-	@echo "Installing libirtcl.a"
-	@$(INSTALL_DATA) libirtcl.a $(LIBDIR)
-	@echo "Installing ir-tcl.h"
-	@$(INSTALL_DATA) ir-tcl.h $(INCDIR)
+	$(INSTALL_DATA) libirtcl.a $(BUILD)$(LIBDIR)
+	$(INSTALL_DATA) ir-tcl.h $(BUILD)$(INCDIR)
 	@if [ -f ir-tk ]; then \
-		echo "Installing ir-tk"; \
-		$(INSTALL_PROGRAM) ir-tk $(BINDIR); \
-	fi; \
-	echo "Installing irclient"; \
-	echo "#! $(BINDIR)/@IRCLIENT_SHELL@ -f" >head.bak; \
+		$(INSTALL_PROGRAM) ir-tk $(BUILD)$(BINDIR); \
+	fi
+	@echo "#! $(BINDIR)/@IRCLIENT_SHELL@ -f" >head.bak; \
 	cat head.bak client.tcl| sed "s,^set libdir LIBDIR,set libdir $(IRTCLDIR)," >client.bak; \
-	$(INSTALL_PROGRAM) client.bak $(BINDIR)/irclient; \
-	if [ -f $(IRTCLDIR)/irtdb.tcl ]; then \
+	$(INSTALL_PROGRAM) client.bak $(BUILD)$(BINDIR)/irclient; \
+	if [ -f $(BUILD)$(IRTCLDIR)/irtdb.tcl ]; then \
 		echo "irtdb.tcl already exists"; \
 		echo "Installing irtdb.tcl.n"; \
 		cp irtdb.tcl irtdb.tcl.n; \
-		$(INSTALL_DATA) irtdb.tcl.n $(IRTCLDIR); \
+		$(INSTALL_DATA) irtdb.tcl.n $(BUILD)$(IRTCLDIR); \
 		rm irtdb.tcl.n; \
 	else \
 		echo "Installing irtdb.tcl"; \
-		$(INSTALL_DATA) irtdb.tcl $(IRTCLDIR); \
-	fi; \
-	for f in *.tcl; do \
-		echo "Installing $$f"; \
-		$(INSTALL_DATA) $$f $(IRTCLDIR); \
-	done; \
-	echo "Installing LICENSE" ; \
-	$(INSTALL_DATA) LICENSE $(IRTCLDIR); \
-	echo "Installing display format scripts"; \
-	for b in formats/*.tcl; do \
+		$(INSTALL_DATA) irtdb.tcl $(BUILD)$(IRTCLDIR); \
+	fi
+	@for f in *.tcl; do \
+		$(INSTALL_DATA) $$f $(BUILD)$(IRTCLDIR); \
+	done
+	@for b in formats/*.tcl; do \
 		if [ -f $$b ]; then \
-			$(INSTALL_DATA) $$b $(IRTCLDIR)/formats; \
+			$(INSTALL_DATA) $$b $(BUILD)$(IRTCLDIR)/formats; \
 		fi; \
-	done; \
-	echo "Installing bitmaps"; \
-	for b in bitmaps/*; do \
+	done
+	@for b in bitmaps/*; do \
 		if [ -f $$b ]; then \
-			$(INSTALL_DATA) $$b $(IRTCLDIR)/bitmaps; \
+			$(INSTALL_DATA) $$b $(BUILD)$(IRTCLDIR)/bitmaps; \
 		fi; \
 	done
 
diff --git a/client.tcl b/client.tcl
index e0a2d1d..5346e93 100644
--- a/client.tcl
+++ b/client.tcl
@@ -4,7 +4,10 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.107  1999-02-11 11:30:08  adam
+# Revision 1.108  1999-11-30 14:05:58  adam
+# Updated for new location of YAZ headers.
+#
+# Revision 1.107  1999/02/11 11:30:08  adam
 # Updated for WIN32.
 #
 # Revision 1.106  1998/06/10 13:22:47  adam
@@ -4171,7 +4174,11 @@ if {[catch {ir-version}]} {
 
 .init.msg insert end "IrTcl version [lindex [ir-version] 0]\n"
 .init.msg insert end "YAZ version [lindex [ir-version] 1]\n"
-ir-log-init all irtcl.log
+if $debugMode {	
+	ir-log-init all {} irtcl.log
+} else {
+	ir-log-init none {} {}
+}
 
 # Create Z Assocation
 ir z39
diff --git a/configure b/configure
index a821898..c5689b4 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -12,9 +12,11 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --with-yazdir           Yaz directory"
+  --with-buildroot        RPM Build root"
 ac_help="$ac_help
-  --with-mosidir          MOSI directory"
+  --with-yazconfig        Path for yaz-config"
+ac_help="$ac_help
+  --with-tclconfig        Path for tclConfig.sh"
 ac_help="$ac_help
   --with-x                use the X Window System"
 
@@ -55,6 +57,7 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@ -338,7 +341,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -508,9 +511,11 @@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -540,7 +545,13 @@ CC=${CC-cc}
 
 
 
-
+# Check whether --with-build-root or --without-build-root was given.
+if test "${with_build_root+set}" = set; then
+  withval="$with_build_root"
+  build_root=$withval
+else
+  build_root=""
+fi
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -568,28 +579,30 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:576: checking for a BSD compatible install" >&5
+echo "configure:588: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
         if test -f $ac_dir/$ac_prog; then
 	  if test $ac_prog = install &&
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
 	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
@@ -619,14 +632,278 @@ echo "$ac_t""$INSTALL" 1>&6
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-if test "x$prefix" = xNONE; then
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:641: 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 656 "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:662: \"$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 673 "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:679: \"$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 690 "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:696: \"$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
+
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:721: checking for ANSI C header files" >&5
+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 726 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:734: \"$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*
+  ac_cv_header_stdc=yes
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 751 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 769 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "free" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+if test "$cross_compiling" = yes; then
+  :
+else
+  cat > conftest.$ac_ext <<EOF
+#line 790 "configure"
+#include "confdefs.h"
+#include <ctype.h>
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_stdc=no
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  cat >> confdefs.h <<\EOF
+#define STDC_HEADERS 1
+EOF
+
+fi
+
+if test "$ac_cv_header_stdc" = no; then
+	echo "configure: warning: Your system doesn't seem to support ANSI C" 1>&2
+fi
+yazconfig=NONE
+yazpath=NONE
+# Check whether --with-yazconfig or --without-yazconfig was given.
+if test "${with_yazconfig+set}" = set; then
+  withval="$with_yazconfig"
+  yazpath=$withval
+fi
+
+if test "x$yazpath" != "xNONE"; then
+        yazconfig=$yazpath/yaz-config
+else
+        for i in ../yaz* ../yaz; do
+                if test -d $i; then
+                        if test -r $i/include/yaz/yaz-version.h; then
+                                yazconfig=$i/yaz-config
+                        fi
+                fi
+        done
+        if test "x$yazconfig" = "xNONE"; then
+                # Extract the first word of "yaz-config", so it can be a program name with args.
+set dummy yaz-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:849: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_yazconfig'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$yazconfig" in
+  /*)
+  ac_cv_path_yazconfig="$yazconfig" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_yazconfig="$yazconfig" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_yazconfig="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_yazconfig" && ac_cv_path_yazconfig="NONE"
+  ;;
+esac
+fi
+yazconfig="$ac_cv_path_yazconfig"
+if test -n "$yazconfig"; then
+  echo "$ac_t""$yazconfig" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+        fi
+fi
+echo $ac_n "checking for YAZ""... $ac_c" 1>&6
+echo "configure:885: checking for YAZ" >&5
+if test -r $yazconfig; then
+        . $yazconfig
+        echo "$ac_t""$yazconfig" 1>&6
+else
+        echo "$ac_t""Not found" 1>&6
+fi
+tclconfig=NONE
+tryprefix=NONE
+# Check whether --with-tclconfig or --without-tclconfig was given.
+if test "${with_tclconfig+set}" = set; then
+  withval="$with_tclconfig"
+  tclconfig=$withval
+fi
+
+if test "x$tclconfig" = xNONE; then
+        saveprefix=${prefix}
+	if test "x$prefix" = xNONE; then
 echo $ac_n "checking for prefix by $ac_c" 1>&6
 # Extract the first word of "tclsh", so it can be a program name with args.
 set dummy tclsh; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:630: checking for $ac_word" >&5
+echo "configure:907: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -634,9 +911,13 @@ else
   /*)
   ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_TCLSH="$ac_dir/$ac_word"
@@ -659,13 +940,57 @@ fi
   fi
 fi
 
-if test "x$prefix" = xNONE; then
 	if test "x$prefix" = xNONE; then
+		if test "x$prefix" = xNONE; then
+echo $ac_n "checking for prefix by $ac_c" 1>&6
+# Extract the first word of "tclsh8.2", so it can be a program name with args.
+set dummy tclsh8.2; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:950: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_TCLSH8.2'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$TCLSH8.2" in
+  /*)
+  ac_cv_path_TCLSH8.2="$TCLSH8.2" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_TCLSH8.2="$TCLSH8.2" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_TCLSH8.2="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+TCLSH8.2="$ac_cv_path_TCLSH8.2"
+if test -n "$TCLSH8.2"; then
+  echo "$ac_t""$TCLSH8.2" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test -n "$ac_cv_path_TCLSH8.2"; then
+    prefix=`echo $ac_cv_path_TCLSH8.2|sed 's%/[^/][^/]*//*[^/][^/]*$%%'`
+  fi
+fi
+
+	fi
+	if test "x$prefix" = xNONE; then
+		if test "x$prefix" = xNONE; then
 echo $ac_n "checking for prefix by $ac_c" 1>&6
 # Extract the first word of "tclsh8.1", so it can be a program name with args.
 set dummy tclsh8.1; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:669: checking for $ac_word" >&5
+echo "configure:994: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TCLSH8.1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -673,9 +998,13 @@ else
   /*)
   ac_cv_path_TCLSH8.1="$TCLSH8.1" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_TCLSH8.1="$TCLSH8.1" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_TCLSH8.1="$ac_dir/$ac_word"
@@ -698,14 +1027,14 @@ fi
   fi
 fi
 
-fi
-if test "x$prefix" = xNONE; then
+	fi
 	if test "x$prefix" = xNONE; then
+		if test "x$prefix" = xNONE; then
 echo $ac_n "checking for prefix by $ac_c" 1>&6
 # Extract the first word of "tclsh8.0", so it can be a program name with args.
 set dummy tclsh8.0; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:709: checking for $ac_word" >&5
+echo "configure:1038: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TCLSH8.0'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -713,9 +1042,13 @@ else
   /*)
   ac_cv_path_TCLSH8.0="$TCLSH8.0" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_TCLSH8.0="$TCLSH8.0" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_TCLSH8.0="$ac_dir/$ac_word"
@@ -738,14 +1071,14 @@ fi
   fi
 fi
 
-fi
-if test "x$prefix" = xNONE; then
+	fi
 	if test "x$prefix" = xNONE; then
+		if test "x$prefix" = xNONE; then
 echo $ac_n "checking for prefix by $ac_c" 1>&6
 # Extract the first word of "tclsh7.6", so it can be a program name with args.
 set dummy tclsh7.6; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:749: checking for $ac_word" >&5
+echo "configure:1082: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TCLSH7.6'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -753,9 +1086,13 @@ else
   /*)
   ac_cv_path_TCLSH7.6="$TCLSH7.6" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_TCLSH7.6="$TCLSH7.6" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_TCLSH7.6="$ac_dir/$ac_word"
@@ -778,14 +1115,14 @@ fi
   fi
 fi
 
-fi
-if test "x$prefix" = xNONE; then
+	fi
 	if test "x$prefix" = xNONE; then
+		if test "x$prefix" = xNONE; then
 echo $ac_n "checking for prefix by $ac_c" 1>&6
 # Extract the first word of "tclsh7.5", so it can be a program name with args.
 set dummy tclsh7.5; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:789: checking for $ac_word" >&5
+echo "configure:1126: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TCLSH7.5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -793,9 +1130,13 @@ else
   /*)
   ac_cv_path_TCLSH7.5="$TCLSH7.5" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_TCLSH7.5="$TCLSH7.5" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_TCLSH7.5="$ac_dir/$ac_word"
@@ -818,234 +1159,18 @@ fi
   fi
 fi
 
+	fi
+	if test "x$prefix" = xNONE; then
+		prefix=/usr/local
+	fi
+        tclconfig=${prefix}/lib
+	tryprefix=${prefix}
+        prefix=${saveprefix}
 fi
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:824: 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 839 "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:845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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 856 "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:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:885: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 890 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 915 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 933 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 954 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-if test "$ac_cv_header_stdc" = no; then
-	echo "configure: warning: Your system doesn't seem to support ANSI C" 1>&2
-fi
-echo $ac_n "checking for YAZ directory""... $ac_c" 1>&6
-echo "configure:992: checking for YAZ directory" >&5
-# Check whether --with-yazdir or --without-yazdir was given.
-if test "${with_yazdir+set}" = set; then
-  withval="$with_yazdir"
-  YAZDIR=$withval
-fi
-
-if test "$YAZDIR" = "yes"; then
-	YAZDIR="../yaz-1.4"
-elif test "$YAZDIR" = ""; then
-	YAZDIR=../yaz
-        for i in ../yaz* ../yaz; do
-            if test -d $i; then
-                YAZDIR=$i
-            fi
-        done
-fi
-if test ! -d $YAZDIR; then
-	echo "configure: warning: YAZ directory ${YAZDIR} doesn't exist" 1>&2
-else
-	echo "$ac_t""$YAZDIR" 1>&6
-fi
-echo $ac_n "checking for MOSI""... $ac_c" 1>&6
-echo "configure:1015: checking for MOSI" >&5
-# Check whether --with-mosidir or --without-mosidir was given.
-if test "${with_mosidir+set}" = set; then
-  withval="$with_mosidir"
-  MOSIDIR=$withval
-fi
-
-if test "$MOSIDIR" = "yes"; then
-	MOSIDIR="../xtimosi/src"
-elif test "$MOSIDIR" = ""; then
-	MOSIDIR="../xtimosi/src"
-fi
-if test -r ${YAZDIR}/lib/librfc.a; then
-	MOSI=1
-	MOSIDIR=$MOSIDIR
-	MOSILIB='$(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
-	MOSIINC='-I$(MOSIDIR)'
-        MOSITELL=yes
-else
-	MOSI=0
-	MOSIDIR=$MOSIDIR
-        MOSILIB='# $(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
-	MOSIINC='# -I$(MOSIDIR)'
-        MOSITELL=no
-fi
-echo "$ac_t""$MOSITELL" 1>&6
-if test "x$prefix" = xNONE; then
-	tryprefix=/usr/local
-else
-	tryprefix=${prefix}
-fi
-if test -r ${tryprefix}/lib/tclConfig.sh; then
+if test -r ${tclconfig}/tclConfig.sh; then
 	echo $ac_n "checking for Tcl""... $ac_c" 1>&6
-echo "configure:1048: checking for Tcl" >&5
-	. ${tryprefix}/lib/tclConfig.sh
+echo "configure:1173: checking for Tcl" >&5
+	. ${tclconfig}/tclConfig.sh
 	TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
 	TCLINC=-I${TCL_PREFIX}/include
 	RANLIB=$TCL_RANLIB
@@ -1065,15 +1190,16 @@ else
 	# Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1069: checking for $ac_word" >&5
+echo "configure:1194: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_RANLIB="ranlib"
@@ -1091,234 +1217,8 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-	checkBoth=0
-	echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:1097: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1102 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_connect) || defined (__stub___connect)
-choke me
-#else
-connect();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_connect=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_connect=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  tk_checkSocket=0
-else
-  echo "$ac_t""no" 1>&6
-tk_checkSocket=1
-fi
-
-	if test "$tk_checkSocket" = 1; then
-		echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:1147: checking for main in -lsocket" >&5
-ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsocket  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1155 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lsocket"
-else
-  echo "$ac_t""no" 1>&6
-checkBoth=1
-fi
-
-	fi
-	if test "$checkBoth" = 1; then
-		tk_oldLibs=$LIBS
-		LIBS="$LIBS -lsocket -lnsl"
-		echo $ac_n "checking for accept""... $ac_c" 1>&6
-echo "configure:1188: checking for accept" >&5
-if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1193 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char accept(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char accept();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_accept) || defined (__stub___accept)
-choke me
-#else
-accept();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_accept=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_accept=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'accept`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-LIBS=$tk_oldLibs
-fi
-
-	fi
-	echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1238: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1243 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-choke me
-#else
-gethostbyname();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:1284: checking for main in -lnsl" >&5
-ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1292 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lnsl"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
 	echo $ac_n "checking for Tcl""... $ac_c" 1>&6
-echo "configure:1322: checking for Tcl" >&5
+echo "configure:1222: checking for Tcl" >&5
 	TCL_VERSION=nope
 	for i in "" 7.4 7.5 7.6 8.0; do
 		if test -r ${tryprefix}/lib/libtcl${i}.a; then
@@ -1341,17 +1241,17 @@ echo "configure:1322: checking for Tcl" >&5
 	TCLLIB="${TCL_LIB_SPEC} ${LIBS} -lm"
 	ALL_SPEC="ir-tcl ir-tk"
 fi
-if test -r ${tryprefix}/lib/tkConfig.sh; then
+if test -r ${tclconfig}/tkConfig.sh; then
 	echo $ac_n "checking for Tk""... $ac_c" 1>&6
-echo "configure:1347: checking for Tk" >&5
-	. ${tryprefix}/lib/tkConfig.sh
+echo "configure:1247: checking for Tk" >&5
+	. ${tclconfig}/tkConfig.sh
 	echo "$ac_t""$TK_VERSION" 1>&6
 	TKINC=${TK_XINCLUDES}
 	TKLIB="${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS}"
 	IRCLIENT_SHELL=wish${TK_VERSION}
 else
 	echo $ac_n "checking for Tk""... $ac_c" 1>&6
-echo "configure:1355: checking for Tk" >&5
+echo "configure:1255: checking for Tk" >&5
 	TK_VERSION=nope
 	for i in "" 4.0 4.1 4.2 8.0; do
 		if test -r ${tryprefix}/lib/libtk${i}.a; then
@@ -1374,7 +1274,7 @@ echo "configure:1355: checking for Tk" >&5
 # 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:1378: checking for X" >&5
+echo "configure:1278: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1436,13 +1336,13 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1440 "configure"
+#line 1340 "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:1445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1345: \"$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.
@@ -1510,14 +1410,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1514 "configure"
+#line 1414 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:1521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1421: \"$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.
@@ -1607,13 +1507,13 @@ fi
 	if test "$no_x" = ""; then
 		if test "$x_includes" = ""; then
 			cat > conftest.$ac_ext <<EOF
-#line 1611 "configure"
+#line 1511 "configure"
 #include "confdefs.h"
 #include <X11/XIntrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1516: \"$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
@@ -1634,13 +1534,13 @@ rm -f conftest*
 		echo checking for X11 header files
 		XINCLUDES="# no special path needed"
 		cat > conftest.$ac_ext <<EOF
-#line 1638 "configure"
+#line 1538 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1543: \"$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
@@ -1688,7 +1588,7 @@ rm -f conftest*
 	fi
 	if test "$XLIBSW" = nope ; then
 		echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6
-echo "configure:1692: checking for XCreateWindow in -lXwindow" >&5
+echo "configure:1592: checking for XCreateWindow in -lXwindow" >&5
 ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1696,7 +1596,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXwindow  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1700 "configure"
+#line 1600 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1707,7 +1607,7 @@ int main() {
 XCreateWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1759,7 +1659,7 @@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@ -1838,7 +1738,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -1858,9 +1758,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
@@ -1884,11 +1786,6 @@ s%@TCLLIB@%$TCLLIB%g
 s%@TKLIB@%$TKLIB%g
 s%@TCLINC@%$TCLINC%g
 s%@TKINC@%$TKINC%g
-s%@YAZDIR@%$YAZDIR%g
-s%@MOSI@%$MOSI%g
-s%@MOSIDIR@%$MOSIDIR%g
-s%@MOSILIB@%$MOSILIB%g
-s%@MOSIINC@%$MOSIINC%g
 s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g
 s%@SHLIB_LD@%$SHLIB_LD%g
 s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
@@ -1896,14 +1793,20 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g
 s%@SHLIB_IRTCL@%$SHLIB_IRTCL%g
 s%@ALL_SPEC@%$ALL_SPEC%g
 s%@IRCLIENT_SHELL@%$IRCLIENT_SHELL%g
+s%@YAZLIB@%$YAZLIB%g
+s%@YAZINC@%$YAZINC%g
+s%@build_root@%$build_root%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@CPP@%$CPP%g
+s%@yazconfig@%$yazconfig%g
 s%@TCLSH@%$TCLSH%g
+s%@TCLSH8.2@%$TCLSH8.2%g
 s%@TCLSH8.1@%$TCLSH8.1%g
 s%@TCLSH8.0@%$TCLSH8.0%g
 s%@TCLSH7.6@%$TCLSH7.6%g
 s%@TCLSH7.5@%$TCLSH7.5%g
-s%@CPP@%$CPP%g
 s%@RANLIB@%$RANLIB%g
 
 CEOF
diff --git a/configure.in b/configure.in
index 827f0a8..9bf50f7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl IR toolkit for tcl/tk
-dnl (c) Index Data 1996-1998
+dnl (c) Index Data 1996-1999
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.24 1998-03-11 11:14:04 adam Exp $
+dnl $Id: configure.in,v 1.25 1999-11-30 14:05:58 adam Exp $
 AC_INIT(ir-tcl.h)
 CC=${CC-cc}
 dnl ------ Substitutions
@@ -10,11 +10,6 @@ AC_SUBST(TCLLIB)
 AC_SUBST(TKLIB)
 AC_SUBST(TCLINC)
 AC_SUBST(TKINC)
-AC_SUBST(YAZDIR)
-AC_SUBST(MOSI)
-AC_SUBST(MOSIDIR)
-AC_SUBST(MOSILIB)
-AC_SUBST(MOSIINC)
 AC_SUBST(SHLIB_CFLAGS)
 AC_SUBST(SHLIB_LD)
 AC_SUBST(SHLIB_SUFFIX)
@@ -22,78 +17,81 @@ AC_SUBST(SHLIB_VERSION)
 AC_SUBST(SHLIB_IRTCL)
 AC_SUBST(ALL_SPEC)
 AC_SUBST(IRCLIENT_SHELL)
+AC_SUBST(YAZLIB)
+AC_SUBST(YAZINC)
+dnl
+dnl ------ Build root
+AC_SUBST(build_root)
+AC_ARG_WITH(build-root, [  --with-buildroot        RPM Build root],[build_root=$withval],[build_root=""])
 dnl
 dnl ------ Preliminary settings
 AC_PROG_INSTALL
-AC_PREFIX_PROGRAM(tclsh)
-if test "x$prefix" = xNONE; then
-	AC_PREFIX_PROGRAM(tclsh8.1)
-fi
-if test "x$prefix" = xNONE; then
-	AC_PREFIX_PROGRAM(tclsh8.0)
-fi
-if test "x$prefix" = xNONE; then
-	AC_PREFIX_PROGRAM(tclsh7.6)
-fi
-if test "x$prefix" = xNONE; then
-	AC_PREFIX_PROGRAM(tclsh7.5)
-fi
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = no; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
 fi
 dnl
-dnl ------ look for YAZ/XTImOSI
-dnl
-AC_MSG_CHECKING(for YAZ directory)
-AC_ARG_WITH(yazdir,[  --with-yazdir           Yaz directory], [YAZDIR=$withval])
-if test "$YAZDIR" = "yes"; then
-	YAZDIR="../yaz-1.4"
-elif test "$YAZDIR" = ""; then
-	YAZDIR=../yaz
+dnl ------ Look for Yaz
+dnl See if user specified location of yaz-config; otherwise
+dnl use ../yaz if is a directory (internal development); otherwise
+dnl use yaz-config found in PATH.
+yazconfig=NONE
+yazpath=NONE
+AC_ARG_WITH(yazconfig, [  --with-yazconfig        Path for yaz-config], [yazpath=$withval])
+if test "x$yazpath" != "xNONE"; then
+        yazconfig=$yazpath/yaz-config
+else
         for i in ../yaz* ../yaz; do
-            if test -d $i; then
-                YAZDIR=$i
-            fi
+                if test -d $i; then
+                        if test -r $i/include/yaz/yaz-version.h; then
+                                yazconfig=$i/yaz-config
+                        fi
+                fi
         done
+        if test "x$yazconfig" = "xNONE"; then
+                AC_PATH_PROG(yazconfig, yaz-config, NONE)
+        fi
 fi
-if test ! -d $YAZDIR; then
-	AC_MSG_WARN(YAZ directory ${YAZDIR} doesn't exist)
-else
-	AC_MSG_RESULT($YAZDIR)
-fi
-AC_MSG_CHECKING(for MOSI)
-AC_ARG_WITH(mosidir, [  --with-mosidir          MOSI directory], [MOSIDIR=$withval])
-if test "$MOSIDIR" = "yes"; then
-	MOSIDIR="../xtimosi/src"
-elif test "$MOSIDIR" = ""; then
-	MOSIDIR="../xtimosi/src"
-fi
-if test -r ${YAZDIR}/lib/librfc.a; then
-	MOSI=1
-	MOSIDIR=$MOSIDIR
-	MOSILIB='$(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
-	MOSIINC='-I$(MOSIDIR)'
-        MOSITELL=yes
+AC_MSG_CHECKING(for YAZ)
+if test -r $yazconfig; then
+        . $yazconfig
+        AC_MSG_RESULT($yazconfig)
 else
-	MOSI=0
-	MOSIDIR=$MOSIDIR
-        MOSILIB='# $(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
-	MOSIINC='# -I$(MOSIDIR)'
-        MOSITELL=no
+        AC_MSG_RESULT(Not found)
 fi
-AC_MSG_RESULT($MOSITELL)
 dnl
 dnl ------ look for Tcl
-dnl
-if test "x$prefix" = xNONE; then
-	tryprefix=/usr/local
-else
+tclconfig=NONE
+tryprefix=NONE
+AC_ARG_WITH(tclconfig, [  --with-tclconfig        Path for tclConfig.sh], [tclconfig=$withval])
+if test "x$tclconfig" = xNONE; then
+        saveprefix=${prefix}
+	AC_PREFIX_PROGRAM(tclsh)
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh8.2)
+	fi
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh8.1)
+	fi
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh8.0)
+	fi
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh7.6)
+	fi
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh7.5)
+	fi
+	if test "x$prefix" = xNONE; then
+		prefix=/usr/local
+	fi
+        tclconfig=${prefix}/lib
 	tryprefix=${prefix}
+        prefix=${saveprefix}
 fi
-if test -r ${tryprefix}/lib/tclConfig.sh; then
+if test -r ${tclconfig}/tclConfig.sh; then
 	AC_MSG_CHECKING(for Tcl)
-	. ${tryprefix}/lib/tclConfig.sh
+	. ${tclconfig}/tclConfig.sh
 	TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
 	TCLINC=-I${TCL_PREFIX}/include
 	RANLIB=$TCL_RANLIB
@@ -111,17 +109,6 @@ else
 	SHLIB_VERSION=""
 	SHLIB_IRTCL="irtcl-shared"
 	AC_PROG_RANLIB
-	checkBoth=0
-	AC_CHECK_FUNC(connect, tk_checkSocket=0, tk_checkSocket=1)
-	if test "$tk_checkSocket" = 1; then
-		AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", checkBoth=1)
-	fi
-	if test "$checkBoth" = 1; then
-		tk_oldLibs=$LIBS
-		LIBS="$LIBS -lsocket -lnsl"
-		AC_CHECK_FUNC(accept, , [LIBS=$tk_oldLibs])
-	fi
-	AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 	AC_MSG_CHECKING(for Tcl)
 	TCL_VERSION=nope
 	for i in "" 7.4 7.5 7.6 8.0; do
@@ -148,9 +135,9 @@ fi
 dnl 
 dnl ------ look for Tk
 dnl
-if test -r ${tryprefix}/lib/tkConfig.sh; then
+if test -r ${tclconfig}/tkConfig.sh; then
 	AC_MSG_CHECKING(for Tk)
-	. ${tryprefix}/lib/tkConfig.sh
+	. ${tclconfig}/tkConfig.sh
 	AC_MSG_RESULT($TK_VERSION)
 	TKINC=${TK_XINCLUDES}
 	TKLIB="${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS}"
diff --git a/explain.tcl b/explain.tcl
index c9e1fc6..b827274 100644
--- a/explain.tcl
+++ b/explain.tcl
@@ -6,7 +6,10 @@
 # Explain Driver
 #
 # $Log: explain.tcl,v $
-# Revision 1.5  1998-05-20 12:27:43  adam
+# Revision 1.6  1999-11-30 14:05:58  adam
+# Updated for new location of YAZ headers.
+#
+# Revision 1.5  1998/05/20 12:27:43  adam
 # Better Explain support.
 #
 # Revision 1.4  1998/04/02 14:32:00  adam
@@ -159,26 +162,22 @@ proc prettyDumpR {x ind} {
 proc explain-check-ok {target zz category finish} {
     global profile settingsChanged
 
-    puts ""
-    puts ""
-    puts ""
-    puts ""
     set crec [z39.categoryList getExplain 1 categoryList]
-    puts "--- categoryList"
-    puts $crec
+    dputs "--- categoryList"
+    dputs $crec
 
     set rec [z39.targetInfo getExplain 1]
 
     set trec [z39.targetInfo getExplain 1 targetInfo]
-    puts "--- targetInfo"
-    puts $rec
+    dputs "--- targetInfo"
+    dputs $rec
 
     set no 1
     while {1} {
         if {[catch {set rec \
                 [z39.databaseInfo getExplain $no databaseInfo]}]} break
-        puts "--- databaseInfo $no"
-	puts $rec
+        dputs "--- databaseInfo $no"
+	dputs $rec
 
         lappend dbRecs $rec
         set db [lindex [lindex $rec 1] 1]
@@ -196,8 +195,8 @@ proc explain-check-ok {target zz category finish} {
     while {1} {
         if {[catch {set rec \
                 [z39.attributeDetails getExplain $no attributeDetails]}]} break
-        puts "--- attributeDetails $no"
-	puts $rec
+        dputs "--- attributeDetails $no"
+	dputs $rec
         incr no
     }
     set data [lindex [lindex [lindex [lindex [lindex $trec 12] 1] 1] 1] 1]
diff --git a/ir-tclp.h b/ir-tclp.h
index caa038d..5acc432 100644
--- a/ir-tclp.h
+++ b/ir-tclp.h
@@ -1,11 +1,14 @@
 /*
  * IR toolkit for tcl/tk
- * (c) Index Data 1995-1998
+ * (c) Index Data 1995-1999
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tclp.h,v $
- * Revision 1.38  1999-03-22 06:51:34  adam
+ * Revision 1.39  1999-11-30 14:05:58  adam
+ * Updated for new location of YAZ headers.
+ *
+ * Revision 1.38  1999/03/22 06:51:34  adam
  * Implemented sort.
  *
  * Revision 1.37  1998/04/02 14:31:08  adam
@@ -152,25 +155,25 @@
 
 #include <tcl.h>
 
-#include <log.h>
-#include <pquery.h>
+#include <yaz/log.h>
+#include <yaz/pquery.h>
 #if CCL2RPN
-#include <yaz-ccl.h>
+#include <yaz/yaz-ccl.h>
 #endif
 
-#include <comstack.h>
-#include <tcpip.h>
+#include <yaz/comstack.h>
+#include <yaz/tcpip.h>
 
 #if MOSI
-#include <xmosi.h>
+#include <yas/xmosi.h>
 #endif
 
-#include <yaz-version.h>
-#include <odr.h>
-#include <proto.h>
-#include <oid.h>
-#include <diagbib1.h>
-#include <xmalloc.h>
+#include <yaz/yaz-version.h>
+#include <yaz/odr.h>
+#include <yaz/proto.h>
+#include <yaz/oid.h>
+#include <yaz/diagbib1.h>
+#include <yaz/xmalloc.h>
 
 #include "ir-tcl.h"
 
diff --git a/irtdb.tcl b/irtdb.tcl
index 0b049a9..7f218e5 100644
--- a/irtdb.tcl
+++ b/irtdb.tcl
@@ -50,9 +50,9 @@ set {profile(Bell Laboratories Library Network,smallSetUpperBound)} 0
 set {profile(Bell Laboratories Library Network,targetInfoName)} {Lucent Technologies Research Server}
 set {profile(Bell Laboratories Library Network,timeDefine)} 878567355
 set {profile(Bell Laboratories Library Network,timeLastExplain)} 891519770
-set {profile(Bell Laboratories Library Network,timeLastInit)} 891519770
+set {profile(Bell Laboratories Library Network,timeLastInit)} 943890883
 set {profile(Bell Laboratories Library Network,welcomeMessage)} {Salutations - this is Lucent Technologies experimental Z39.50 server. No guarentees, but free and unlimited access!}
-set {profile(Bell Laboratories Library Network,windowNumber)} 16
+set {profile(Bell Laboratories Library Network,windowNumber)} 17
 set {profile(Bibliothèque Nationale du Québec,authentication)} {}
 set {profile(Bibliothèque Nationale du Québec,comstack)} tcpip
 set {profile(Bibliothèque Nationale du Québec,databases)} IRIS
@@ -79,7 +79,7 @@ set {profile(Biblioth
 set {profile(Bibliothèque Nationale du Québec,timeLastExplain)} {}
 set {profile(Bibliothèque Nationale du Québec,timeLastInit)} 887288466
 set {profile(Bibliothèque Nationale du Québec,welcomeMessage)} {}
-set {profile(Bibliothèque Nationale du Québec,windowNumber)} 17
+set {profile(Bibliothèque Nationale du Québec,windowNumber)} 8
 set {profile(British Library,authentication)} {}
 set {profile(British Library,comstack)} tcpip
 set {profile(British Library,databases)} {EXPLAIN MAR SRI}
@@ -194,7 +194,7 @@ set profile(LOC,timeDefine) 878567355
 set profile(LOC,timeLastExplain) {}
 set profile(LOC,timeLastInit) 918732361
 set profile(LOC,welcomeMessage) {}
-set profile(LOC,windowNumber) 11
+set profile(LOC,windowNumber) 12
 set {profile(OCLC FirstSearch,authentication)} {}
 set {profile(OCLC FirstSearch,comstack)} tcpip
 set {profile(OCLC FirstSearch,databases)} {AGRICOLA MEDLINE}
@@ -225,7 +225,7 @@ set {profile(OCLC FirstSearch,timeDefine)} {}
 set {profile(OCLC FirstSearch,timeLastExplain)} {}
 set {profile(OCLC FirstSearch,timeLastInit)} 886167890
 set {profile(OCLC FirstSearch,welcomeMessage)} {}
-set {profile(OCLC FirstSearch,windowNumber)} 15
+set {profile(OCLC FirstSearch,windowNumber)} 16
 set profile(Penn,authentication) {}
 set profile(Penn,comstack) tcpip
 set profile(Penn,databases) CATALOG
@@ -285,7 +285,7 @@ set profile(Stein,timeDefine) {}
 set profile(Stein,timeLastExplain) 893857722
 set profile(Stein,timeLastInit) 897482265
 set profile(Stein,welcomeMessage) {Welcome to the Z39.50 target of Steiermaerkische Landesbibliothek, Graz, Austria.}
-set profile(Stein,windowNumber) 12
+set profile(Stein,windowNumber) 13
 set profile(arcatarget,authentication) {}
 set profile(arcatarget,comstack) tcpip
 set profile(arcatarget,databases) {IEI-books IR-Explain-1}
@@ -316,7 +316,7 @@ set profile(arcatarget,timeDefine) 878567355
 set profile(arcatarget,timeLastExplain) 887289477
 set profile(arcatarget,timeLastInit) 887289477
 set profile(arcatarget,welcomeMessage) {buon lavoro}
-set profile(arcatarget,windowNumber) 8
+set profile(arcatarget,windowNumber) 9
 set profile(author,authentication) {}
 set profile(author,comstack) tcpip
 set profile(author,databases) {spain portugal france england belgium}
@@ -369,8 +369,8 @@ set profile(bagel.indexdata.dk,recentNews) {}
 set profile(bagel.indexdata.dk,smallSetUpperBound) 0
 set profile(bagel.indexdata.dk,targetInfoName) Zebra
 set profile(bagel.indexdata.dk,timeDefine) {}
-set profile(bagel.indexdata.dk,timeLastExplain) 936957709
-set profile(bagel.indexdata.dk,timeLastInit) 936957709
+set profile(bagel.indexdata.dk,timeLastExplain) 943890802
+set profile(bagel.indexdata.dk,timeLastInit) 943890791
 set profile(bagel.indexdata.dk,welcomeMessage) {}
 set profile(bagel.indexdata.dk,windowNumber) 4
 set profile(bagel9999,authentication) {}
@@ -400,7 +400,7 @@ set profile(bagel9999,timeDefine) {}
 set profile(bagel9999,timeLastExplain) {}
 set profile(bagel9999,timeLastInit) 891524781
 set profile(bagel9999,welcomeMessage) {}
-set profile(bagel9999,windowNumber) 9
+set profile(bagel9999,windowNumber) 10
 set profile(dranet,authentication) {}
 set profile(dranet,comstack) tcpip
 set profile(dranet,databases) drewdb
@@ -485,7 +485,7 @@ set profile(madison,timeDefine) 878567355
 set profile(madison,timeLastExplain) {}
 set profile(madison,timeLastInit) 887289602
 set profile(madison,welcomeMessage) {}
-set profile(madison,windowNumber) 10
+set profile(madison,windowNumber) 11
 set profile(pica,authentication) {}
 set profile(pica,comstack) tcpip
 set profile(pica,databases) {IR-Explain-1 NCC-IBL OLC}
@@ -541,7 +541,7 @@ set profile(zno,timeDefine) {}
 set profile(zno,timeLastExplain) {}
 set profile(zno,timeLastInit) 891593773
 set profile(zno,welcomeMessage) {}
-set profile(zno,windowNumber) 13
+set profile(zno,windowNumber) 14
 set profile(ztest9999,authentication) {}
 set profile(ztest9999,comstack) tcpip
 set profile(ztest9999,databases) {Default IR-Explain-1}
@@ -570,7 +570,7 @@ set profile(ztest9999,timeDefine) 878567355
 set profile(ztest9999,timeLastExplain) 897392133
 set profile(ztest9999,timeLastInit) 897392253
 set profile(ztest9999,welcomeMessage) {}
-set profile(ztest9999,windowNumber) 14
+set profile(ztest9999,windowNumber) 15
 set queryTypes {Simple phrase}
 set queryButtons {{{I 3} {I 0} {I 0}} {{I 0} {I 1} {I 0}}}
 set queryInfo {{{Title {1=4}} {Author {1=1}} {Subject {1=21}} {Any {1=1016}} {Query 1=1016 2=102} {Title-rank 1=4 2=102} {Date/time 1=1012} {Title-regular 1=4 2=3 4=2 5=102} {Ranked 1=1016 2=102 3=3 4=1 6=1}} {{Title 1=4 4=1 6=2} {Author 1=1003 4=1 6=2} {ISBN 1=7} {ISSN 1=8} {Year 1=30 4=4 6=2} {Any {}}}}
diff --git a/select.c b/select.c
index a661ae4..d9baf65 100644
--- a/select.c
+++ b/select.c
@@ -1,11 +1,14 @@
 /*
  * IR toolkit for tcl/tk
- * (c) Index Data 1996
+ * (c) Index Data 1996-1999
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: select.c,v $
- * Revision 1.6  1999-02-11 11:30:13  adam
+ * Revision 1.7  1999-11-30 14:05:58  adam
+ * Updated for new location of YAZ headers.
+ *
+ * Revision 1.6  1999/02/11 11:30:13  adam
  * Updated for WIN32.
  *
  * Revision 1.5  1997/09/09 10:19:55  adam
@@ -28,7 +31,7 @@
  */
 
 #include <tcl.h>
-#include <log.h>
+#include <yaz/log.h>
 #include "ir-tcl.h"
 
 #if TCL_MAJOR_VERSION == 8