X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=7d7d07446a7b30597e1c4f7e6ae5c8f196326429;hb=a1cb24becf02389d1a084d513bb57f6cdf6e82f0;hp=4af9b70290d17e4a223a4a7d34adf581f1467098;hpb=b27753366afbf23f168f3af6aec160e7c22d4157;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index 4af9b70..7d7d074 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1994-1999
-dnl $Id: configure.in,v 1.13 1999-12-09 01:19:14 adam Exp $
+dnl $Id: configure.in,v 1.16 2000-03-01 10:02:04 adam Exp $
 dnl See the file LICENSE.2 for details.
 dnl
 AC_INIT(include/zebraver.h)
@@ -21,10 +21,10 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 dnl
 dnl ------ Create sub directory lib/bin
-if ! test -d lib; then
+if test ! -d lib; then
 	mkdir lib
 fi
-if ! test -d bin; then
+if test ! -d bin; then
 	mkdir bin
 fi
 dnl ------ Build root
@@ -37,13 +37,13 @@ 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        Path for yaz-config], [yazpath=$withval])
+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/include/yaz/yaz-version.h; then
+			if test -r $i/yaz-config; then
 				yazconfig=$i/yaz-config
 			fi
 		fi
@@ -67,15 +67,15 @@ dnl disable Tcl.
 TCL_LIB=""
 TCL_INCLUDE=""
 tclconfig=NONE
-AC_ARG_WITH(tclconfig, [  --with-tclconfig        Path for tclConfig.sh], [tclconfig=$withval])
+AC_ARG_WITH(tclconfig, [  --with-tclconfig=DIR    tclConfig.sh in DIR], [tclconfig=$withval])
 if test "x$tclconfig" = xNONE; then
 	saveprefix=${prefix}
 	AC_PREFIX_PROGRAM(tclsh)
 	tclconfig=${prefix}/lib
 	prefix=${saveprefix}
 fi
+AC_MSG_CHECKING(for Tcl)
 if test -r ${tclconfig}/tclConfig.sh; then
-	AC_MSG_CHECKING(for Tcl)
 	. ${tclconfig}/tclConfig.sh
 	if test -r ${tclconfig}/../generic/tcl.h; then
 		TCL_INCLUDE=-I${tclconfig}/../generic
@@ -91,6 +91,7 @@ if test -r ${tclconfig}/tclConfig.sh; then
         AC_MSG_RESULT($TCL_VERSION)
 	ODEFS="-DHAVE_TCL_H=1"
 else
+        AC_MSG_RESULT(Not found)
 	ODEFS="-DHAVE_TCL_H=0"
 fi
 dnl
@@ -114,29 +115,19 @@ if test -r LICENSE.zmbol; then
 	AC_DEFINE(ZMBOL,1)
 	PROGPREFIX=zmbol
 	SUBDIR="util bfile dfa dict isams isamc isam rset recctrl index"
+	SUBMAKE="Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile isamc/Makefile isam/Makefile rset/Makefile recctrl/Makefile index/Makefile"
 	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"
+	SUBMAKE="Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile rset/Makefile recctrl/Makefile index/Makefile"
 	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)
+AC_OUTPUT($SUBMAKE)