From 2b33b395b50c562323ea2b0251f9b798cf5241d2 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 11 Oct 2000 12:31:27 +0000 Subject: [PATCH] Using YAZ_INIT for autoconf. Added template code for isamb. --- Makefile.am | 4 +- Makefile.in | 13 +- aclocal.m4 | 47 ++++++++ bfile/Makefile.in | 2 + configure | 179 ++++++++++++++------------- configure.in | 43 ++----- dfa/Makefile.in | 2 + dict/Makefile.in | 2 + doc/Makefile.in | 2 + include/Makefile.in | 2 + index/Makefile.in | 2 + isam/Makefile.in | 2 + isamb/Makefile.am | 9 ++ isamb/Makefile.in | 306 +++++++++++++++++++++++++++++++++++++++++++++++ isamb/isamb.c | 89 ++++++++++++++ isamc/Makefile.in | 2 + isams/Makefile.in | 2 + recctrl/Makefile.in | 2 + rset/Makefile.in | 2 + tab/Makefile.in | 2 + test/Makefile.in | 11 +- test/gils/Makefile.in | 2 + test/usmarc/Makefile.in | 2 + util/Makefile.in | 2 + 24 files changed, 607 insertions(+), 124 deletions(-) create mode 100644 isamb/Makefile.am create mode 100644 isamb/Makefile.in create mode 100644 isamb/isamb.c diff --git a/Makefile.am b/Makefile.am index 2232779..317e3ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,11 @@ -## $Id: Makefile.am,v 1.2 2000-04-06 09:03:27 adam Exp $ +## $Id: Makefile.am,v 1.3 2000-10-11 12:31:27 adam Exp $ AUTOMAKE_OPTIONS=foreign EXTRA_DIST= README CHANGELOG if ISZMBOL -SUBDIRS=util bfile dfa dict isams isamc isam rset recctrl tab index test +SUBDIRS=util bfile dfa dict isams isamb isamc isam rset recctrl tab index test else SUBDIRS=util bfile dfa dict isams rset recctrl tab index test endif diff --git a/Makefile.in b/Makefile.in index 5103b34..a3df7db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,13 +69,15 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = README CHANGELOG -@ISZMBOL_TRUE@SUBDIRS = util bfile dfa dict isams isamc isam rset recctrl tab index test +@ISZMBOL_TRUE@SUBDIRS = util bfile dfa dict isams isamb isamc isam rset recctrl tab index test @ISZMBOL_FALSE@SUBDIRS = util bfile dfa dict isams rset recctrl tab index test DIST_SUBDIRS = $(SUBDIRS) include doc @@ -115,6 +117,8 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCI # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. +@SET_MAKE@ + all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @@ -141,11 +145,10 @@ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ + rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ - rev="$$rev ."; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ diff --git a/aclocal.m4 b/aclocal.m4 index 0df5c2f..ad9609b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -115,3 +115,50 @@ else $1_FALSE= fi]) +# Use this m4 funciton for autoconf if you use YAZ in your own +# configure script. +# YAZ_INIT + +AC_DEFUN([YAZ_INIT], +[ + AC_SUBST(YAZLIB) + AC_SUBST(YAZLALIB) + AC_SUBST(YAZINC) + AC_SUBST(YAZVERSION) + yazconfig=NONE + yazpath=NONE + AC_ARG_WITH(yazconfig, [ --with-yazconfig=DIR yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval]) + 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/yaz-config; then + yazconfig=$i/yaz-config + fi + fi + done + if test "x$yazconfig" = "xNONE"; then + AC_PATH_PROG(yazconfig, yaz-config, NONE) + fi + fi + AC_MSG_CHECKING(for YAZ) + if $yazconfig --version >/dev/null 2>&1; then + YAZLIB=`$yazconfig --libs` + # if this is empty, it's a simple version YAZ 1.6 script + # so we have to source it instead... + if test "X$YAZLIB" = "X"; then + . $yazconfig + else + YAZLALIB=`$yazconfig --lalibs` + YAZINC=`$yazconfig --cflags` + YAZVERSION=`$yazconfig --version` + fi + AC_MSG_RESULT($yazconfig) + else + AC_MSG_RESULT(Not found) + YAZVERSION=NONE + fi +]) + + diff --git a/bfile/Makefile.in b/bfile/Makefile.in index d0a5253..8c71031 100644 --- a/bfile/Makefile.in +++ b/bfile/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ noinst_LIBRARIES = libbfile.a diff --git a/configure b/configure index 249f9c7..e52a21b 100755 --- a/configure +++ b/configure @@ -12,7 +12,7 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --with-yazconfig=DIR yaz-config in DIR (example /home/yaz-1.5)" + --with-yazconfig=DIR yaz-config in DIR (example /home/yaz-1.7)" ac_help="$ac_help --disable-threads disable threads" ac_help="$ac_help @@ -790,6 +790,7 @@ fi SUBLIBS="../rset/librset.a \ ../dict/libdict.a \ + ../isamb/libisamb.a \ ../isams/libisams.a \ ../isam/libisam.a \ ../isamc/libisamc.a \ @@ -824,7 +825,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:828: checking for working aclocal" >&5 +echo "configure:829: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -837,7 +838,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:841: checking for working autoconf" >&5 +echo "configure:842: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -850,7 +851,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:854: checking for working automake" >&5 +echo "configure:855: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -863,7 +864,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:867: checking for working autoheader" >&5 +echo "configure:868: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -876,7 +877,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:880: checking for working makeinfo" >&5 +echo "configure:881: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -901,6 +902,10 @@ fi mkdir ${srcdir}/isamc touch ${srcdir}/isamc/Makefile.in fi + if test ! -r ${srcdir}/isamb; then + mkdir ${srcdir}/isamb + touch ${srcdir}/isamb/Makefile.in + fi fi @@ -916,12 +921,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:925: checking for $ac_word" >&5 +echo "configure:928: 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 @@ -951,7 +954,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:955: checking for $ac_word" >&5 +echo "configure:958: 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 @@ -1002,7 +1005,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:1006: checking for $ac_word" >&5 +echo "configure:1009: 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 @@ -1034,7 +1037,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1038: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1041: 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. @@ -1045,12 +1048,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1049 "configure" +#line 1052 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1057: \"$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 @@ -1076,12 +1079,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:1080: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1083: 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:1085: checking whether we are using GNU C" >&5 +echo "configure:1088: 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 @@ -1090,7 +1093,7 @@ else yes; #endif EOF -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 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1097: \"$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 @@ -1109,7 +1112,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:1113: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1116: 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 @@ -1141,7 +1144,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1145: checking how to run the C preprocessor" >&5 +echo "configure:1148: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1156,13 +1159,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:1166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1169: \"$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 : @@ -1173,13 +1176,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:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1186: \"$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 : @@ -1190,13 +1193,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:1200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1203: \"$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 : @@ -1232,7 +1235,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:1236: checking for a BSD compatible install" >&5 +echo "configure:1239: 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 @@ -1287,7 +1290,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:1291: checking for $ac_word" >&5 +echo "configure:1294: 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 @@ -1314,29 +1317,35 @@ else echo "$ac_t""no" 1>&6 fi -yazconfig=NONE -yazpath=NONE -# Check whether --with-yazconfig or --without-yazconfig was given. + + + + + + + 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/yaz-config; then - yazconfig=$i/yaz-config + 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/yaz-config; then + yazconfig=$i/yaz-config + fi 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. + 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:1340: checking for $ac_word" >&5 +echo "configure:1349: 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 @@ -1369,16 +1378,22 @@ else echo "$ac_t""no" 1>&6 fi + fi fi -fi -echo $ac_n "checking for YAZ""... $ac_c" 1>&6 -echo "configure:1376: 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 + echo $ac_n "checking for YAZ""... $ac_c" 1>&6 +echo "configure:1385: checking for YAZ" >&5 + if $yazconfig --version >/dev/null 2>&1; then + YAZLIB=`$yazconfig --libs` + YAZLALIB=`$yazconfig --lalibs` + YAZINC=`$yazconfig --cflags` + YAZVERSION=`$yazconfig --version` + echo "$ac_t""$yazconfig" 1>&6 + else + echo "$ac_t""Not found" 1>&6 + YAZVERSION=NONE + fi + + # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then enableval="$enable_threads" @@ -1389,7 +1404,7 @@ fi if test "$enable_threads" = "yes"; then echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:1393: checking for main in -lpthread" >&5 +echo "configure:1408: 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 @@ -1397,14 +1412,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:1423: \"$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 @@ -1432,9 +1447,9 @@ else fi echo $ac_n "checking for working POSIX Threads""... $ac_c" 1>&6 -echo "configure:1436: checking for working POSIX Threads" >&5 +echo "configure:1451: checking for working POSIX Threads" >&5 cat > conftest.$ac_ext < int func(void *p) { return 0; } @@ -1445,7 +1460,7 @@ int main() { int r = pthread_create (&pthread_id, 0, func, 0); ; return 0; } EOF -if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* thread_ok=yes else @@ -1485,7 +1500,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:1489: checking for $ac_word" >&5 +echo "configure:1504: 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 @@ -1526,7 +1541,7 @@ fi prefix=${saveprefix} fi echo $ac_n "checking for Tcl""... $ac_c" 1>&6 -echo "configure:1530: checking for Tcl" >&5 +echo "configure:1545: checking for Tcl" >&5 if test -r ${tclconfig}/tclConfig.sh; then . ${tclconfig}/tclConfig.sh if test -r ${tclconfig}/../generic/tcl.h; then @@ -1556,17 +1571,17 @@ 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:1560: checking for $ac_hdr" >&5 +echo "configure:1575: 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:1570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1585: \"$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* @@ -1593,7 +1608,7 @@ fi done echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 -echo "configure:1597: checking for bzCompressInit in -lbz2" >&5 +echo "configure:1612: 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 @@ -1601,7 +1616,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:1631: \"$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 @@ -1644,17 +1659,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:1648: checking for $ac_hdr" >&5 +echo "configure:1663: 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:1658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1673: \"$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* @@ -1682,12 +1697,12 @@ done fi echo $ac_n "checking for LFS""... $ac_c" 1>&6 -echo "configure:1686: checking for LFS" >&5 +echo "configure:1701: checking for LFS" >&5 if test "$cross_compiling" = yes; then bits=32 else cat > conftest.$ac_ext < @@ -1707,7 +1722,7 @@ int main(int argc, char **argv) } EOF -if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bits=64 else @@ -1729,12 +1744,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1733: checking for ANSI C header files" >&5 +echo "configure:1748: 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 @@ -1742,7 +1757,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1761: \"$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* @@ -1759,7 +1774,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 @@ -1777,7 +1792,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 @@ -1798,7 +1813,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1809,7 +1824,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1954,6 +1969,7 @@ trap 'rm -fr `echo " bfile/Makefile dfa/Makefile dict/Makefile + isamb/Makefile isams/Makefile isamc/Makefile isam/Makefile @@ -2012,12 +2028,14 @@ s%@ISZMBOL_FALSE@%$ISZMBOL_FALSE%g s%@SUBLIBS@%$SUBLIBS%g s%@TCL_INCLUDE@%$TCL_INCLUDE%g s%@TCL_LIB@%$TCL_LIB%g -s%@YAZLIB@%$YAZLIB%g -s%@YAZINC@%$YAZINC%g s%@PROGPREFIX@%$PROGPREFIX%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@RANLIB@%$RANLIB%g +s%@YAZLIB@%$YAZLIB%g +s%@YAZLALIB@%$YAZLALIB%g +s%@YAZINC@%$YAZINC%g +s%@YAZVERSION@%$YAZVERSION%g s%@yazconfig@%$yazconfig%g s%@TCLSH@%$TCLSH%g @@ -2066,6 +2084,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile bfile/Makefile dfa/Makefile dict/Makefile + isamb/Makefile isams/Makefile isamc/Makefile isam/Makefile diff --git a/configure.in b/configure.in index b8d9608..6100f90 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Zebra, Index Data Aps, 1994-2000 -dnl $Id: configure.in,v 1.22 2000-07-07 12:49:20 adam Exp $ +dnl $Id: configure.in,v 1.23 2000-10-11 12:31:27 adam Exp $ dnl AC_INIT(include/zebraver.h) AC_MSG_CHECKING(for package) @@ -10,6 +10,7 @@ if test -r ${srcdir}/LICENSE.zmbol; then AM_INIT_AUTOMAKE(zmbol,1.1) SUBLIBS="../rset/librset.a \ ../dict/libdict.a \ + ../isamb/libisamb.a \ ../isams/libisams.a \ ../isam/libisam.a \ ../isamc/libisamc.a \ @@ -34,6 +35,10 @@ else mkdir ${srcdir}/isamc touch ${srcdir}/isamc/Makefile.in fi + if test ! -r ${srcdir}/isamb; then + mkdir ${srcdir}/isamb + touch ${srcdir}/isamb/Makefile.in + fi fi AM_CONDITIONAL(ISZMBOL,test $PACKAGE = zmbol) dnl ------ Substitutions @@ -41,8 +46,6 @@ AC_SUBST(SUBLIBS) AC_SUBST(DEFS) AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) -AC_SUBST(YAZLIB) -AC_SUBST(YAZINC) AC_SUBST(PROGPREFIX) dnl dnl ------ Checking programs @@ -50,36 +53,9 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL AC_PROG_RANLIB -dnl -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=DIR yaz-config in DIR (example /home/yaz-1.5)], [yazpath=$withval]) -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/yaz-config; then - yazconfig=$i/yaz-config - fi - fi - done - if test "x$yazconfig" = "xNONE"; then - AC_PATH_PROG(yazconfig, yaz-config, NONE) - fi -fi -AC_MSG_CHECKING(for YAZ) -if test -r $yazconfig; then - . $yazconfig - AC_MSG_RESULT($yazconfig) -else - AC_MSG_RESULT(Not found) -fi -dnl + +YAZ_INIT + dnl ------ Threads AC_ARG_ENABLE(threads, [ --disable-threads disable threads],[enable_threads=$enableval],[enable_threads=yes]) if test "$enable_threads" = "yes"; then @@ -181,6 +157,7 @@ AC_OUTPUT([ bfile/Makefile dfa/Makefile dict/Makefile + isamb/Makefile isams/Makefile isamc/Makefile isam/Makefile diff --git a/dfa/Makefile.in b/dfa/Makefile.in index bb3015a..3bc5d21 100644 --- a/dfa/Makefile.in +++ b/dfa/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ noinst_LIBRARIES = libdfa.a diff --git a/dict/Makefile.in b/dict/Makefile.in index b264351..a3d6889 100644 --- a/dict/Makefile.in +++ b/dict/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ noinst_LIBRARIES = libdict.a diff --git a/doc/Makefile.in b/doc/Makefile.in index d50375a..6c43454 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ docdir = $(pkgdatadir)/doc diff --git a/include/Makefile.in b/include/Makefile.in index d64b081..ff8862f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ EXTRA_DIST = bfile.h bset.h charmap.h dfa.h dict.h direntz.h isam.h isamc.h isamd.h isams.h mfile.h passwddb.h recctrl.h res.h rsbool.h rset.h rsisam.h rsisamc.h rsisams.h rsm_or.h rsnull.h rstemp.h set.h sortidx.h str.h zebra-lock.h zebramap.h zebrautl.h zebraver.h diff --git a/index/Makefile.in b/index/Makefile.in index 31a5e33..3500d9c 100644 --- a/index/Makefile.in +++ b/index/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ noinst_PROGRAMS = apitest diff --git a/isam/Makefile.in b/isam/Makefile.in index 15d68d3..d324003 100644 --- a/isam/Makefile.in +++ b/isam/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ noinst_LIBRARIES = libisam.a diff --git a/isamb/Makefile.am b/isamb/Makefile.am new file mode 100644 index 0000000..71a1879 --- /dev/null +++ b/isamb/Makefile.am @@ -0,0 +1,9 @@ +## $Id: Makefile.am,v 1.1 2000-10-11 12:31:27 adam Exp $ + +noinst_LIBRARIES = libisamb.a + +libisamb_a_SOURCES = isamb.c + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + +LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a @YAZLIB@ diff --git a/isamb/Makefile.in b/isamb/Makefile.in new file mode 100644 index 0000000..1d9de55 --- /dev/null +++ b/isamb/Makefile.in @@ -0,0 +1,306 @@ +# Makefile.in generated automatically by automake 1.4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = .. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +CC = @CC@ +CPP = @CPP@ +DEFS = @DEFS@ +MAKEINFO = @MAKEINFO@ +PACKAGE = @PACKAGE@ +PROGPREFIX = @PROGPREFIX@ +RANLIB = @RANLIB@ +SUBLIBS = @SUBLIBS@ +TCL_INCLUDE = @TCL_INCLUDE@ +TCL_LIB = @TCL_LIB@ +VERSION = @VERSION@ +YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ +YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ +yazconfig = @yazconfig@ + +noinst_LIBRARIES = libisamb.a + +libisamb_a_SOURCES = isamb.c + +INCLUDES = -I$(srcdir)/../include @YAZINC@ + +LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a @YAZLIB@ +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +libisamb_a_LIBADD = +libisamb_a_OBJECTS = isamb.o +AR = ar +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/isamb.P +SOURCES = $(libisamb_a_SOURCES) +OBJECTS = $(libisamb_a_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu isamb/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-noinstLIBRARIES: + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +distclean-noinstLIBRARIES: + +maintainer-clean-noinstLIBRARIES: + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +libisamb.a: $(libisamb_a_OBJECTS) $(libisamb_a_DEPENDENCIES) + -rm -f libisamb.a + $(AR) cru libisamb.a $(libisamb_a_OBJECTS) $(libisamb_a_LIBADD) + $(RANLIB) libisamb.a + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = isamb + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu isamb/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-tags distclean-depend distclean-generic \ + clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ +mostlyclean-compile distclean-compile clean-compile \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/isamb/isamb.c b/isamb/isamb.c new file mode 100644 index 0000000..c887032 --- /dev/null +++ b/isamb/isamb.c @@ -0,0 +1,89 @@ +#if 0 +#include + +ISAMB isamb_open (const char *name, ISAMC_M method) +{ + ISAMB isamb = xmalloc (sizeof(*isamb)); + return isamb; +} + +int isamb_insert (ISAMB is, ISAMB_pos *pos, const void *data) +{ + void *decodeClientData; + + void *page; + if (*pos == 0) + { + *pos = isamb_alloc_block (is, isamb->block_size[0], &page); + isamb_page_set_leaf (page); + isamb_page_set_no (page, 0); + } + else /* find leaf ... */ + { + const char *src; + char dst[200]; + int no, i; + while (1) + { + ISAMB_pos subptr; + + isamb_get_block (is, *pos, &page); + if (isamb_page_isleaf (page)) + break; + src = isamb_page_datalist (page); + no = isamb_page_get_no (page); + decodeClientData = (*is->method->code_start)(ISAMC_DECODE); + + isamb_read_subptr (&subptr, &src); + for (i = 0; imethod->code_item)(ISAMC_DECODE, decodeClientData, + dst, &src); + if ((*is->method->compare_item)(data, dst) < 0) + break; + + isamb_read_subptr (&subptr, src); + } + *pos = subptr; + (*is->method->code_stop)(ISAMC_DECODE, decodeClientData); + } + src = isamb_page_datalist (page); + no = isamb_page_get_no (page); + decodeClientData = (*is->method->code_start)(ISAMC_DECODE); + diff = -1; + for (i = 0; imethod->code_item)(ISAMC_DECODE, decodeClientData, + dst, &src); + diff = (*is->method->compare_item)(data, dst); + if (diff <= 0) + break; + } + if (diff < 0) + { + int j; + src = isamb_page_datalist (page); + page2 = isamb_page_dup (is, page); + dst2 = isamb_page_datalist (page2); + src2 = data; + for (j = 0; j <= no; j++) + { + if ( i == j) + (*is->method->code_item)(ISAMC_ENCODE, encodeClientData, + &dst2, &src2); + if (j < no) + { + char *dst0 = dst; + (*is->method->code_item)(ISAMC_DECODE, decodeClientData, + &dst, &src); + (*is->method->code_item)(ISAMC_ENCODE, encodeClientData, + &dst2, &dst0); + } + } + } + } +} +#endif diff --git a/isamc/Makefile.in b/isamc/Makefile.in index 85ac39b..cb527e4 100644 --- a/isamc/Makefile.in +++ b/isamc/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ noinst_LIBRARIES = libisamc.a diff --git a/isams/Makefile.in b/isams/Makefile.in index f3090c1..5c6d1ca 100644 --- a/isams/Makefile.in +++ b/isams/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ noinst_LIBRARIES = libisams.a diff --git a/recctrl/Makefile.in b/recctrl/Makefile.in index 178b898..46dd90a 100644 --- a/recctrl/Makefile.in +++ b/recctrl/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ noinst_LIBRARIES = librecctrl.a diff --git a/rset/Makefile.in b/rset/Makefile.in index fc4fb0b..4ca7c3a 100644 --- a/rset/Makefile.in +++ b/rset/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ noinst_LIBRARIES = librset.a diff --git a/tab/Makefile.in b/tab/Makefile.in index ed68afc..c9f18c6 100644 --- a/tab/Makefile.in +++ b/tab/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ tabdatadir = $(pkgdatadir)/tab diff --git a/test/Makefile.in b/test/Makefile.in index 9caa70a..59c6f3f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ SUBDIRS = gils usmarc @@ -99,6 +101,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. +@SET_MAKE@ + all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @@ -125,11 +129,10 @@ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ + rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ - rev="$$rev ."; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ diff --git a/test/gils/Makefile.in b/test/gils/Makefile.in index 18fc7bc..d4fc3eb 100644 --- a/test/gils/Makefile.in +++ b/test/gils/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ EXTRA_DIST = zebra.cfg test.sh diff --git a/test/usmarc/Makefile.in b/test/usmarc/Makefile.in index bcd276f..d6e3e42 100644 --- a/test/usmarc/Makefile.in +++ b/test/usmarc/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ EXTRA_DIST = zebra.cfg test.sh diff --git a/util/Makefile.in b/util/Makefile.in index fe91e95..b766363 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -69,7 +69,9 @@ TCL_INCLUDE = @TCL_INCLUDE@ TCL_LIB = @TCL_LIB@ VERSION = @VERSION@ YAZINC = @YAZINC@ +YAZLALIB = @YAZLALIB@ YAZLIB = @YAZLIB@ +YAZVERSION = @YAZVERSION@ yazconfig = @yazconfig@ noinst_LIBRARIES = libutil.a -- 1.7.10.4