X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=configure.in;h=ac8c16d0fe836982b4ceb5424abafbb4dbe76591;hb=8b80f9fd0ae23ac28b440976486283055d5e1b81;hp=8cb371f1be9c7607d84858d5b581a59ee2bbd9e5;hpb=4b96df0e1f1db0983dff2d019373fea918b8b6ec;p=ir-tcl-moved-to-github.git

diff --git a/configure.in b/configure.in
index 8cb371f..ac8c16d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,44 +1,36 @@
 dnl IR toolkit for tcl/tk
-dnl (c) Index Data 1995
+dnl (c) Index Data 1996
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.9 1995-08-28 12:21:21 adam Exp $
+dnl $Id: configure.in,v 1.14 1996-03-27 08:38:32 adam Exp $
 AC_INIT(ir-tcl.h)
 CC=${CC-cc}
+dnl ------ Substitutions
 AC_SUBST(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, , [LIBS=$tk_oldLibs])
-fi
-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
-AC_STDC_HEADERS
 AC_SUBST(TCLLIB)
-AC_CHECK_LIB(tcl, Tcl_Eval, tclFound=1, tclFound=0, -lm)
-if test "$tclFound" = 1; then
-    TCLLIB=-ltcl 
-elif test -r /usr/local/lib/libtcl7.4.a; then
-    TCLLIB=/usr/local/lib/libtcl7.4.a
-else
-    TCLLIB=/usr/local/lib/libtcl.a
-fi
+AC_SUBST(TKLIB)
+AC_SUBST(TCLINCLUDE)
 AC_SUBST(YAZDIR)
 AC_SUBST(MOSI)
-AC_SUBST(MOSILIB)
 AC_SUBST(MOSIDIR)
+AC_SUBST(MOSILIB)
+AC_SUBST(MOSIINC)
+AC_SUBST(XINCLUDES)
+AC_SUBST(XLIBSW)
+dnl ------ Preliminary settings
+AC_PROG_INSTALL
+AC_PREFIX_PROGRAM(tclsh)
+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 ------ look for YAZ/XTImOSI
 AC_MSG_CHECKING(for YAZ directory)
 AC_ARG_WITH(yazdir,[  --with-yazdir           Yaz directory], [YAZDIR=$withval])
 if test "$YAZDIR" = "yes"; then
-	YAZDIR="../yaz-1.0b3"
+	YAZDIR="../yaz-1.0"
 elif test "$YAZDIR" = ""; then
         YAZDIR="../yaz"
-        for i in ../yaz-1.0b3 ../yaz-1.0b4 ../yaz-1.0 ../yaz; do
+        for i in ../yaz-1.0pl3 ../yaz-1.0pl4 ../yaz-1.0pl5 ../yaz; do
             if test -d $i; then
                 YAZDIR=$i
             fi
@@ -59,14 +51,73 @@ if test -r ${YAZDIR}/lib/librfc.a; then
 	MOSI=1
 	MOSIDIR=$MOSIDIR
 	MOSILIB='$(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
+	MOSIINC='-I$(MOSIDIR)'
         MOSITELL=yes
 else
 	MOSI=0
 	MOSIDIR=$MOSIDIR
-        MOSILIB=''
+        MOSILIB='# $(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
+	MOSIINC='# -I$(MOSIDIR)'
         MOSITELL=no
 fi
 AC_MSG_RESULT($MOSITELL)
+dnl ------ look for Tcl
+if test "x$prefix" = xNONE; then
+	trylib=/usr/local/lib
+else
+	trylib=${prefix}/lib
+fi
+if test -r ${trylib}/tclConfig.sh; then
+	AC_MSG_CHECKING(for Tcl)
+	source ${trylib}/tclConfig.sh
+	LIBS=$TCL_LIBS
+	if test "$TCL_LIB_VERSIONS_OK" = "yes"; then
+		TCLLIB="-L${TCL_PREFIX}/lib -ltcl${TCL_VERSION}"
+	else
+		TCLLIB=${TCL_PREFIX}/lib/${TCL_LIB_FILE}
+	fi
+	TCLINCLUDE=-I${TCL_PREFIX}/include
+	RANLIB=$TCL_RANLIB
+	AC_MSG_RESULT($TCL_VERSION)
+else
+	AC_PROG_RANLIB
+	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, , [LIBS=$tk_oldLibs])
+	fi
+	AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
+	AC_MSG_CHECKING(for Tcl)
+	TCL_VERSION=nope
+	for i in "" 7.4 7.5; do
+		if test -r ${trylib}/libtcl${i}.a; then
+			TCL_VERSION=$i
+		fi
+	done
+	if test "$TCL_VERSION" = nope; then
+		AC_MSG_WARN(Didn't find Tcl)
+		TCLLIB=-ltcl
+		TCLINCLUDE=" # -I.. Tcl/Tk include path"
+	else
+		AC_MSG_RESULT($TCL_VERSION)
+		TCLLIB=${trylib}/libtcl${TCL_VERSION}.a
+		TCLINCLUDE=-I${trylib}
+	fi
+	LIBS="${LIBS} -lm"
+fi
+dnl ------ look for Tk
+TKLIB=-ltk
+for i in .a 4.0.a 4.1.a; do
+	if test -r /usr/local/lib/libtk$i; then
+		TKLIB=/usr/local/lib/libtk$i
+	fi
+done
+dnl ------ look for X11
 AC_PATH_X
 not_really_there=""
 if test "$no_x" = ""; then
@@ -101,7 +152,6 @@ if test "$XINCLUDES" = nope; then
   echo "Warning:  couldn't find any X11 include files."
   XINCLUDES="# no include files found"
 fi
-AC_SUBST(XINCLUDES)
 if test "$no_x" = yes; then
     XLIBSW=nope
     if test "$XLIBSW" = nope; then
@@ -126,14 +176,4 @@ if test "$XLIBSW" = nope ; then
     echo "Warning:  couldn't find the X11 library archive.  Using -lX11."
     XLIBSW=-lX11
 fi
-AC_SUBST(XLIBSW)
-AC_SUBST(TKLIB)
-AC_CHECK_LIB(tk, main, tkFound=1, tkFound=0, $TCLLIB $XLIBSW -lm)
-if test "$tkFound" = 1; then
-    TKLIB=-ltk
-elif test -r /usr/local/lib/libtk4.0.a; then
-    TKLIB=/usr/local/lib/libtk4.0.a
-else
-    TKLIB=/usr/local/lib/libtk.a
-fi
 AC_OUTPUT(Makefile)