X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=9bf50f733bcbdf716b8c7353dc1cfae56a0e4888;hb=cdd0717baa6ed75b645c1c0bcabec5fa59335cf3;hp=278026bda937559981211ad2dbcd5596167768c7;hpb=cbc20dd0b142fcf6e0b6540c9ef69e1254867d01;p=ir-tcl-moved-to-github.git

diff --git a/configure.in b/configure.in
index 278026b..9bf50f7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,130 +1,151 @@
 dnl IR toolkit for tcl/tk
-dnl (c) Index Data 1996
+dnl (c) Index Data 1996-1999
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.15 1996-03-27 17:00:08 adam Exp $
+dnl $Id: configure.in,v 1.25 1999-11-30 14:05:58 adam Exp $
 AC_INIT(ir-tcl.h)
 CC=${CC-cc}
 dnl ------ Substitutions
 AC_SUBST(CC)
 AC_SUBST(TCLLIB)
 AC_SUBST(TKLIB)
-AC_SUBST(TCLINCLUDE)
-AC_SUBST(TKINCLUDE)
-AC_SUBST(YAZDIR)
-AC_SUBST(MOSI)
-AC_SUBST(MOSIDIR)
-AC_SUBST(MOSILIB)
-AC_SUBST(MOSIINC)
+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(YAZLIB)
+AC_SUBST(YAZINC)
+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 ------ 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.0"
-elif test "$YAZDIR" = ""; then
-        YAZDIR="../yaz"
-        for i in ../yaz-1.0pl3 ../yaz-1.0pl4 ../yaz-1.0pl5 ../yaz; do
-            if test -d $i; then
-                YAZDIR=$i
-            fi
-        done
-fi
-if test ! -d $YAZDIR; then
-	AC_MSG_WARN(YAZ directory ${YAZDIR} doesn't exist)
+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
-	AC_MSG_RESULT($YAZDIR)
-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"
+        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
-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
+AC_MSG_CHECKING(for YAZ)
+if test -r $yazconfig; then
+        . $yazconfig
+        AC_MSG_RESULT($yazconfig)
 else
-	MOSI=0
-	MOSIDIR=$MOSIDIR
-        MOSILIB='# $(MOSIDIR)/libmosi.a $(YAZDIR)/lib/librfc.a'
-	MOSIINC='# -I$(MOSIDIR)'
-        MOSITELL=no
+        AC_MSG_RESULT(Not found)
 fi
-AC_MSG_RESULT($MOSITELL)
+dnl
 dnl ------ look for Tcl
-if test "x$prefix" = xNONE; then
-	tryprefix=/usr/local
-else
+tclconfig=NONE
+tryprefix=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)
+	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
+		AC_PREFIX_PROGRAM(tclsh7.5)
+	fi
+	if test "x$prefix" = xNONE; then
+		prefix=/usr/local
+	fi
+        tclconfig=${prefix}/lib
 	tryprefix=${prefix}
+        prefix=${saveprefix}
 fi
-if test -r ${tryprefix}/lib/tclConfig.sh; then
+if test -r ${tclconfig}/tclConfig.sh; then
 	AC_MSG_CHECKING(for Tcl)
-	source ${tryprefix}/lib/tclConfig.sh
-	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
-	TCLLIB="${TCLLIB} ${TCL_LIBS}"
-	TCLINCLUDE=-I${TCL_PREFIX}/include
+	. ${tclconfig}/tclConfig.sh
+	TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
+	TCLINC=-I${TCL_PREFIX}/include
 	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)
 else
+        SHLIB_CFLAGS=""
+	SHLIB_LD="shared-linker"
+	SHLIB_SUFFIX=""
+	SHLIB_VERSION=""
+	SHLIB_IRTCL="irtcl-shared"
 	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
+	for i in "" 7.4 7.5 7.6 8.0; do
 		if test -r ${tryprefix}/lib/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"
+		TCL_LIB_SPEC=-ltcl
+		TCLINC=" # -I.. Tcl/Tk include path"
 	else
 		if test "$TCL_VERSION" = ""; then
 			AC_MSG_RESULT(7.3)
 		else
 			AC_MSG_RESULT($TCL_VERSION)
 		fi
-		TCLLIB=${tryprefix}/lib/libtcl${TCL_VERSION}.a
-		TCLINCLUDE=-I${tryprefix}/include
+		TCL_LIB_SPEC=${tryprefix}/lib/libtcl${TCL_VERSION}.a
+		TCLINC=-I${tryprefix}/include
 	fi
-	TCLLIB="${TCLLIB} ${LIBS} -lm"
+	TCLLIB="${TCL_LIB_SPEC} ${LIBS} -lm"
+	ALL_SPEC="ir-tcl ir-tk"
 fi
+dnl 
 dnl ------ look for Tk
-if test -r ${tryprefix}/lib/tkConfig.sh; then
+dnl
+if test -r ${tclconfig}/tkConfig.sh; then
 	AC_MSG_CHECKING(for Tk)
-	source ${tryprefix}/lib/tkConfig.sh
+	. ${tclconfig}/tkConfig.sh
 	AC_MSG_RESULT($TK_VERSION)
-	TKINCLUDE=${TK_XINCLUDES}
-	TKLIB="${TK_PREFIX}/lib/${TK_LIB_FILE} ${TK_LIBS}"
+	TKINC=${TK_XINCLUDES}
+	TKLIB="${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS}"
+	IRCLIENT_SHELL=wish${TK_VERSION}
 else
 	AC_MSG_CHECKING(for Tk)
 	TK_VERSION=nope
-	for i in "" 4.0 4.1; do
+	for i in "" 4.0 4.1 4.2 8.0; do
 		if test -r ${tryprefix}/lib/libtk${i}.a; then
 			TK_VERSION=$i
 		fi
@@ -140,7 +161,6 @@ else
 			AC_MSG_RESULT($TK_VERSION)
 		fi
 	fi
-	TKLIB=${tryprefix}/lib/libtk${i}.a
 	AC_PATH_X
 	not_really_there=""
 	if test "$no_x" = ""; then
@@ -198,7 +218,8 @@ else
 		echo "Warning:  couldn't find the X11 library archive.  Using -lX11."
 		XLIBSW=-lX11
 	fi
-	TKINCLUDE=$XINCLUDE
+	TKINC=$XINCLUDES
 	TKLIB="${TKLIB} ${XLIBSW} ${TCLLIB}"
+	IRCLIENT_SHELL=ir-tk
 fi
 AC_OUTPUT(Makefile)