X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=518fcf72bbbfec3d539fdf78cc980991753dad0e;hb=d026c3e06f6e19e5ed4174ab1a504a4b5af79183;hp=8556f11e8642e1de6ca63f62938031c440049939;hpb=e4fb6658f65e7986025fdba5137d291b22b8fe71;p=ir-tcl-moved-to-github.git

diff --git a/configure.in b/configure.in
index 8556f11..518fcf7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,88 +1,97 @@
 dnl IR toolkit for tcl/tk
-dnl (c) Index Data 1995
+dnl (c) Index Data 1996-2004
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.2 1995-06-21 15:16:43 adam Exp $
-AC_INIT(README)
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-checkBoth=0
-AC_CHECK_FUNC(connect, tk_checkSocket=0, tk_checkSocket=1)
-if test "$tk_checkSocket" = 1; then
-    AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", checkBoth=1)
-fi
-if test "$checkBoth" = 1; then
-    tk_oldLibs=$LIBS
-    LIBS="$LIBS -lsocket -lnsl"
-    AC_CHECK_FUNC(accept, tk_checkNsl=0, [LIBS=$tk_oldLibs])
-fi
-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
-AC_STDC_HEADERS
+dnl $Id: configure.in,v 1.37 2004-05-04 19:42:56 adam Exp $
+AC_INIT(ir-tcl.h)
+dnl ------ Substitutions
+AC_SUBST(CC)
 AC_SUBST(TCLLIB)
-AC_CHECK_LIB(m, sin)
-tclFound=0
-AC_CHECK_LIB(tcl, Tcl_Eval, tclFound=1)
-if test "$tclFound" = 1; then
-    TCLLIB=-ltcl
-else
-    TCLLIB=/usr/local/lib/libtcl.a
-fi
 AC_SUBST(TKLIB)
-tkFound=0
-AC_CHECK_LIB(tk, Tk_MainLoop, tkFound=1,, -ltcl)
-if test "$tkFound" = 1; then
-    TKLIB=-ltk
-else
-    TKLIB=/usr/local/lib/libtk.a
-fi
-AC_SUBST(YAZDIR)
-AC_SUBST(MOSI)
-AC_SUBST(MOSILIB)
-AC_SUBST(MOSIDIR)
-AC_MSG_CHECKING(for Yaz directory)
-AC_ARG_WITH(yazdir,[  --with-yazdir           Yaz directory], [YAZDIR=$withval])
-if test "$YAZDIR" = "yes"; then
-	YAZDIR="../yaz"
-elif test "$YAZDIR" = ""; then
-	YAZDIR="../yaz"
-	if test -d "../yaz-1.0b"; then
-		YAZDIR="../yaz-1.0b"
+AC_SUBST(TCLINC)
+AC_SUBST(TKINC)
+AC_SUBST(SHLIB_CFLAGS)
+AC_SUBST(SHLIB_LD)
+AC_SUBST(SHLIB_SUFFIX)
+AC_SUBST(SHLIB_VERSION)
+AC_SUBST(SHLIB_IRTCL)
+AC_SUBST(ALL_SPEC)
+AC_SUBST(IRCLIENT_SHELL)
+AC_SUBST(RANLIB)
+dnl
+dnl ------ Preliminary settings
+AC_PROG_INSTALL
+dnl
+dnl ------ YAZ
+YAZ_INIT
+dnl
+dnl ------ look for Tcl
+tclconfig=NONE
+AC_ARG_WITH(tclconfig, [  --with-tclconfig=DIR    tclConfig.sh in DIR (example /usr/lib)], [tclconfig=$withval])
+if test "x$tclconfig" = xNONE; then
+        saveprefix=${prefix}
+	AC_PREFIX_PROGRAM(tclsh)
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh8.3)
 	fi
-fi
-AC_MSG_RESULT($YAZDIR)
-if test ! -d $YAZDIR; then
-	AC_MSG_WARN(Yaz directory doesnt exist)
-fi
-AC_MSG_CHECKING(for MOSI)
-AC_ARG_WITH(mosidir, [  --with-mosidir          MOSI directory], [MOSIDIR=$withval])
-if test "$MOSIDIR" = "yes"; then
-	MOSIDIR="../xtimosi/src"
-elif test "$MOSIDIR" = ""; then
-	MOSIDIR="../xtimosi/src"
-fi
-if test -r ${YAZDIR}/lib/librfc.a; then
-	MOSI=1
-	MOSIDIR=$MOSIDIR
-	MOSILIB='$(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
-        MOSITELL=yes
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh8.2)
+	fi
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh8.1)
+	fi
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh8.0)
+	fi
+	if test "x$prefix" = xNONE; then
+		AC_PREFIX_PROGRAM(tclsh7.6)
+	fi
+	if test "x$prefix" = xNONE; then
+		prefix=/usr/local
+	fi
+        tclconfig=${prefix}/lib
+        IRCLIENT_SHELL=${prefix}/bin/wish
+        prefix=${saveprefix}
+        if test ! -r ${tclconfig}/tclConfig.sh; then
+                # Not found, try search for Tcl on Debian systems.
+                for d in /usr/lib/tcl*; do
+                        if test -f $d/tclConfig.sh; then
+                                tclconfig=$d
+        			IRCLIENT_SHELL=/usr/bin/wish
+                        fi
+                done
+        fi
 else
-	MOSI=0
-	MOSIDIR=$MOSIDIR
-        MOSILIB=''
-        MOSITELL=no
+        IRCLIENT_SHELL=/usr/bin/wish
 fi
-AC_MSG_RESULT($MOSITELL)
-AC_SUBST(XINCLUDE)
-AC_SUBST(XLIB)
-AC_FIND_X
-if test "x$x_includes" != x; then
-	XINCLUDE=-I$x_includes
-else
-	XINCLUDE=""
+AC_MSG_CHECKING(for Tcl)
+if test -f ${tclconfig}/tclConfig.sh; then
+	tclconfig=${tclconfig}/tclConfig.sh
 fi
-if test "x$x_libraries" != x; then
-	XLIB=-L$x_libraries
+if test -f ${tclconfig}; then
+	. ${tclconfig}
+	TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
+	if test -d ${TCL_PREFIX}/include/tcl${TCL_VERSION}; then
+		TCLINC=-I${TCL_PREFIX}/include/tcl${TCL_VERSION}
+	elif test "${TCL_PREFIX}" = "/usr"; then
+		TCLINC=""
+	else
+		TCLINC=-I${TCL_PREFIX}/include
+	fi
+	RANLIB=$TCL_RANLIB
+        SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
+	SHLIB_LD=$TCL_SHLIB_LD
+	SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
+	SHLIB_VERSION=$TCL_SHLIB_VERSION
+	SHLIB_IRTCL=irtcl${TCL_SHLIB_SUFFIX}
+	ALL_SPEC="irtcl${TCL_SHLIB_SUFFIX} libirtcl.a"
+	AC_MSG_RESULT($TCL_VERSION)
+	CC=$TCL_CC
 else
-	XLIB=""
+	AC_MSG_RESULT(not found)
+	SHLIB_IRTCL=irtcl-shared
+	ALL_SPEC="ir-tcl"
+	CC=gcc
+	RANLIB=ranlib
 fi
+dnl 
 AC_OUTPUT(Makefile)