From b9ba556f29428d79db2a874b1a33504290125216 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 2 May 2000 11:26:13 +0000 Subject: [PATCH] Fixed tcl configure switch. --- Makefile.in | 1 - bfile/Makefile.in | 1 - configure | 102 ++++++++++++++++++++++++----------------------- configure.in | 7 ++-- dfa/Makefile.in | 1 - dict/Makefile.in | 1 - doc/Makefile.in | 3 +- include/Makefile.in | 1 - index/Makefile.am | 6 +-- index/Makefile.in | 5 +-- isam/Makefile.in | 1 - isamc/Makefile.in | 1 - isams/Makefile.in | 1 - recctrl/Makefile.am | 4 +- recctrl/Makefile.in | 3 +- rset/Makefile.in | 1 - tab/Makefile.in | 5 +-- test/Makefile.in | 1 - test/gils/Makefile.in | 1 - test/usmarc/Makefile.in | 1 - util/Makefile.in | 1 - 21 files changed, 67 insertions(+), 81 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0cd4ffe..cd764e5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/bfile/Makefile.in b/bfile/Makefile.in index 4988a9d..d0a5253 100644 --- a/bfile/Makefile.in +++ b/bfile/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/configure b/configure index 20e442f..4bbbfb7 100755 --- a/configure +++ b/configure @@ -918,11 +918,10 @@ fi - # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:926: checking for $ac_word" >&5 +echo "configure:925: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -952,7 +951,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:956: checking for $ac_word" >&5 +echo "configure:955: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1003,7 +1002,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1007: checking for $ac_word" >&5 +echo "configure:1006: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1035,7 +1034,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1039: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1038: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1046,12 +1045,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1050 "configure" +#line 1049 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1077,12 +1076,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1081: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1080: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1086: checking whether we are using GNU C" >&5 +echo "configure:1085: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1091,7 +1090,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1110,7 +1109,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1114: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1113: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1142,7 +1141,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1146: checking how to run the C preprocessor" >&5 +echo "configure:1145: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1157,13 +1156,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1166: \"$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 : @@ -1174,13 +1173,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1183: \"$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 : @@ -1191,13 +1190,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1200: \"$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 : @@ -1233,7 +1232,7 @@ echo "$ac_t""$CPP" 1>&6 # 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:1237: checking for a BSD compatible install" >&5 +echo "configure:1236: 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 @@ -1288,7 +1287,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 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:1292: checking for $ac_word" >&5 +echo "configure:1291: 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 @@ -1337,7 +1336,7 @@ else # 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:1341: checking for $ac_word" >&5 +echo "configure:1340: 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 @@ -1373,7 +1372,7 @@ fi fi fi echo $ac_n "checking for YAZ""... $ac_c" 1>&6 -echo "configure:1377: checking for YAZ" >&5 +echo "configure:1376: checking for YAZ" >&5 if test -r $yazconfig; then . $yazconfig echo "$ac_t""$yazconfig" 1>&6 @@ -1390,7 +1389,7 @@ fi if test "$enable_threads" = "yes"; then echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:1394: checking for main in -lpthread" >&5 +echo "configure:1393: checking for main in -lpthread" >&5 ac_lib_var=`echo pthread'_'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 @@ -1398,14 +1397,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1408: \"$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 @@ -1433,9 +1432,9 @@ else fi echo $ac_n "checking for working POSIX Threads""... $ac_c" 1>&6 -echo "configure:1437: checking for working POSIX Threads" >&5 +echo "configure:1436: checking for working POSIX Threads" >&5 cat > conftest.$ac_ext < int func(void *p) { return 0; } @@ -1446,7 +1445,7 @@ int main() { int r = pthread_create (&pthread_id, 0, func, 0); ; return 0; } EOF -if { (eval echo configure:1450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* thread_ok=yes else @@ -1486,7 +1485,7 @@ 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:1490: checking for $ac_word" >&5 +echo "configure:1489: 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 @@ -1527,7 +1526,7 @@ fi prefix=${saveprefix} fi echo $ac_n "checking for Tcl""... $ac_c" 1>&6 -echo "configure:1531: checking for Tcl" >&5 +echo "configure:1530: checking for Tcl" >&5 if test -r ${tclconfig}/tclConfig.sh; then . ${tclconfig}/tclConfig.sh if test -r ${tclconfig}/../generic/tcl.h; then @@ -1542,26 +1541,32 @@ if test -r ${tclconfig}/tclConfig.sh; then SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX SHLIB_VERSION=$TCL_SHLIB_VERSION echo "$ac_t""$TCL_VERSION" 1>&6 - ODEFS="-DHAVE_TCL_H=1" + cat >> confdefs.h <<\EOF +#define HAVE_TCL_H 1 +EOF + else echo "$ac_t""Not found" 1>&6 - ODEFS="-DHAVE_TCL_H=0" + cat >> confdefs.h <<\EOF +#define HAVE_TCL_H 0 +EOF + fi for ac_hdr in sys/times.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1555: checking for $ac_hdr" >&5 +echo "configure:1560: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1570: \"$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* @@ -1588,7 +1593,7 @@ fi done echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 -echo "configure:1592: checking for bzCompressInit in -lbz2" >&5 +echo "configure:1597: checking for bzCompressInit in -lbz2" >&5 ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1596,7 +1601,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbz2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1616: \"$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 @@ -1639,17 +1644,17 @@ if test "$ac_cv_lib_bz2_bzCompressInit" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1643: checking for $ac_hdr" >&5 +echo "configure:1648: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1658: \"$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* @@ -1677,12 +1682,12 @@ done fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1681: checking for ANSI C header files" >&5 +echo "configure:1686: 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 < #include @@ -1690,7 +1695,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1699: \"$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* @@ -1707,7 +1712,7 @@ 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 @@ -1725,7 +1730,7 @@ 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 @@ -1746,7 +1751,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1757,7 +1762,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1958,7 +1963,6 @@ s%@SET_MAKE@%$SET_MAKE%g s%@ISZMBOL_TRUE@%$ISZMBOL_TRUE%g s%@ISZMBOL_FALSE@%$ISZMBOL_FALSE%g s%@SUBLIBS@%$SUBLIBS%g -s%@ODEFS@%$ODEFS%g s%@TCL_INCLUDE@%$TCL_INCLUDE%g s%@TCL_LIB@%$TCL_LIB%g s%@YAZLIB@%$YAZLIB%g diff --git a/configure.in b/configure.in index 9fa2e88..8405b9e 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Zebra, Index Data Aps, 1994-2000 -dnl $Id: configure.in,v 1.19 2000-04-05 09:55:44 adam Exp $ +dnl $Id: configure.in,v 1.20 2000-05-02 11:26:13 adam Exp $ dnl AC_INIT(include/zebraver.h) AC_MSG_CHECKING(for package) @@ -38,7 +38,6 @@ fi AM_CONDITIONAL(ISZMBOL,test $PACKAGE = zmbol) dnl ------ Substitutions AC_SUBST(SUBLIBS) -AC_SUBST(ODEFS) AC_SUBST(DEFS) AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) @@ -130,10 +129,10 @@ if test -r ${tclconfig}/tclConfig.sh; then SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX SHLIB_VERSION=$TCL_SHLIB_VERSION AC_MSG_RESULT($TCL_VERSION) - ODEFS="-DHAVE_TCL_H=1" + AC_DEFINE(HAVE_TCL_H,1) else AC_MSG_RESULT(Not found) - ODEFS="-DHAVE_TCL_H=0" + AC_DEFINE(HAVE_TCL_H,0) fi dnl dnl ------ times diff --git a/dfa/Makefile.in b/dfa/Makefile.in index a8cf1b3..bb3015a 100644 --- a/dfa/Makefile.in +++ b/dfa/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/dict/Makefile.in b/dict/Makefile.in index e995b4b..67116c2 100644 --- a/dict/Makefile.in +++ b/dict/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/doc/Makefile.in b/doc/Makefile.in index 82b95d0..ee537e2 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -10,7 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# $Id: Makefile.in,v 1.2 2000-04-06 09:03:28 adam Exp $ +# $Id: Makefile.in,v 1.3 2000-05-02 11:26:13 adam Exp $ SHELL = @SHELL@ @@ -63,7 +63,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/include/Makefile.in b/include/Makefile.in index cfd3940..d64b081 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/index/Makefile.am b/index/Makefile.am index 772aad7..182f3ac 100644 --- a/index/Makefile.am +++ b/index/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.2 2000-04-06 09:03:28 adam Exp $ +## $Id: Makefile.am,v 1.3 2000-05-02 11:26:13 adam Exp $ noinst_PROGRAMS = apitest @@ -31,6 +31,6 @@ apitest_SOURCES = apitest.c kcompare.c zrpn.c zsets.c attribute.c recindex.c \ retrieve.c kinput.c \ index.h recindex.h recindxp.h zebraapi.h zinfo.h zserver.h -INCLUDES = -I$(srcdir)/../include @YAZINC@ +INCLUDES = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) -LDADD = @SUBLIBS@ @YAZLIB@ +LDADD = @SUBLIBS@ $(YAZLIB) $(TCL_LIB) diff --git a/index/Makefile.in b/index/Makefile.in index 824a050..31a5e33 100644 --- a/index/Makefile.in +++ b/index/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ @@ -86,9 +85,9 @@ noinst_PROGRAMS = apitest apitest_SOURCES = apitest.c kcompare.c zrpn.c zsets.c attribute.c recindex.c lockutil.c locksrv.c zinfo.c trunc.c sortidx.c rank1.c zebraapi.c retrieve.c kinput.c index.h recindex.h recindxp.h zebraapi.h zinfo.h zserver.h -INCLUDES = -I$(srcdir)/../include @YAZINC@ +INCLUDES = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) -LDADD = @SUBLIBS@ @YAZLIB@ +LDADD = @SUBLIBS@ $(YAZLIB) $(TCL_LIB) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) diff --git a/isam/Makefile.in b/isam/Makefile.in index 15578de..15d68d3 100644 --- a/isam/Makefile.in +++ b/isam/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/isamc/Makefile.in b/isamc/Makefile.in index 2e32f7b..85ac39b 100644 --- a/isamc/Makefile.in +++ b/isamc/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/isams/Makefile.in b/isams/Makefile.in index 59dcf1b..f3090c1 100644 --- a/isams/Makefile.in +++ b/isams/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/recctrl/Makefile.am b/recctrl/Makefile.am index 298fdb6..c36d5dd 100644 --- a/recctrl/Makefile.am +++ b/recctrl/Makefile.am @@ -1,7 +1,7 @@ -## $Id: Makefile.am,v 1.1 2000-04-05 09:49:36 adam Exp $ +## $Id: Makefile.am,v 1.2 2000-05-02 11:26:13 adam Exp $ noinst_LIBRARIES = librecctrl.a librecctrl_a_SOURCES = recctrl.c recgrs.c sgmlread.c regxread.c \ marcread.c rectext.c grsread.h recgrs.h rectext.h -INCLUDES = -I$(srcdir)/../include @YAZINC@ +INCLUDES = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) diff --git a/recctrl/Makefile.in b/recctrl/Makefile.in index eabe058..178b898 100644 --- a/recctrl/Makefile.in +++ b/recctrl/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ @@ -77,7 +76,7 @@ noinst_LIBRARIES = librecctrl.a librecctrl_a_SOURCES = recctrl.c recgrs.c sgmlread.c regxread.c marcread.c rectext.c grsread.h recgrs.h rectext.h -INCLUDES = -I$(srcdir)/../include @YAZINC@ +INCLUDES = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) diff --git a/rset/Makefile.in b/rset/Makefile.in index ccbe487..fc4fb0b 100644 --- a/rset/Makefile.in +++ b/rset/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/tab/Makefile.in b/tab/Makefile.in index c62882a..ed68afc 100644 --- a/tab/Makefile.in +++ b/tab/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ @@ -75,10 +74,10 @@ yazconfig = @yazconfig@ tabdatadir = $(pkgdatadir)/tab -tabdata_DATA = default.idx hci.flt mail.flt news.flt numeric.chr nwi.flt out out,v refer.flt scan.chr sgml.flt soif.flt string.chr urx.chr usmarc.flt +tabdata_DATA = default.idx hci.flt mail.flt news.flt numeric.chr nwi.flt refer.flt scan.chr sgml.flt soif.flt string.chr urx.chr usmarc.flt -EXTRA_DIST = default.idx hci.flt mail.flt news.flt numeric.chr nwi.flt out out,v refer.flt scan.chr sgml.flt soif.flt string.chr urx.chr usmarc.flt +EXTRA_DIST = default.idx hci.flt mail.flt news.flt numeric.chr nwi.flt refer.flt scan.chr sgml.flt soif.flt string.chr urx.chr usmarc.flt mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = diff --git a/test/Makefile.in b/test/Makefile.in index 2b101ec..2f4a2be 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/test/gils/Makefile.in b/test/gils/Makefile.in index 78c2ff6..18fc7bc 100644 --- a/test/gils/Makefile.in +++ b/test/gils/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/test/usmarc/Makefile.in b/test/usmarc/Makefile.in index e570ce9..bcd276f 100644 --- a/test/usmarc/Makefile.in +++ b/test/usmarc/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ diff --git a/util/Makefile.in b/util/Makefile.in index 0d843b8..fe91e95 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -61,7 +61,6 @@ CC = @CC@ CPP = @CPP@ DEFS = @DEFS@ MAKEINFO = @MAKEINFO@ -ODEFS = @ODEFS@ PACKAGE = @PACKAGE@ PROGPREFIX = @PROGPREFIX@ RANLIB = @RANLIB@ -- 1.7.10.4