X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=dbf056e38ae4c442cec0817a551be4bb7345cfe4;hp=492aa2c06e2cd7263aad876fc6f3f9608cf705a7;hb=45dcbe04562559c1af90b5049fa1871311907072;hpb=0a50c507e32a11d9ef0d1f8458b02590044f25d5

diff --git a/configure.in b/configure.in
index 492aa2c..dbf056e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,21 +1,59 @@
-# Zebra, Index Data Aps, 1994-1999
-# $Id: configure.in,v 1.6 1999-05-21 11:08:46 adam Exp $
-# See the file LICENSE.2 for details.
-#
+dnl Zebra, Index Data Aps, 1994-1999
+dnl $Id: configure.in,v 1.11 1999-11-30 13:48:03 adam Exp $
+dnl See the file LICENSE.2 for details.
+dnl
 AC_INIT(include/zebraver.h)
-# ------ Substitutions
+dnl ------ Substitutions
 AC_SUBST(ODEFS)
 AC_SUBST(DEFS)
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
-#
-# ------ Checking programs
+AC_SUBST(YAZLIB)
+AC_SUBST(YAZINC)
+dnl
+dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-#
-# look for Tcl
+dnl
+dnl ------ Build root
+AC_SUBST(build_root)
+AC_ARG_WITH(build-root, [  --with-buildroot        RPM Build root],[build_root=$withval],[build_root=""])
+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        Path for yaz-config], [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
+				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
+dnl ------ Look for Tcl
+dnl See if user has specified location of tclConfig.sh; otherwise
+dnl see if tclConfig.sh exists in same prefix lcoation as tclsh; otherwise
+dnl disable Tcl.
 TCL_LIB=""
 TCL_INCLUDE=""
 tclconfig=NONE
@@ -42,29 +80,24 @@ if test -r ${tclconfig}/tclConfig.sh; then
         SHLIB_VERSION=$TCL_SHLIB_VERSION
         AC_MSG_RESULT($TCL_VERSION)
 	ODEFS="-DHAVE_TCL_H=1"
+else
+	ODEFS="-DHAVE_TCL_H=0"
 fi
-#
-# sockets
-checkBoth=0
-AC_CHECK_FUNC(connect)
-if test "$ac_cv_func_connect" = "no"; then
-	AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", checkBoth=1)
-fi
-if test "$checkBoth" = "1"; then
-	oldLibs=$LIBS
-	LIBS="$LIBS -lsocket -lnsl"
-	AC_CHECK_FUNC(accept, , [LIBS=$oldLibs])
+dnl
+dnl ------ times
+AC_CHECK_HEADERS(sys/times.h)
+dnl
+dnl ------- BZIP2
+AC_CHECK_LIB(bz2,bzCompressInit)
+if test "$ac_cv_lib_bz2_bzCompressInit" = "yes"; then
+	AC_CHECK_HEADERS(bzlib.h)
 fi
-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
-#
-# tcpd wrapper
-AC_CHECK_LIB(wrap, main, [LIBS="$LIBS -lwrap"])
-# 
-# headers
+dnl
+dnl ------ ANSI C Header files
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
 fi
-#
-# makefiles
-AC_OUTPUT(Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isam/Makefile isamc/Makefile recctrl/Makefile rset/Makefile index/Makefile)
+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)