Minor.

[idzebra-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index fdd51c8..2c0dc13 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,25 +1,52 @@
-dnl YAZ/Zebra Toolkit
-dnl (c) Index Data 1994-1998
-dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.1 1998-09-02 14:15:26 adam Exp $
+# Zebra, Index Data Aps, 1994-1999
+# $Id: configure.in,v 1.7 1999-05-21 12:00:17 adam Exp $
+# See the file LICENSE.2 for details.
+#
 AC_INIT(include/zebraver.h)
-dnl ------ Substitutions
+# ------ 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_SUBST(DEFS)
+AC_SUBST(TCL_INCLUDE)
+AC_SUBST(TCL_LIB)
+#
+# ------ Checking programs
+AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-dnl
-dnl ----- Sockets
+#
+# look for Tcl
+TCL_LIB=""
+TCL_INCLUDE=""
+tclconfig=NONE
+AC_ARG_WITH(tclconfig, [  --with-tclconfig        Path for tclConfig.sh], [tclconfig=$withval])
+if test "x$tclconfig" = xNONE; then
+       saveprefix=${prefix}
+       AC_PREFIX_PROGRAM(tclsh)
+       tclconfig=${prefix}/lib
+       prefix=${saveprefix}
+fi
+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
+               TCL_LIB="$TCL_BUILD_LIB_SPEC $TCL_LIBS"
+       else
+               TCL_INCLUDE=-I${TCL_PREFIX}/include
+               TCL_LIB="$TCL_LIB_SPEC $TCL_LIBS"
+       fi
+        SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
+        SHLIB_LD=$TCL_SHLIB_LD
+        SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
+        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
@@ -31,24 +58,15 @@ if test "$checkBoth" = "1"; then
        AC_CHECK_FUNC(accept, , [LIBS=$oldLibs])
 fi
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
-dnl
-dnl ------ Threads
-AC_ARG_ENABLE(threads, [  --enable-threads        enable threads if available],
-    [threads_ok=$enableval], [threads_ok=no])
-if test "$threads_ok" = "yes"; then
-       AC_CHECK_HEADERS(pthread.h threads.h)
-       AC_CHECK_FUNC(pthread_mutex_lock)
-       if test "$ac_cv_func_pthread_mutex_lock" = "no"; then
-               AC_CHECK_LIB(pthread, main)
-       fi
-       ODEFS="$ODEFS -D_REENTRANT"
-fi
-dnl
-dnl ------ Headers
+#
+# tcpd wrapper
+AC_CHECK_LIB(wrap, main, [LIBS="$LIBS -lwrap"])
+# 
+# headers
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
        AC_MSG_WARN(Your system doesn't seem to support ANSI C)
 fi
-dnl
-dnl ------ Makefiles
+#
+# makefiles
 AC_OUTPUT(Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isam/Makefile isamc/Makefile recctrl/Makefile rset/Makefile index/Makefile)