From d0fa45cf0b317b7332a097928dc3c8827536a97d Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 28 Oct 1998 15:20:40 +0000
Subject: [PATCH] Updated makefiles to work with YC automatically.

---
 Makefile.in         |    5 ++-
 bfile/Makefile.in   |    4 +--
 configure           |   93 +++++++++++++++++++++------------------------------
 configure.in        |   11 ++----
 dfa/Makefile.in     |    4 +--
 dict/Makefile.in    |    4 +--
 index/Makefile.in   |    4 +--
 isam/Makefile.in    |    4 +--
 isamc/Makefile.in   |    4 +--
 recctrl/Makefile.in |    4 +--
 rset/Makefile.in    |    4 +--
 util/Makefile.in    |    4 +--
 12 files changed, 61 insertions(+), 84 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6fa0666..16d78c2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1998, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-09-02 14:15:26 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-10-28 15:20:40 adam Exp $
 
 SHELL=/bin/sh
 MAKE=make
@@ -13,8 +13,7 @@ CDEFS=@DEFS@ @ODEFS@
 # Where are Yaz libraries located?
 YAZLIB=../../yaz/lib/libyaz.a
 # Where are Yaz header files located?
-YAZINC=-I../../yaz/include
-#YAZINC=-I../../yaz/z39.50 -I../../yaz/include
+YAZINC=-I../../yaz/z39.50 -I../../yaz/include
 # If Yaz is compiled with mosi support uncomment and specify.
 #OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
 
diff --git a/bfile/Makefile.in b/bfile/Makefile.in
index 265f71b..b4e6e63 100644
--- a/bfile/Makefile.in
+++ b/bfile/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1998, Index Data ApS
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-09-02 14:15:27 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-10-28 15:20:43 adam Exp $
 
 SHELL=/bin/sh
 
@@ -12,7 +12,7 @@ CDEFS=@DEFS@ @ODEFS@
 LIBS=@LIBS@
 
 YAZLIB=-lyaz
-YAZINC=-I../../yaz/include
+YAZINC=-I../../yaz/z39.50 -I../../yaz/include
 
 INCLUDE=-I../include $(YAZINC)
 TPROG=btest
diff --git a/configure b/configure
index 6295618..5833d1c 100755
--- a/configure
+++ b/configure
@@ -11,8 +11,6 @@
 ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
-ac_help="$ac_help
-  --enable-gcc            allow use of gcc if available"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -521,19 +519,10 @@ fi
 
 
 
-# Check whether --enable-gcc or --disable-gcc was given.
-if test "${enable_gcc+set}" = set; then
-  enableval="$enable_gcc"
-  gcc_ok=$enableval
-else
-  gcc_ok=no
-fi
-
-if test "$gcc_ok" = "yes"; then
-    # Extract the first word of "gcc", so it can be a program name with args.
+# 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:537: checking for $ac_word" >&5
+echo "configure:526: 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
@@ -562,7 +551,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:566: checking for $ac_word" >&5
+echo "configure:555: 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
@@ -610,7 +599,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:614: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:603: 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.
@@ -620,11 +609,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 624 "configure"
+#line 613 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
@@ -644,12 +633,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:648: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:637: 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:653: checking whether we are using GNU C" >&5
+echo "configure:642: 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
@@ -658,7 +647,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:662: \"$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:651: \"$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
@@ -673,7 +662,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:677: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:666: 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
@@ -700,12 +689,8 @@ else
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
-else
-    CC=${CC-cc}
-
-fi
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:709: checking how to run the C preprocessor" >&5
+echo "configure:694: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -720,13 +705,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 724 "configure"
+#line 709 "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:730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -737,13 +722,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 741 "configure"
+#line 726 "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:747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -795,7 +780,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:799: checking for a BSD compatible install" >&5
+echo "configure:784: 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
@@ -847,7 +832,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:851: checking for $ac_word" >&5
+echo "configure:836: 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
@@ -875,12 +860,12 @@ fi
 
 checkBoth=0
 echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:879: checking for connect" >&5
+echo "configure:864: 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 884 "configure"
+#line 869 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -903,7 +888,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -924,7 +909,7 @@ fi
 
 if test "$ac_cv_func_connect" = "no"; then
 	echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:928: checking for main in -lsocket" >&5
+echo "configure:913: 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
@@ -932,14 +917,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 936 "configure"
+#line 921 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:928: \"$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
@@ -965,12 +950,12 @@ if test "$checkBoth" = "1"; then
 	oldLibs=$LIBS
 	LIBS="$LIBS -lsocket -lnsl"
 	echo $ac_n "checking for accept""... $ac_c" 1>&6
-echo "configure:969: checking for accept" >&5
+echo "configure:954: 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 974 "configure"
+#line 959 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char accept(); below.  */
@@ -993,7 +978,7 @@ accept();
 
 ; return 0; }
 EOF
-if { (eval echo configure:997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_accept=yes"
 else
@@ -1015,12 +1000,12 @@ fi
 
 fi
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1019: checking for gethostbyname" >&5
+echo "configure:1004: 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 1024 "configure"
+#line 1009 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -1043,7 +1028,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -1061,7 +1046,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:1065: checking for main in -lnsl" >&5
+echo "configure:1050: 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
@@ -1069,14 +1054,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1073 "configure"
+#line 1058 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1065: \"$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
@@ -1099,12 +1084,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1103: checking for ANSI C header files" >&5
+echo "configure:1088: 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 1108 "configure"
+#line 1093 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1112,7 +1097,7 @@ else
 #include <float.h>
 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:1101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1129,7 +1114,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 1133 "configure"
+#line 1118 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1147,7 +1132,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 1151 "configure"
+#line 1136 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1168,7 +1153,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1172 "configure"
+#line 1157 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1179,7 +1164,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
diff --git a/configure.in b/configure.in
index e4db6e4..5994e45 100644
--- a/configure.in
+++ b/configure.in
@@ -1,20 +1,13 @@
 dnl YAZ/Zebra Toolkit
 dnl (c) Index Data 1994-1998
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.2 1998-10-13 20:37:54 adam Exp $
+dnl $Id: configure.in,v 1.3 1998-10-28 15:20:42 adam Exp $
 AC_INIT(include/zebraver.h)
 dnl ------ Substitutions
 AC_SUBST(ODEFS)
 dnl
 dnl ------ Checking programs
-AC_ARG_ENABLE(gcc, [  --enable-gcc            allow use of gcc if available],
-    [gcc_ok=$enableval], [gcc_ok=no])
-if test "$gcc_ok" = "yes"; then
-    AC_PROG_CC
-else
-    CC=${CC-cc}
-AC_SUBST(CC)
-fi
+AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
diff --git a/dfa/Makefile.in b/dfa/Makefile.in
index c178e83..011e600 100644
--- a/dfa/Makefile.in
+++ b/dfa/Makefile.in
@@ -1,13 +1,13 @@
 # Copyright (C) 1994-1996, Index Data ApS
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-09-02 14:15:28 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-10-28 15:20:45 adam Exp $
 
 SHELL=/bin/sh
 RANLIB=ranlib
 
 YAZLIB=../../yaz/lib/libyaz.a
-YAZINC=-I../../yaz/include
+YAZINC=-I../../yaz/z39.50 -I../../yaz/include
 
 INCLUDE=-I../include $(YAZINC)
 TPROG1=agrep
diff --git a/dict/Makefile.in b/dict/Makefile.in
index cfce3e1..6cc7efe 100644
--- a/dict/Makefile.in
+++ b/dict/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1998, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-09-02 14:15:30 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-10-28 15:20:46 adam Exp $
 
 SHELL=/bin/sh
 
@@ -12,7 +12,7 @@ CDEFS=@DEFS@ @ODEFS@
 LIBS=@LIBS@
 
 YAZLIB=../../yaz/lib/libyaz.a
-YAZINC=-I../../yaz/include
+YAZINC=-I../../z39.50 -I../../yaz/include
 
 INCLUDE=-I../include $(YAZINC)
 TPROG1=dicttest
diff --git a/index/Makefile.in b/index/Makefile.in
index 9b5c938..b1c9157 100644
--- a/index/Makefile.in
+++ b/index/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1998, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-09-02 14:15:31 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-10-28 15:20:47 adam Exp $
 
 SHELL=/bin/sh
 
@@ -12,7 +12,7 @@ CDEFS=@DEFS@ @ODEFS@
 LIBS=@LIBS@
 
 YAZLIB=../../yaz/lib/libyaz.a
-YAZINC=-I../../yaz/include
+YAZINC=-I../../z39.50 -I../../yaz/include
 #OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
 #OSILIB=../../xtimosi/src/libmosi.a -lrfc
 
diff --git a/isam/Makefile.in b/isam/Makefile.in
index 3a277c8..f1b6a48 100644
--- a/isam/Makefile.in
+++ b/isam/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1998, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-09-02 14:15:33 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-10-28 15:20:48 adam Exp $
 
 SHELL=/bin/sh
 
@@ -12,7 +12,7 @@ CDEFS=@DEFS@ @ODEFS@
 LIBS=@LIBS@
 
 YAZLIB=../../yaz/lib/libyaz.a
-YAZINC=-I../../yaz/include
+YAZINC=-I../../yaz/z39.50 -I../../yaz/include
 
 INCLUDE=-I../include $(YAZINC)
 DEFS=$(CDEFS) $(INCLUDE)
diff --git a/isamc/Makefile.in b/isamc/Makefile.in
index 963bbcd..d8ec6b5 100644
--- a/isamc/Makefile.in
+++ b/isamc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1996-1998, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-09-02 14:15:34 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-10-28 15:20:49 adam Exp $
 
 SHELL=/bin/sh
 
@@ -12,7 +12,7 @@ CDEFS=@DEFS@ @ODEFS@
 LIBS=@LIBS@
 
 YAZLIB=../../yaz/lib/libyaz.a
-YAZINC=-I../../yaz/include
+YAZINC=-I../../yaz/z39.50 -I../../yaz/include
 
 INCLUDE=-I../include $(YAZINC)
 TPROG1=isamctst
diff --git a/recctrl/Makefile.in b/recctrl/Makefile.in
index b59af30..bfea303 100644
--- a/recctrl/Makefile.in
+++ b/recctrl/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1998, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-09-02 14:15:35 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-10-28 15:20:50 adam Exp $
 
 SHELL=/bin/sh
 
@@ -12,7 +12,7 @@ CDEFS=@DEFS@ @ODEFS@
 LIBS=@LIBS@
 
 YAZLIB=../../yaz/lib/libyaz.a
-YAZINC=-I../../yaz/include
+YAZINC=-I../../yaz/z39.50 -I../../yaz/include
 
 INCLUDE=-I../include $(YAZINC)
 DEFS=$(CDEFS) $(INCLUDE)
diff --git a/rset/Makefile.in b/rset/Makefile.in
index 8bc59c5..0a44d96 100644
--- a/rset/Makefile.in
+++ b/rset/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1998, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-09-02 14:15:36 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-10-28 15:20:51 adam Exp $
 
 SHELL=/bin/sh
 
@@ -12,7 +12,7 @@ CDEFS=@DEFS@ @ODEFS@
 LIBS=@LIBS@
 
 YAZLIB=../../yaz/lib/libyaz.a
-YAZINC=-I../../yaz/include
+YAZINC=-I../../yaz/z39.50 -I../../yaz/include
 
 INCLUDE=-I../include $(YAZINC)
 DEFS=$(CDEFS) $(INCLUDE)
diff --git a/util/Makefile.in b/util/Makefile.in
index 87913a5..da0dfe8 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1998, Index Data ApS
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-09-02 14:15:37 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-10-28 15:20:52 adam Exp $
 
 SHELL=/bin/sh
 
@@ -12,7 +12,7 @@ CDEFS=@DEFS@ @ODEFS@
 LIBS=@LIBS@
 
 YAZLIB=../../yaz/lib/libyaz.a
-YAZINC=-I../../yaz/include
+YAZINC=-I../../yaz/z39.50 -I../../yaz/include
 
 INCLUDE=-I../include $(YAZINC)
 TPROG=opt-test
-- 
1.7.10.4