Updated configure for Zmbol/Zebra dependent settings.

diff --git a/Makefile.in b/Makefile.in
index acc4abc..5597857 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1999, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.7 1999-11-30 13:48:03 adam Exp $
+# $Id: Makefile.in,v 1.8 1999-12-01 13:30:30 adam Exp $
 
 SHELL=/bin/sh
 MAKE=make
@@ -40,7 +40,7 @@ INCDIR=$(prefix)/include
 ZEBRADIR=$(prefix)/lib/zebra
 ZEBRATAB=$(prefix)/lib/zebra/tab
 
-SUBDIR=util bfile dfa dict isams isamc isam rset recctrl index
+SUBDIR=@SUBDIR@
 
 all:
        for i in $(SUBDIR); do cd $$i; if $(MAKE) OSILIB="$(OSILIB)" YAZLIB="$(YAZLIB)" YAZINC="$(YAZINC)" RANLIB="$(RANLIB)" CDEFS="$(CDEFS)" LIBS="$(LIBS)" CFLAGS="$(CFLAGS)" CC="$(CC)"; then cd ..; else exit 1; fi; done

diff --git a/configure b/configure
index c7752db..de8c8fd 100755 (executable)
--- a/configure
+++ b/configure
@@ -533,10 +533,13 @@ 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:540: checking for $ac_word" >&5
+echo "configure:543: 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
@@ -566,7 +569,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:570: checking for $ac_word" >&5
+echo "configure:573: 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
@@ -617,7 +620,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:621: checking for $ac_word" >&5
+echo "configure:624: 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
@@ -649,7 +652,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:653: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:656: 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.
@@ -660,12 +663,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 664 "configure"
+#line 667 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:672: \"$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
@@ -691,12 +694,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:695: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:698: 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:700: checking whether we are using GNU C" >&5
+echo "configure:703: 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
@@ -705,7 +708,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:709: \"$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:712: \"$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
@@ -724,7 +727,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:728: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:731: 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
@@ -756,7 +759,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:760: checking how to run the C preprocessor" >&5
+echo "configure:763: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -771,13 +774,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 775 "configure"
+#line 778 "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:781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:784: \"$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
   :
@@ -788,13 +791,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 792 "configure"
+#line 795 "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:798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:801: \"$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
   :
@@ -805,13 +808,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 809 "configure"
+#line 812 "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:815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:818: \"$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
   :
@@ -866,7 +869,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # 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:870: checking for a BSD compatible install" >&5
+echo "configure:873: 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
@@ -921,7 +924,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:925: checking for $ac_word" >&5
+echo "configure:928: 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
@@ -979,7 +982,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:983: checking for $ac_word" >&5
+echo "configure:986: 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
@@ -1015,7 +1018,7 @@ fi
        fi
 fi
 echo $ac_n "checking for YAZ""... $ac_c" 1>&6
-echo "configure:1019: checking for YAZ" >&5
+echo "configure:1022: checking for YAZ" >&5
 if test -r $yazconfig; then
        . $yazconfig
        echo "$ac_t""$yazconfig" 1>&6
@@ -1038,7 +1041,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:1042: checking for $ac_word" >&5
+echo "configure:1045: 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
@@ -1080,7 +1083,7 @@ fi
 fi
 if test -r ${tclconfig}/tclConfig.sh; then
        echo $ac_n "checking for Tcl""... $ac_c" 1>&6
-echo "configure:1084: checking for Tcl" >&5
+echo "configure:1087: checking for Tcl" >&5
        . ${tclconfig}/tclConfig.sh
        if test -r ${tclconfig}/../generic/tcl.h; then
                TCL_INCLUDE=-I${tclconfig}/../generic
@@ -1102,17 +1105,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:1106: checking for $ac_hdr" >&5
+echo "configure:1109: 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
-#line 1111 "configure"
+#line 1114 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1119: \"$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*
@@ -1139,7 +1142,7 @@ fi
 done
 
 echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
-echo "configure:1143: checking for bzCompressInit in -lbz2" >&5
+echo "configure:1146: 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
@@ -1147,7 +1150,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbz2  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1151 "configure"
+#line 1154 "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
@@ -1158,7 +1161,7 @@ int main() {
 bzCompressInit()
 ; return 0; }
 EOF
-if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1165: \"$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
@@ -1190,17 +1193,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:1194: checking for $ac_hdr" >&5
+echo "configure:1197: 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
-#line 1199 "configure"
+#line 1202 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1207: \"$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*
@@ -1228,12 +1231,12 @@ done
 
 fi
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1232: checking for ANSI C header files" >&5
+echo "configure:1235: 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 1237 "configure"
+#line 1240 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1241,7 +1244,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1248: \"$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*
@@ -1258,7 +1261,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
-#line 1262 "configure"
+#line 1265 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1276,7 +1279,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
-#line 1280 "configure"
+#line 1283 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1297,7 +1300,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1301 "configure"
+#line 1304 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1308,7 +1311,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1334,6 +1337,39 @@ fi
 if test "$ac_cv_header_stdc" = "no"; then
        echo "configure: warning: Your system doesn't seem to support ANSI C" 1>&2
 fi
+if test -r LICENSE.zmbol; then
+       cat >> confdefs.h <<\EOF
+#define ZMBOL 1
+EOF
+
+       PROGPREFIX=zmbol
+       SUBDIR="util bfile dfa dict isams isamc isam rset recctrl index"
+       SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a\
+ ../lib/recctrl.a ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a\
+ ../lib/zebrautl.a"
+else
+       PROGPREFIX=zebra
+       SUBDIR="util bfile dfa dict isams rset recctrl index"
+       SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a\
+ ../lib/recctrl.a ../lib/bfile.a ../lib/dfa.a\
+ ../lib/zebrautl.a"
+       cat >> confdefs.h <<\EOF
+#define ZMBOL 0
+EOF
+
+       if ! test -d isamc; then
+               mkdir isamc
+       fi
+       if ! test -r isamc/Makefile.in; then
+               touch isamc/Makefile.in
+       fi
+       if ! test -d isam; then
+               mkdir isam
+       fi
+       if ! test -r isam/Makefile.in; then
+               touch isam/Makefile.in
+       fi
+fi
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1484,6 +1520,9 @@ s%@TCL_INCLUDE@%$TCL_INCLUDE%g
 s%@TCL_LIB@%$TCL_LIB%g
 s%@YAZLIB@%$YAZLIB%g
 s%@YAZINC@%$YAZINC%g
+s%@SUBDIR@%$SUBDIR%g
+s%@SUBLIBS@%$SUBLIBS%g
+s%@PROGPREFIX@%$PROGPREFIX%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g

diff --git a/configure.in b/configure.in
index dbf056e..c4e4371 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1994-1999
-dnl $Id: configure.in,v 1.11 1999-11-30 13:48:03 adam Exp $
+dnl $Id: configure.in,v 1.12 1999-12-01 13:30:30 adam Exp $
 dnl See the file LICENSE.2 for details.
 dnl
 AC_INIT(include/zebraver.h)
@@ -10,6 +10,9 @@ AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
 AC_SUBST(YAZLIB)
 AC_SUBST(YAZINC)
+AC_SUBST(SUBDIR)
+AC_SUBST(SUBLIBS)
+AC_SUBST(PROGPREFIX)
 dnl
 dnl ------ Checking programs
 AC_PROG_CC
@@ -99,5 +102,34 @@ if test "$ac_cv_header_stdc" = "no"; then
        AC_MSG_WARN(Your system doesn't seem to support ANSI C)
 fi
 dnl
+dnl ------ Is it Zebra or Z'mbol
+if test -r LICENSE.zmbol; then
+       AC_DEFINE(ZMBOL,1)
+       PROGPREFIX=zmbol
+       SUBDIR="util bfile dfa dict isams isamc isam rset recctrl index"
+       SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a\
+ ../lib/recctrl.a ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a\
+ ../lib/zebrautl.a"
+else
+       PROGPREFIX=zebra
+       SUBDIR="util bfile dfa dict isams rset recctrl index"
+       SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a\
+ ../lib/recctrl.a ../lib/bfile.a ../lib/dfa.a\
+ ../lib/zebrautl.a"
+       AC_DEFINE(ZMBOL,0)
+       if ! test -d isamc; then
+               mkdir isamc
+       fi
+       if ! test -r isamc/Makefile.in; then
+               touch isamc/Makefile.in
+       fi
+       if ! test -d isam; then
+               mkdir isam
+       fi
+       if ! test -r isam/Makefile.in; then
+               touch isam/Makefile.in
+       fi
+fi
+dnl
 dnl ------ Create Makefiles
 AC_OUTPUT(Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile isam/Makefile isamc/Makefile recctrl/Makefile rset/Makefile index/Makefile)

diff --git a/include/zebraver.h b/include/zebraver.h
index dc7749f..e903d3c 100644 (file)
--- a/include/zebraver.h
+++ b/include/zebraver.h
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraver.h,v $
- * Revision 1.14  1999-11-30 13:48:03  adam
+ * Revision 1.15  1999-12-01 13:30:30  adam
+ * Updated configure for Zmbol/Zebra dependent settings.
+ *
+ * Revision 1.14  1999/11/30 13:48:03  adam
  * Improved installation. Updated for inclusion of YAZ header files.
  *
  * Revision 1.13  1999/02/02 14:50:48  adam
@@ -53,9 +56,5 @@
 #endif
 
 #ifndef ZEBRADATE
-#define ZEBRADATE "$Date: 1999-11-30 13:48:03 $"
-#endif
-
-#ifndef ZMBOL
-#define ZMBOL 1
+#define ZEBRADATE "$Date: 1999-12-01 13:30:30 $"
 #endif

diff --git a/index/Makefile.in b/index/Makefile.in
index 3d8c876..e126644 100644 (file)
--- a/index/Makefile.in
+++ b/index/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1999, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.9 1999-11-30 13:48:03 adam Exp $
+# $Id: Makefile.in,v 1.10 1999-12-01 13:30:30 adam Exp $
 
 SHELL=/bin/sh
 
@@ -17,9 +17,9 @@ YAZINC=@YAZINC@
 
 INCLUDE=-I../include $(YAZINC)
 TCL_INCLUDE=@TCL_INCLUDE@
-TPROG1=../bin/zebraidx
+TPROG1=../bin/@PROGPREFIX@idx
 TPROG2=kdump
-TPROG3=../bin/zebrasrv
+TPROG3=../bin/@PROGPREFIX@srv
 TPROG4=hlvltest
 TPROG5=apitest
 DEFS=$(CDEFS) $(INCLUDE) $(TCL_INCLUDE)
@@ -37,45 +37,24 @@ O5 = apitest.o kcompare.o zrpn.o zsets.o attribute.o recindex.o \
 
 all: $(TPROG1) $(TPROG2) $(TPROG3)
 
-$(TPROG1): $(O1) ../lib/dict.a ../lib/isams.a ../lib/isam.a ../lib/isamc.a \
-               ../lib/recctrl.a ../lib/bfile.a ../lib/dfa.a ../lib/zebrautl.a 
-       $(CC) $(CFLAGS) -o $(TPROG1) $(O1) \
-               ../lib/dict.a ../lib/isams.a ../lib/isam.a ../lib/isamc.a \
-               ../lib/recctrl.a ../lib/bfile.a ../lib/dfa.a ../lib/zebrautl.a \
+$(TPROG1): $(O1) @SUBLIBS@
+       $(CC) $(CFLAGS) -o $(TPROG1) $(O1) @SUBLIBS@ \
                $(YAZLIB) $(TCL_LIB) $(LIBS)
 
-$(TPROG2): $(O2)
-       $(CC) $(CFLAGS) -o $(TPROG2) $(O2) ../lib/zebrautl.a \
+$(TPROG2): $(O2) @SUBLIBS@
+       $(CC) $(CFLAGS) -o $(TPROG2) $(O2) @SUBLIBS@ \
                $(YAZLIB) $(LIBS)
 
-$(TPROG3): $(O3) \
-               ../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a \
-               ../lib/recctrl.a ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a \
-               ../lib/zebrautl.a 
-       $(CC) $(CFLAGS) -o $(TPROG3) $(O3) \
-               ../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a \
-               ../lib/recctrl.a ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a \
-               ../lib/zebrautl.a \
+$(TPROG3): $(O3) @SUBLIBS@
+       $(CC) $(CFLAGS) -o $(TPROG3) $(O3) @SUBLIBS@ \
                $(YAZLIB) $(OSILIB) $(TCL_LIB) $(LIBS) -lm
 
-$(TPROG4): $(O4) \
-               ../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a \
-               ../lib/recctrl.a \
-               ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a ../lib/zebrautl.a
-       $(CC) $(CFLAGS) -o $(TPROG4) $(O4) \
-               ../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a \
-               ../lib/recctrl.a \
-               ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a ../lib/zebrautl.a \
+$(TPROG4): $(O4) @SUBLIBS@
+       $(CC) $(CFLAGS) -o $(TPROG4) $(O4) @SUBLIBS@ \
                $(YAZLIB) $(OSILIB) $(TCL_LIB) $(LIBS) -lm 
 
-$(TPROG5): $(O5) \
-               ../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a \
-               ../lib/recctrl.a \
-               ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a ../lib/zebrautl.a
-       $(CC) $(CFLAGS) -o $(TPROG5) $(O5) \
-               ../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a \
-               ../lib/recctrl.a \
-               ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a ../lib/zebrautl.a \
+$(TPROG5): $(O5) @SUBLIBS@
+       $(CC) $(CFLAGS) -o $(TPROG5) $(O5) @SUBLIBS@ \
                $(YAZLIB) $(OSILIB) $(TCL_LIB) $(LIBS) -lm
 
 
@@ -83,7 +62,7 @@ $(TPROG5): $(O5) \
        $(CC) -c $(DEFS) $(CFLAGS) $<
 
 clean:
-       rm -f *.[oa] $(TPROG1) $(TPROG2) $(TPROG3)
+       rm -f *.[oa] $(TPROG1) $(TPROG2) $(TPROG3) 
        rm -f core mon.out gmon.out errlist
 
 depend:

diff --git a/index/invstat.c b/index/invstat.c
index 2cdf9b1..d1c8fe2 100644 (file)
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -11,7 +11,9 @@
 
 #include "index.h"
 #include "recindex.h"
+#if ZMBOL
 #include "../isamc/isamd-p.h"
+#endif
 
 struct inv_stat_info {
     ISAMS isams;
@@ -321,7 +323,10 @@ void inv_prstat (BFiles bfs)
 /*
  *
  * $Log: invstat.c,v $
- * Revision 1.19  1999-11-30 13:48:03  adam
+ * Revision 1.20  1999-12-01 13:30:30  adam
+ * Updated configure for Zmbol/Zebra dependent settings.
+ *
+ * Revision 1.19  1999/11/30 13:48:03  adam
  * Improved installation. Updated for inclusion of YAZ header files.
  *
  * Revision 1.18  1999/10/06 11:46:36  heikki

diff --git a/test/gils/zebra.cfg b/test/gils/zebra.cfg
index 9e42c87..88b0d20 100644 (file)
--- a/test/gils/zebra.cfg
+++ b/test/gils/zebra.cfg
@@ -1,8 +1,8 @@
 # Simple Zebra configuration file
-# $Id: zebra.cfg,v 1.8 1999-11-30 13:48:04 adam Exp $
+# $Id: zebra.cfg,v 1.9 1999-12-01 13:30:30 adam Exp $
 #
 # Where are the YAZ / Zebra tables located?
-profilePath: .:../../tab:../../../yaz-1.5/tab
+profilePath: .:../../tab:../../../yaz/tab
 
 # Files that describe the attribute sets supported.
 attset: bib1.att