From 51755f9b44a6ab87089c169cb7c64b240833a909 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 23 May 2006 09:13:50 +0000 Subject: [PATCH] Added check for tclsh programs --- configure.ac | 3 ++- src/Makefile.am | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index f8aa159..4692d44 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl YAZ Toolkit, Index Data 1994-2006 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.13 2006-05-08 12:20:48 adam Exp $ +dnl $Id: configure.ac,v 1.14 2006-05-23 09:13:50 adam Exp $ AC_PREREQ(2.59) AC_INIT([yaz],[2.1.19],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) @@ -14,6 +14,7 @@ AC_PROG_CC AC_PROG_CPP AC_CHECK_PROGS(YACC, 'bison -y') test -z "$YACC" && AC_MSG_WARN([GNU bison not found]) +AC_CHECK_PROGS(TCLSH, tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2, tclsh) AC_PROG_INSTALL AM_DISABLE_SHARED AM_PROG_LIBTOOL diff --git a/src/Makefile.am b/src/Makefile.am index bf98d9c..fd86131 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ ## This file is part of the YAZ toolkit. ## Copyright (C) 1994-2006, Index Data, All rights reserved. -## $Id: Makefile.am,v 1.36 2006-05-07 17:45:41 adam Exp $ +## $Id: Makefile.am,v 1.37 2006-05-23 09:13:50 adam Exp $ YAZ_VERSION_INFO=2:1:0 @@ -22,7 +22,7 @@ EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \ csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv YAZCOMP = ../util/yaz-asncomp -YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS) +YAZCOMPLINE = $(TCLSH) $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS) AM_CFLAGS=$(THREAD_CFLAGS) AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) @@ -31,18 +31,18 @@ AM_YFLAGS=-p cql_ # MARC8->UTF8 conversion is generated from codetables.xml $(srcdir)/marc8.c: charconv.tcl codetables.xml - cd $(srcdir); ./charconv.tcl -p marc8 codetables.xml -o marc8.c + cd $(srcdir); $(TCLSH) ./charconv.tcl -p marc8 codetables.xml -o marc8.c # UTF-8->MARC8 conversion is generated from codetables.xml $(srcdir)/marc8r.c: charconv.tcl codetables.xml - cd $(srcdir); ./charconv.tcl -r -p marc8r codetables.xml -o marc8r.c + cd $(srcdir); $(TCLSH) ./charconv.tcl -r -p marc8r codetables.xml -o marc8r.c # Generate diagnostics from CSVs $(top_srcdir)/include/yaz/diagbib1.h $(srcdir)/diagbib1.c: csvtobib1.tcl bib1.csv - cd $(srcdir); ./csvtobib1.tcl + cd $(srcdir); $(TCLSH) ./csvtobib1.tcl $(top_srcdir)/include/yaz/diagsrw.h $(srcdir)/diagsrw.c: csvtosrw.tcl srw.csv - cd $(srcdir); ./csvtosrw.tcl + cd $(srcdir); $(TCLSH) ./csvtosrw.tcl libyaz_la_SOURCES=version.c options.c log.c marcdisp.c oid.c wrbuf.c \ nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c \ -- 1.7.10.4