[csw-devel] SF.net SVN: gar:[8362] csw/mgar/pkg
hson at users.sourceforge.net
hson at users.sourceforge.net
Fri Feb 5 18:01:52 CET 2010
Revision: 8362
http://gar.svn.sourceforge.net/gar/?rev=8362&view=rev
Author: hson
Date: 2010-02-05 17:01:51 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
expect: Initial commit
Added Paths:
-----------
csw/mgar/pkg/expect/
csw/mgar/pkg/expect/Makefile
csw/mgar/pkg/expect/branches/
csw/mgar/pkg/expect/tags/
csw/mgar/pkg/expect/trunk/
csw/mgar/pkg/expect/trunk/Makefile
csw/mgar/pkg/expect/trunk/checksums
csw/mgar/pkg/expect/trunk/files/
csw/mgar/pkg/expect/trunk/files/expect-5.39.0-libdir.patch
csw/mgar/pkg/expect/trunk/files/expect-5.42.1-missing-includes.patch
csw/mgar/pkg/expect/trunk/files/expect-5.42.1-multilib.patch
csw/mgar/pkg/expect/trunk/files/expect-5.43.0-avoid-tcl-internals-1.patch
csw/mgar/pkg/expect/trunk/files/expect-5.43.0-missing-includes.patch
csw/mgar/pkg/expect/trunk/files/expect-5.43.0-multilib.patch
csw/mgar/pkg/expect/trunk/files/expect-5.44.1-destdir.patch
csw/mgar/pkg/expect/trunk/files/expect-5.44.1-gfbsd.patch
csw/mgar/pkg/expect/trunk/files/expect.m4
Added: csw/mgar/pkg/expect/Makefile
===================================================================
--- csw/mgar/pkg/expect/Makefile (rev 0)
+++ csw/mgar/pkg/expect/Makefile 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+ @echo "You are in the pkg/ directory."
+
+%:
+ $(MAKE) -C trunk $*
+
+paranoid-%:
+ $(MAKE) -C trunk $* || exit 2
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+ $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG)
Property changes on: csw/mgar/pkg/expect/trunk
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Added: svn:externals
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Added: csw/mgar/pkg/expect/trunk/Makefile
===================================================================
--- csw/mgar/pkg/expect/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/expect/trunk/Makefile 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,71 @@
+GARNAME = expect
+GARVERSION = 5.43
+CATEGORIES = utils
+
+DESCRIPTION = Tool for automating interactive applications
+define BLURB
+Expect is a tool for automating interactive applications such as telnet, ftp, passwd, fsck, rlogin, tip, etc. Expect really makes this stuff trivial. Expect is also useful for testing these same applications. And by adding Tk, you can also wrap interactive applications in X11 GUIs.
+
+Expect can make easy all sorts of tasks that are prohibitively difficult with anything else. You will find that Expect is an absolutely invaluable tool - using it, you will be able to automate tasks that you've never even thought of before - and you'll be able to do this automation quickly and easily.
+endef
+
+# For some reason upstream have recalled 5.44.1 and has 5.43 as primary on
+# homepage as expect.tar.gz
+MASTER_SITES = http://expect.nist.gov/
+DISTNAME = $(GARNAME)-$(GARVERSION)
+DISTFILES = $(GARNAME).tar.gz
+DISTFILES += expect.m4
+
+PATCHFILES += expect-5.39.0-libdir.patch
+#PATCHFILES += expect-5.42.1-missing-includes.patch
+#PATCHFILES += expect-5.42.1-multilib.patch
+PATCHFILES += expect-5.43.0-avoid-tcl-internals-1.patch
+PATCHFILES += expect-5.43.0-missing-includes.patch
+PATCHFILES += expect-5.43.0-multilib.patch
+#PATCHFILES += expect-5.44.1-destdir.patch
+#PATCHFILES += expect-5.44.1-gfbsd.patch
+
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+# UPSTREAM_MASTER_SITES =
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-shared
+CONFIGURE_ARGS += --with-tcl=/opt/csw/lib --with-tk=/opt/csw/lib
+CONFIGURE_ARGS += --with-tclinclude=/export/home/hson/dev/mgar/pkg/tcl/trunk/work/solaris8-sparc/./build-isa-sparcv8/tcl8.5.7/generic/
+CONFIGURE_ARGS += --with-tkinclude=/export/home/hson/dev/mgar/pkg/tk/trunk/work/solaris8-sparc/./build-isa-sparcv8/tk8.5.7/generic/
+
+TEST_TARGET =
+
+include gar/category.mk
+
+pre-configure-modulated:
+ ( cd $(WORKSRC); mv ../expect.m4 .; )
+ ( cd $(WORKSRC); \
+ gsed -i.orig 's#/usr/local/bin#/opt/csw/bin#' expect.man ; \
+ gsed -i.orig 's#/usr/local/bin#/opt/csw/bin#' expectk.man ; \
+ )
+ #stops any example scripts being installed by default
+ ( cd $(WORKSRC); \
+ gsed -i.orig \
+ -e '/^install:/s/install-libraries //' \
+ -e 's/^SCRIPTS_MANPAGES = /_&/' \
+ Makefile.in ; \
+ )
+ #fixes "TCL_REG_BOSONLY undeclared" error due to a change in tcl8.5
+ ( cd $(WORKSRC); \
+ gsed -i.orig -e 's/^#include "tcl.h"/#include "tclInt.h"/' \
+ exp_inter.c exp_command.c ; \
+ )
+ #fix missing define of HAVE_UNISTD_H in Dbg.c
+ ( cd $(WORKSRC); \
+ gsed -i.orig -e 's/^\(#include <stdio\.h>\)/\1\n#include "expect_cf.h"/' \
+ Dbg.c ; \
+ )
+# @( cd $(WORKSRC); aclocal;autoconf)
+ @$(MAKECOOKIE)
+
+configure-%/configure:
+ @echo " ==> Running configure in $*"
+ cd $* && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS)
+ @$(MAKECOOKIE)
Added: csw/mgar/pkg/expect/trunk/checksums
===================================================================
--- csw/mgar/pkg/expect/trunk/checksums (rev 0)
+++ csw/mgar/pkg/expect/trunk/checksums 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,7 @@
+c458386d5502fab2b49da03d16fb108c expect-5.39.0-libdir.patch
+5661004ca23ddc9592f488142367c2f5 expect-5.43.0-avoid-tcl-internals-1.patch
+3d67a79c1d7790c7e49b5df7f57b0290 expect-5.43.0-missing-includes.patch
+2103ff302f6e8a0dd748772f6512b3a5 expect-5.43.0-multilib.patch
+af7966f18f7ebc7ec48b7a6e095e90ff expect-5.44.1-destdir.patch
+595b7a7c63f7ddb42e19c2537bb2891b expect.m4
+43e1dc0e0bc9492cf2e1a6f59f276bc3 expect.tar.gz
Added: csw/mgar/pkg/expect/trunk/files/expect-5.39.0-libdir.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/expect-5.39.0-libdir.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/expect-5.39.0-libdir.patch 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,11 @@
+--- expect-5.39/Makefile.in.libdir 2003-07-30 00:46:51.000000000 +0200
++++ expect-5.39/Makefile.in 2003-11-17 17:54:52.000000000 +0100
+@@ -316,7 +316,7 @@
+ CFLAGS_INT = $(MH_CFLAGS) $(CPPFLAGS) $(XCFLAGS)
+
+ LIB_INSTALL_DIR = $(tcl_libdir)
+-LIB_RUNTIME_DIR = $(tcl_libdir)
++LIB_RUNTIME_DIR = $(subst $(INSTALL_ROOT),,$(tcl_libdir))
+ # I don't understand why Tcl splits these up, but it does. LIB_RUNTIME_DIR
+ # can appear as part of the LD_SEARCH_FLAGS inherited by configure.
+
Added: csw/mgar/pkg/expect/trunk/files/expect-5.42.1-missing-includes.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/expect-5.42.1-missing-includes.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/expect-5.42.1-missing-includes.patch 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,33 @@
+diff -urN expect-5.42.orig/exp_glob.c expect-5.42/exp_glob.c
+--- expect-5.42.orig/exp_glob.c 2009-06-02 00:07:02.429807485 -0400
++++ expect-5.42/exp_glob.c 2009-06-02 00:09:05.039817979 -0400
+@@ -11,6 +11,7 @@
+
+ */
+
++#include <string.h>
+ #include "expect_cf.h"
+ #include "tcl.h"
+ #include "exp_int.h"
+diff -urN expect-5.42.orig/exp_main_exp.c expect-5.42/exp_main_exp.c
+--- expect-5.42.orig/exp_main_exp.c 2009-06-02 00:07:02.429807485 -0400
++++ expect-5.42/exp_main_exp.c 2009-06-02 00:08:09.867365455 -0400
+@@ -9,6 +9,7 @@
+
+ #include "expect_cf.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "tcl.h"
+ #include "expect_tcl.h"
+
+diff -urN expect-5.42.orig/pty_termios.c expect-5.42/pty_termios.c
+--- expect-5.42.orig/pty_termios.c 2009-06-02 00:07:02.449818499 -0400
++++ expect-5.42/pty_termios.c 2009-06-02 00:08:41.878505396 -0400
+@@ -8,6 +8,7 @@
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include <signal.h>
+
+ #if defined(SIGCLD) && !defined(SIGCHLD)
Added: csw/mgar/pkg/expect/trunk/files/expect-5.42.1-multilib.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/expect-5.42.1-multilib.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/expect-5.42.1-multilib.patch 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,11 @@
+--- expect-5.42/configure.in.orig 2004-12-21 03:02:36.095170881 -0800
++++ expect-5.42/configure.in 2004-12-21 03:03:08.987170537 -0800
+@@ -1141,7 +1141,7 @@
+ fi
+
+ EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}${DBGX}"
+-EXP_LIB_SPEC="-L\${INSTALL_ROOT}\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}${DBGX}"
++EXP_LIB_SPEC="-L\${libdir} -lexpect${EXP_LIB_VERSION}${DBGX}"
+ EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}${DBGX}.a
+
+ # The TCL_SHARED_LIB_SUFFIX macro below relies on the DBGX macro,
Added: csw/mgar/pkg/expect/trunk/files/expect-5.43.0-avoid-tcl-internals-1.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/expect-5.43.0-avoid-tcl-internals-1.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/expect-5.43.0-avoid-tcl-internals-1.patch 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,100 @@
+Submitted By: Bryan Kadzban <bryan at kadzban.is-a-geek.net>
+Date: 2008-01-12
+Initial Package Version: 5.43
+Upstream status: Not Submitted - Test Version
+Origin: LFS ticket 2126 (http://wiki.linuxfromscratch.org/lfs/ticket/2126)
+Description: Removes references to functions that Tcl 8.5 no longer exposes.
+
+diff -Naur expect-5.43/exp_command.c expect-5.43-patched/exp_command.c
+--- expect-5.43/exp_command.c 2004-08-20 13:18:01.000000000 -0400
++++ expect-5.43-patched/exp_command.c 2008-01-12 11:42:45.000000000 -0500
+@@ -2265,6 +2265,8 @@
+ /*NOTREACHED*/
+ }
+
++static struct exp_cmd_data cmd_data[];
++
+ /*ARGSUSED*/
+ static int
+ Exp_CloseObjCmd(clientData, interp, objc, objv)
+@@ -2311,12 +2313,23 @@
+ /* Historical note: we used "close" long before there was a */
+ /* Tcl builtin by the same name. */
+
++ /* The code that registered this function as the handler for */
++ /* the "close" command stored away the old handler in the */
++ /* exp_cmd_data for the "close" command. */
++
++ struct exp_cmd_data *cmd_ptr;
+ Tcl_CmdInfo info;
++
++ for(cmd_ptr = &cmd_data[0]; cmd_ptr->name; cmd_ptr++) {
++ if(strncmp(cmd_ptr->name, "close", 5) == 0)
++ break;
++ }
++
+ Tcl_ResetResult(interp);
+ if (0 == Tcl_GetCommandInfo(interp,"close",&info)) {
+ info.clientData = 0;
+ }
+- return(Tcl_CloseObjCmd(info.clientData,interp,objc_orig,objv_orig));
++ return(cmd_ptr->old_objProc(info.clientData,interp,objc_orig,objv_orig));
+ }
+
+ if (chanName) {
+@@ -2961,7 +2974,10 @@
+ /* if successful (i.e., TCL_RETURN is returned) */
+ /* modify the result, so that we will handle it specially */
+
+- int result = Tcl_ReturnObjCmd(clientData,interp,objc,objv);
++ Tcl_CmdInfo info;
++ Tcl_GetCommandInfo(interp, "return", &info);
++
++ int result = info.objProc(clientData,interp,objc,objv);
+ if (result == TCL_RETURN)
+ result = EXP_TCL_RETURN;
+ return result;
+@@ -3062,8 +3078,7 @@
+
+ for (;c->name;c++) {
+ /* if already defined, don't redefine */
+- if ((c->flags & EXP_REDEFINE) ||
+- !(Tcl_FindHashEntry(&globalNsPtr->cmdTable,c->name) ||
++ if (!(Tcl_FindHashEntry(&globalNsPtr->cmdTable,c->name) ||
+ Tcl_FindHashEntry(&currNsPtr->cmdTable,c->name))) {
+ if (c->objproc)
+ Tcl_CreateObjCommand(interp,c->name,
+@@ -3072,6 +3087,21 @@
+ Tcl_CreateCommand(interp,c->name,c->proc,
+ c->data,exp_deleteProc);
+ }
++ else if (c->flags & EXP_REDEFINE) { /* unless the REDEFINE flag is present */
++ Tcl_CmdInfo info;
++
++ if (Tcl_GetCommandInfo(interp, c->name, &info)) {
++ c->old_proc = info.proc;
++ c->old_objProc = info.objProc;
++ }
++
++ if (c->objproc)
++ Tcl_CreateObjCommand(interp,c->name,
++ c->objproc,c->data,exp_deleteObjProc);
++ else
++ Tcl_CreateCommand(interp,c->name,c->proc,
++ c->data,exp_deleteProc);
++ }
+ if (!(c->name[0] == 'e' &&
+ c->name[1] == 'x' &&
+ c->name[2] == 'p')
+diff -Naur expect-5.43/exp_command.h expect-5.43-patched/exp_command.h
+--- expect-5.43/exp_command.h 2008-01-12 11:44:11.000000000 -0500
++++ expect-5.43-patched/exp_command.h 2008-01-12 11:26:05.000000000 -0500
+@@ -297,6 +297,8 @@
+ Tcl_CmdProc *proc;
+ ClientData data;
+ int flags;
++ Tcl_CmdProc *old_proc; /* these store the procedure for the old command, */
++ Tcl_ObjCmdProc *old_objProc; /* if any */
+ };
+
+ EXTERN void exp_create_commands _ANSI_ARGS_((Tcl_Interp *,
Added: csw/mgar/pkg/expect/trunk/files/expect-5.43.0-missing-includes.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/expect-5.43.0-missing-includes.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/expect-5.43.0-missing-includes.patch 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,44 @@
+diff -urpN expect-5.43.orig/exp_glob.c expect-5.43/exp_glob.c
+--- expect-5.43.orig/exp_glob.c 2009-06-07 19:36:31.000000000 +0200
++++ expect-5.43/exp_glob.c 2009-06-07 19:39:04.000000000 +0200
+@@ -11,6 +11,7 @@ would appreciate credit if this program
+
+ */
+
++#include <string.h>
+ #include "expect_cf.h"
+ #include "tcl.h"
+ #include "exp_int.h"
+diff -urpN expect-5.43.orig/exp_main_exp.c expect-5.43/exp_main_exp.c
+--- expect-5.43.orig/exp_main_exp.c 2009-06-07 19:36:31.000000000 +0200
++++ expect-5.43/exp_main_exp.c 2009-06-07 19:37:39.000000000 +0200
+@@ -9,6 +9,7 @@ would appreciate credit if this program
+
+ #include "expect_cf.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "tcl.h"
+ #include "expect_tcl.h"
+
+diff -urpN expect-5.43.orig/exp_trap.c expect-5.43/exp_trap.c
+--- expect-5.43.orig/exp_trap.c 2009-06-07 19:36:31.000000000 +0200
++++ expect-5.43/exp_trap.c 2009-06-07 19:38:51.000000000 +0200
+@@ -11,6 +11,7 @@ would appreciate credit if this program
+ #include "expect_cf.h"
+
+ #include <stdio.h>
++#include <string.h>
+ #include <signal.h>
+ #include <sys/types.h>
+
+diff -urpN expect-5.43.orig/pty_termios.c expect-5.43/pty_termios.c
+--- expect-5.43.orig/pty_termios.c 2009-06-07 19:36:31.000000000 +0200
++++ expect-5.43/pty_termios.c 2009-06-07 19:38:19.000000000 +0200
+@@ -8,6 +8,7 @@ would appreciate credit if you use this
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include <signal.h>
+
+ #if defined(SIGCLD) && !defined(SIGCHLD)
Added: csw/mgar/pkg/expect/trunk/files/expect-5.43.0-multilib.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/expect-5.43.0-multilib.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/expect-5.43.0-multilib.patch 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,11 @@
+--- expect-5.42/configure.in.orig 2004-12-21 03:02:36.095170881 -0800
++++ expect-5.42/configure.in 2004-12-21 03:03:08.987170537 -0800
+@@ -1141,7 +1141,7 @@
+ fi
+
+ EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}${DBGX}"
+-EXP_LIB_SPEC="-L\${INSTALL_ROOT}\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}${DBGX}"
++EXP_LIB_SPEC="-L\${libdir} -lexpect${EXP_LIB_VERSION}${DBGX}"
+ EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}${DBGX}.a
+
+ # The TCL_SHARED_LIB_SUFFIX macro below relies on the DBGX macro,
Added: csw/mgar/pkg/expect/trunk/files/expect-5.44.1-destdir.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/expect-5.44.1-destdir.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/expect-5.44.1-destdir.patch 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,21 @@
+--- Makefile.in.orig 2008-10-26 13:15:44.000000000 +0100
++++ Makefile.in 2008-10-26 13:16:25.000000000 +0100
+@@ -256,14 +256,14 @@ install-doc: doc
+ @mkdir -p $(DESTDIR)$(mandir)/man3
+ @echo "Installing documentation in $(DESTDIR)$(mandir)"
+ # install Expectk man page if present
+- $(INSTALL_DATA) $(srcdir)/expectk.man $(mandir)/man1/expectk.1 ; \
++ $(INSTALL_DATA) $(srcdir)/expectk.man $(DESTDIR)$(mandir)/man1/expectk.1 ; \
+ # install Expect man page
+- $(INSTALL_DATA) $(srcdir)/expect.man $(mandir)/man1/expect.1
++ $(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(mandir)/man1/expect.1
+ # install man page for Expect and Expectk libraries
+- $(INSTALL_DATA) $(srcdir)/libexpect.man $(mandir)/man3/libexpect.3
++ $(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3
+ -for i in $(SCRIPT_MANPAGE_LIST) ; do \
+ if [ -f $(srcdir)/example/$$i.man ] ; then \
+- $(INSTALL_DATA) $(srcdir)/example/$$i.man $(mandir)/man1/$$i.1 ; \
++ $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/$$i.1 ; \
+ else true; fi ; \
+ done
+
Added: csw/mgar/pkg/expect/trunk/files/expect-5.44.1-gfbsd.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/expect-5.44.1-gfbsd.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/expect-5.44.1-gfbsd.patch 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,19 @@
+Index: expect-5.44.1/tclconfig/tcl.m4
+===================================================================
+--- expect-5.44.1.orig/tclconfig/tcl.m4
++++ expect-5.44.1/tclconfig/tcl.m4
+@@ -1395,12 +1395,12 @@ dnl AC_CHECK_TOOL(AR, ar, :)
+ FreeBSD-*)
+ # FreeBSD 3.* and greater have ELF.
+ SHLIB_CFLAGS="-fPIC"
+- SHLIB_LD="ld -Bshareable -x"
++ SHLIB_LD="${CC} -shared"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
+- LDFLAGS="$LDFLAGS -export-dynamic"
++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ if test "${TCL_THREADS}" = "1" ; then
+ # The -pthread needs to go in the CFLAGS, not LIBS
Added: csw/mgar/pkg/expect/trunk/files/expect.m4
===================================================================
--- csw/mgar/pkg/expect/trunk/files/expect.m4 (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/expect.m4 2010-02-05 17:01:51 UTC (rev 8362)
@@ -0,0 +1,609 @@
+dnl written by Rob Savoye <rob at cygnus.com> for Cygnus Support
+dnl major rewriting for Tcl 7.5 by Don Libes <libes at nist.gov>
+
+dnl CY_AC_PATH_TCLCONFIG and CY_AC_LOAD_TCLCONFIG should be invoked
+dnl (in that order) before any other TCL macros. Similarly for TK.
+
+dnl CYGNUS LOCAL: This gets the right posix flag for gcc
+AC_DEFUN(CY_AC_TCL_LYNX_POSIX,
+[AC_REQUIRE([AC_PROG_CC])AC_REQUIRE([AC_PROG_CPP])
+AC_MSG_CHECKING([if running LynxOS])
+AC_CACHE_VAL(ac_cv_os_lynx,
+[AC_EGREP_CPP(yes,
+[/*
+ * The old Lynx "cc" only defines "Lynx", but the newer one uses "__Lynx__"
+ */
+#if defined(__Lynx__) || defined(Lynx)
+yes
+#endif
+], ac_cv_os_lynx=yes, ac_cv_os_lynx=no)])
+#
+if test "$ac_cv_os_lynx" = "yes" ; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(LYNX)
+ AC_MSG_CHECKING([whether -mposix or -X is available])
+ AC_CACHE_VAL(ac_cv_c_posix_flag,
+ [AC_TRY_COMPILE(,[
+ /*
+ * This flag varies depending on how old the compiler is.
+ * -X is for the old "cc" and "gcc" (based on 1.42).
+ * -mposix is for the new gcc (at least 2.5.8).
+ */
+ #if defined(__GNUC__) && __GNUC__ >= 2
+ choke me
+ #endif
+ ], ac_cv_c_posix_flag=" -mposix", ac_cv_c_posix_flag=" -X")])
+ CC="$CC $ac_cv_c_posix_flag"
+ AC_MSG_RESULT($ac_cv_c_posix_flag)
+ else
+ AC_MSG_RESULT(no)
+fi
+])
+
+#
+# Sometimes the native compiler is a bogus stub for gcc or /usr/ucb/cc. This
+# makes configure think it's cross compiling. If --target wasn't used, then
+# we can't configure, so something is wrong. We don't use the cache
+# here cause if somebody fixes their compiler install, we want this to work.
+AC_DEFUN(CY_AC_C_WORKS,
+[# If we cannot compile and link a trivial program, we can't expect anything to work
+AC_MSG_CHECKING(whether the compiler ($CC) actually works)
+AC_TRY_COMPILE(, [/* don't need anything here */],
+ c_compiles=yes, c_compiles=no)
+
+AC_TRY_LINK(, [/* don't need anything here */],
+ c_links=yes, c_links=no)
+
+if test x"${c_compiles}" = x"no" ; then
+ AC_MSG_ERROR(the native compiler is broken and won't compile.)
+fi
+
+if test x"${c_links}" = x"no" ; then
+ AC_MSG_ERROR(the native compiler is broken and won't link.)
+fi
+AC_MSG_RESULT(yes)
+])
+
+AC_DEFUN(CY_AC_PATH_TCLH, [
+#
+# Ok, lets find the tcl source trees so we can use the headers
+# Warning: transition of version 9 to 10 will break this algorithm
+# because 10 sorts before 9. We also look for just tcl. We have to
+# be careful that we don't match stuff like tclX by accident.
+# the alternative search directory is involked by --with-tclinclude
+#
+no_tcl=true
+AC_MSG_CHECKING(for Tcl private headers)
+AC_ARG_WITH(tclinclude, [ --with-tclinclude directory where tcl private headers are], with_tclinclude=${withval})
+AC_CACHE_VAL(ac_cv_c_tclh,[
+# first check to see if --with-tclinclude was specified
+if test x"${with_tclinclude}" != x ; then
+ if test -f ${with_tclinclude}/tclInt.h ; then
+ ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)`
+ elif test -f ${with_tclinclude}/generic/tclInt.h ; then
+ ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)`
+ else
+ AC_MSG_ERROR([${with_tclinclude} directory doesn't contain private headers])
+ fi
+fi
+
+# next check if it came with Tcl configuration file
+if test x"${ac_cv_c_tclconfig}" != x ; then
+ if test -f $ac_cv_c_tclconfig/../generic/tclInt.h ; then
+ ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/../generic; pwd)`
+ fi
+fi
+
+# next check in private source directory
+#
+# since ls returns lowest version numbers first, reverse its output
+if test x"${ac_cv_c_tclh}" = x ; then
+ for i in \
+ ${srcdir}/../tcl \
+ `ls -dr ${srcdir}/../tcl[[9]].[[0-9]].[[0-9]] ${srcdir}/../tcl[[9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ${srcdir}/../tcl[[8]].[[2-9]].[[0-9]] ${srcdir}/../tcl[[8]].[[2-9]] 2>/dev/null` \
+ ${srcdir}/../../tcl \
+ `ls -dr ${srcdir}/../../tcl[[9]].[[0-9]].[[0-9]] ${srcdir}/../../tcl[[9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ${srcdir}/../../tcl[[8]].[[2-9]].[[0-9]] ${srcdir}/../../tcl[[8]].[[2-9]] 2>/dev/null` \
+ ${srcdir}/../../../tcl \
+ `ls -dr ${srcdir}/../../../tcl[[9]].[[0-9]].[[0-9]] ${srcdir}/../../../tcl[[9]].[[0-9]] 2>/dev/null ` \
+ `ls -dr ${srcdir}/../../../tcl[[8]].[[2-9]].[[0-9]] ${srcdir}/../../../tcl[[8]].[[2-9]] 2>/dev/null ` ; do
+ if test -f $i/generic/tclInt.h ; then
+ ac_cv_c_tclh=`(cd $i/generic; pwd)`
+ break
+ fi
+ done
+fi
+# finally check in a few common install locations
+#
+# since ls returns lowest version numbers first, reverse its output
+if test x"${ac_cv_c_tclh}" = x ; then
+ for i in \
+ `ls -dr /usr/local/src/tcl[[9]].[[0-9]].[[0-9]] /usr/local/src/tcl[[9]].[[0-9]] 2>/dev/null` \
+ `ls -dr /usr/local/src/tcl[[8]].[[2-9]].[[0-9]] /usr/local/src/tcl[[8]].[[2-9]] 2>/dev/null` \
+ `ls -dr /usr/local/lib/tcl[[9]].[[0-9]].[[0-9]] /usr/local/lib/tcl[[9]].[[0-9]] 2>/dev/null` \
+ `ls -dr /usr/local/lib/tcl[[8]].[[2-9]].[[0-9]] /usr/local/lib/tcl[[8]].[[2-9]] 2>/dev/null` \
+ /usr/local/src/tcl \
+ /usr/local/lib/tcl \
+ ${prefix}/include ; do
+ if test -f $i/generic/tclInt.h ; then
+ ac_cv_c_tclh=`(cd $i/generic; pwd)`
+ break
+ fi
+ done
+fi
+# see if one is installed
+if test x"${ac_cv_c_tclh}" = x ; then
+ AC_HEADER_CHECK(tclInt.h, ac_cv_c_tclh=installed, ac_cv_c_tclh="")
+fi
+])
+if test x"${ac_cv_c_tclh}" = x ; then
+ TCLHDIR="# no Tcl private headers found"
+ TCLHDIRDASHI="# no Tcl private headers found"
+ AC_MSG_ERROR([Can't find Tcl private headers])
+fi
+if test x"${ac_cv_c_tclh}" != x ; then
+ no_tcl=""
+ if test x"${ac_cv_c_tclh}" = x"installed" ; then
+ AC_MSG_RESULT([is installed])
+ TCLHDIR=""
+ TCLHDIRDASHI=""
+ TCL_LIBRARY=""
+ else
+ AC_MSG_RESULT([found in ${ac_cv_c_tclh}])
+ # this hack is cause the TCLHDIR won't print if there is a "-I" in it.
+ TCLHDIR="${ac_cv_c_tclh}"
+ TCLHDIRDASHI="-I${ac_cv_c_tclh} -I`dirname ${ac_cv_c_tclh}`/unix"
+ TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/generic//'`library
+ fi
+fi
+
+AC_SUBST(TCLHDIR)
+AC_SUBST(TCLHDIRDASHI)
+AC_SUBST(TCL_LIBRARY)
+])
+
+
+AC_DEFUN(CY_AC_PATH_TCLCONFIG, [
+#
+# Ok, lets find the tcl configuration
+# First, look for one uninstalled.
+# the alternative search directory is invoked by --with-tcl
+#
+
+if test x"${no_tcl}" = x ; then
+ # we reset no_tcl in case something fails here
+ no_tcl=true
+ AC_ARG_WITH(tcl, [ --with-tcl directory containing tcl configuration (tclConfig.sh)],
+ with_tclconfig=${withval})
+ AC_MSG_CHECKING([for Tcl configuration])
+ AC_CACHE_VAL(ac_cv_c_tclconfig,[
+
+ # First check to see if --with-tcl was specified.
+ if test x"${with_tclconfig}" != x ; then
+ if test -f "${with_tclconfig}/tclConfig.sh" ; then
+ ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
+ else
+ AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh])
+ fi
+ fi
+
+ # then check for a private Tcl installation
+ if test x"${ac_cv_c_tclconfig}" = x ; then
+ for i in \
+ ../tcl \
+ `ls -dr ../tcl[[9]].[[0-9]].[[0-9]] ../tcl[[9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ../tcl[[8]].[[2-9]].[[0-9]] ../tcl[[8]].[[2-9]] 2>/dev/null` \
+ ../../tcl \
+ `ls -dr ../../tcl[[9]].[[0-9]].[[0-9]] ../../tcl[[9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ../../tcl[[8]].[[2-9]].[[0-9]] ../../tcl[[8]].[[2-9]] 2>/dev/null` \
+ ../../../tcl \
+ `ls -dr ../../../tcl[[9]].[[0-9]].[[0-9]] ../../../tcl[[9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ../../../tcl[[8]].[[2-9]].[[0-9]] ../../../tcl[[8]].[[2-9]] 2>/dev/null` ; do
+ if test -f "$i/unix/tclConfig.sh" ; then
+ ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+ break
+ fi
+ done
+ fi
+ # check in a few common install locations
+ if test x"${ac_cv_c_tclconfig}" = x ; then
+ for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
+ if test -f "$i/tclConfig.sh" ; then
+ ac_cv_c_tclconfig=`(cd $i; pwd)`
+ break
+ fi
+ done
+ fi
+ # check in a few other private locations
+ if test x"${ac_cv_c_tclconfig}" = x ; then
+ for i in \
+ ${srcdir}/../tcl \
+ `ls -dr ${srcdir}/../tcl[[9]].[[0-9]].[[0-9]] ${srcdir}/../tcl[[9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ${srcdir}/../tcl[[8]].[[2-9]].[[0-9]] ${srcdir}/../tcl[[8]].[[2-9]] 2>/dev/null` ; do
+ if test -f "$i/unix/tclConfig.sh" ; then
+ ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+ break
+ fi
+ done
+ fi
+ ])
+ if test x"${ac_cv_c_tclconfig}" = x ; then
+ TCLCONFIG="# no Tcl configs found"
+ AC_MSG_WARN(Can't find Tcl configuration definitions)
+ else
+ no_tcl=
+ TCLCONFIG=${ac_cv_c_tclconfig}/tclConfig.sh
+ AC_MSG_RESULT(found $TCLCONFIG)
+ fi
+fi
+])
+
+# Defined as a separate macro so we don't have to cache the values
+# from PATH_TCLCONFIG (because this can also be cached).
+AC_DEFUN(CY_AC_LOAD_TCLCONFIG, [
+ . $TCLCONFIG
+
+dnl AC_SUBST(TCL_VERSION)
+dnl AC_SUBST(TCL_MAJOR_VERSION)
+dnl AC_SUBST(TCL_MINOR_VERSION)
+dnl AC_SUBST(TCL_CC)
+ AC_SUBST(TCL_DEFS)
+dnl following is just to test if missing symbol can be handled by configure
+ AC_SUBST(TCL_DELETEME)
+ AC_SUBST(TCL_DBGX)
+
+dnl not used, don't export to save symbols
+dnl AC_SUBST(TCL_LIB_FILE)
+
+dnl don't export, not used outside of configure
+dnl AC_SUBST(TCL_LIBS)
+dnl not used, don't export to save symbols
+dnl AC_SUBST(TCL_PREFIX)
+
+ AC_SUBST(TCL_EXEC_PREFIX)
+
+dnl not used, don't export to save symbols
+dnl AC_SUBST(TCL_SHLIB_CFLAGS)
+ AC_SUBST(TCL_SHLIB_LD)
+dnl don't export, not used outside of configure
+dnl AC_SUBST(TCL_SHLIB_LD_LIBS)
+
+# Tcl defines TCL_SHLIB_SUFFIX but TCL_SHARED_LIB_SUFFIX then looks for it
+# as just SHLIB_SUFFIX. How bizarre.
+ SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
+ AC_SUBST(SHLIB_SUFFIX)
+
+dnl not used, don't export to save symbols
+dnl AC_SUBST(TCL_DL_LIBS)
+ AC_SUBST(TCL_LD_FLAGS)
+dnl don't export, not used outside of configure
+dnl AC_SUBST(TCL_LD_SEARCH_FLAGS)
+dnl AC_SUBST(TCL_COMPAT_OBJS)
+dnl AC_SUBST(TCL_RANLIB)
+
+# if Tcl's build directory has been removed, TCL_LIB_SPEC should
+# be used instead of TCL_BUILD_LIB_SPEC
+SAVELIBS=$LIBS
+# eval used to expand out TCL_DBGX
+eval "LIBS=\"$TCL_BUILD_LIB_SPEC $TCL_LIBS\""
+AC_MSG_CHECKING([Tcl build library])
+AC_MSG_RESULT($LIBS)
+
+AC_CHECK_FUNC(Tcl_CreateCommand,[
+ AC_MSG_CHECKING([if Tcl library build specification is valid])
+ AC_MSG_RESULT(yes)
+],[
+ TCL_BUILD_LIB_SPEC=$TCL_LIB_SPEC
+ # Can't pull the following CHECKING call out since it will be
+ # broken up by the CHECK_FUNC just above.
+ AC_MSG_CHECKING([if Tcl library build specification is valid])
+ AC_MSG_RESULT(no)
+])
+LIBS=$SAVELIBS
+
+ AC_SUBST(TCL_BUILD_LIB_SPEC)
+ AC_SUBST(TCL_LIB_SPEC)
+dnl AC_SUBST(TCL_LIB_VERSIONS_OK)
+
+ AC_SUBST(TCL_SHARED_LIB_SUFFIX)
+
+dnl not used, don't export to save symbols
+dnl AC_SUBST(TCL_UNSHARED_LIB_SUFFIX)
+])
+
+# Warning: Tk definitions are very similar to Tcl definitions but
+# are not precisely the same. There are a couple of differences,
+# so don't do changes to Tcl thinking you can cut and paste it do
+# the Tk differences and later simply substitute "Tk" for "Tcl".
+# Known differences:
+# - Acceptable Tcl major version #s is 8.2-9.* while Tk is 8.2-9.*
+# - Searching for Tcl includes looking for tclInt.h, Tk looks for tk.h
+# - Computing major/minor versions is different because Tk depends on
+# headers to Tcl, Tk, and X.
+# - Symbols in tkConfig.sh are different than tclConfig.sh
+# - Acceptable for Tk to be missing but not Tcl.
+
+AC_DEFUN(CY_AC_PATH_TKH, [
+#
+# Ok, lets find the tk source trees so we can use the headers
+# If the directory (presumably symlink) named "tk" exists, use that one
+# in preference to any others. Same logic is used when choosing library
+# and again with Tcl. The search order is the best place to look first, then in
+# decreasing significance. The loop breaks if the trigger file is found.
+# Note the gross little conversion here of srcdir by cd'ing to the found
+# directory. This converts the path from a relative to an absolute, so
+# recursive cache variables for the path will work right. We check all
+# the possible paths in one loop rather than many seperate loops to speed
+# things up.
+# the alternative search directory is involked by --with-tkinclude
+#
+#no_tk=true
+AC_MSG_CHECKING(for Tk private headers)
+AC_ARG_WITH(tkinclude, [ --with-tkinclude directory where tk private headers are], with_tkinclude=${withval})
+AC_CACHE_VAL(ac_cv_c_tkh,[
+# first check to see if --with-tkinclude was specified
+if test x"${with_tkinclude}" != x ; then
+ if test -f ${with_tkinclude}/tk.h ; then
+ ac_cv_c_tkh=`(cd ${with_tkinclude}; pwd)`
+ elif test -f ${with_tkinclude}/generic/tk.h ; then
+ ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; pwd)`
+ else
+ AC_MSG_ERROR([${with_tkinclude} directory doesn't contain private headers])
+ fi
+fi
+
+# next check if it came with Tk configuration file
+if test x"${ac_cv_c_tkconfig}" != x ; then
+ if test -f $ac_cv_c_tkconfig/../generic/tk.h ; then
+ ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/../generic; pwd)`
+ fi
+fi
+
+# next check in private source directory
+#
+# since ls returns lowest version numbers first, reverse its output
+if test x"${ac_cv_c_tkh}" = x ; then
+ for i in \
+ ${srcdir}/../tk \
+ `ls -dr ${srcdir}/../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../tk[[4-9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ${srcdir}/../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../tk[[4-9]].[[0-9]] 2>/dev/null` \
+ ${srcdir}/../../tk \
+ `ls -dr ${srcdir}/../../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../../tk[[4-9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ${srcdir}/../../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../../tk[[4-9]].[[0-9]] 2>/dev/null` \
+ ${srcdir}/../../../tk \
+ `ls -dr ${srcdir}/../../../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../../../tk[[4-9]].[[0-9]] 2>/dev/null ` \
+ `ls -dr ${srcdir}/../../../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../../../tk[[4-9]].[[0-9]] 2>/dev/null ` ; do
+ if test -f $i/generic/tk.h ; then
+ ac_cv_c_tkh=`(cd $i/generic; pwd)`
+ break
+ fi
+ done
+fi
+# finally check in a few common install locations
+#
+# since ls returns lowest version numbers first, reverse its output
+if test x"${ac_cv_c_tkh}" = x ; then
+ for i in \
+ `ls -dr /usr/local/src/tk[[4-9]].[[0-9]].[[0-9]] /usr/local/src/tk[[4-9]].[[0-9]] 2>/dev/null` \
+ `ls -dr /usr/local/src/tk[[4-9]].[[0-9]].[[0-9]] /usr/local/src/tk[[4-9]].[[0-9]] 2>/dev/null` \
+ `ls -dr /usr/local/lib/tk[[4-9]].[[0-9]].[[0-9]] /usr/local/lib/tk[[4-9]].[[0-9]] 2>/dev/null` \
+ `ls -dr /usr/local/lib/tk[[4-9]].[[0-9]].[[0-9]] /usr/local/lib/tk[[4-9]].[[0-9]] 2>/dev/null` \
+ /usr/local/src/tk \
+ /usr/local/lib/tk \
+ ${prefix}/include ; do
+ if test -f $i/generic/tk.h ; then
+ ac_cv_c_tkh=`(cd $i/generic; pwd)`
+ break
+ fi
+ done
+fi
+# see if one is installed
+if test x"${ac_cv_c_tkh}" = x ; then
+ AC_HEADER_CHECK(tk.h, ac_cv_c_tkh=installed, ac_cv_c_tkh="")
+fi
+])
+if test x"${ac_cv_c_tkh}" != x ; then
+# no_tk=""
+ if test x"${ac_cv_c_tkh}" = x"installed" ; then
+ AC_MSG_RESULT([is installed])
+ TKHDIRDASHI=""
+ else
+ AC_MSG_RESULT([found in ${ac_cv_c_tkh}])
+ # this hack is cause the TKHDIRDASHI won't print if there is a "-I" in it.
+ TKHDIRDASHI="-I${ac_cv_c_tkh}"
+ fi
+else
+ TKHDIRDASHI="# no Tk directory found"
+ AC_MSG_WARN([Can't find Tk private headers])
+ no_tk=true
+fi
+
+AC_SUBST(TKHDIRDASHI)
+])
+
+
+AC_DEFUN(CY_AC_PATH_TKCONFIG, [
+#
+# Ok, lets find the tk configuration
+# First, look for one uninstalled.
+# the alternative search directory is invoked by --with-tk
+#
+
+if test x"${no_tk}" = x ; then
+ # we reset no_tk in case something fails here
+ no_tk=true
+ AC_ARG_WITH(tk, [ --with-tk directory containing tk configuration (tkConfig.sh)],
+ with_tkconfig=${withval})
+ AC_MSG_CHECKING([for Tk configuration])
+ AC_CACHE_VAL(ac_cv_c_tkconfig,[
+
+ # First check to see if --with-tk was specified.
+ if test x"${with_tkconfig}" != x ; then
+ if test -f "${with_tkconfig}/tkConfig.sh" ; then
+ ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)`
+ else
+ AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh])
+ fi
+ fi
+
+ # then check for a private Tk library
+ if test x"${ac_cv_c_tkconfig}" = x ; then
+ for i in \
+ ../tk \
+ `ls -dr ../tk[[4-9]].[[0-9]].[[0-9]] ../tk[[4-9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ../tk[[4-9]].[[0-9]].[[0-9]] ../tk[[4-9]].[[0-9]] 2>/dev/null` \
+ ../../tk \
+ `ls -dr ../../tk[[4-9]].[[0-9]].[[0-9]] ../../tk[[4-9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ../../tk[[4-9]].[[0-9]].[[0-9]] ../../tk[[4-9]].[[0-9]] 2>/dev/null` \
+ ../../../tk \
+ `ls -dr ../../../tk[[4-9]].[[0-9]].[[0-9]] ../../../tk[[4-9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ../../../tk[[4-9]].[[0-9]].[[0-9]] ../../../tk[[4-9]].[[0-9]] 2>/dev/null` ; do
+ if test -f "$i/unix/tkConfig.sh" ; then
+ ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
+ break
+ fi
+ done
+ fi
+ # check in a few common install locations
+ if test x"${ac_cv_c_tkconfig}" = x ; then
+ for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
+ if test -f "$i/tkConfig.sh" ; then
+ ac_cv_c_tkconfig=`(cd $i; pwd)`
+ break
+ fi
+ done
+ fi
+ # check in a few other private locations
+ if test x"${ac_cv_c_tkconfig}" = x ; then
+ for i in \
+ ${srcdir}/../tk \
+ `ls -dr ${srcdir}/../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../tk[[4-9]].[[0-9]] 2>/dev/null` \
+ `ls -dr ${srcdir}/../tk[[4-9]].[[0-9]].[[0-9]] ${srcdir}/../tk[[4-9]].[[0-9]] 2>/dev/null` ; do
+ if test -f "$i/unix/tkConfig.sh" ; then
+ ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
+ break
+ fi
+ done
+ fi
+ ])
+ if test x"${ac_cv_c_tkconfig}" = x ; then
+ TKCONFIG="# no Tk configs found"
+ AC_MSG_WARN(Can't find Tk configuration definitions)
+ else
+ no_tk=
+ TKCONFIG=${ac_cv_c_tkconfig}/tkConfig.sh
+ AC_MSG_RESULT(found $TKCONFIG)
+ fi
+fi
+
+])
+
+# Defined as a separate macro so we don't have to cache the values
+# from PATH_TKCONFIG (because this can also be cached).
+AC_DEFUN(CY_AC_LOAD_TKCONFIG, [
+ if test -f "$TKCONFIG" ; then
+ . $TKCONFIG
+ fi
+
+ AC_SUBST(TK_VERSION)
+dnl not actually used, don't export to save symbols
+dnl AC_SUBST(TK_MAJOR_VERSION)
+dnl AC_SUBST(TK_MINOR_VERSION)
+ AC_SUBST(TK_DEFS)
+
+ AC_SUBST(TK_DBGX)
+dnl not used, don't export to save symbols
+ dnl AC_SUBST(TK_LIB_FILE)
+
+dnl not used outside of configure
+dnl AC_SUBST(TK_LIBS)
+dnl not used, don't export to save symbols
+dnl AC_SUBST(TK_PREFIX)
+
+dnl not used, don't export to save symbols
+dnl AC_SUBST(TK_EXEC_PREFIX)
+
+ AC_SUBST(TK_XINCLUDES)
+ AC_SUBST(TK_XLIBSW)
+
+# if Tk's build directory has been removed, TK_LIB_SPEC should
+# be used instead of TK_BUILD_LIB_SPEC
+SAVELIBS=$LIBS
+# eval used to expand out TK_DBGX
+eval "LIBS=\"$TK_BUILD_LIB_SPEC $TCL_BUILD_LIB_SPEC $TK_LIBS\""
+AC_CHECK_FUNC(Tk_Init,[
+ AC_MSG_CHECKING([if Tk library build specification is valid])
+ AC_MSG_RESULT(yes)
+],[
+ TK_BUILD_LIB_SPEC=$TK_LIB_SPEC
+ # Can't pull the following CHECKING call out since it will be
+ # broken up by the CHECK_FUNC just above.
+ AC_MSG_CHECKING([if Tk library build specification is valid])
+ AC_MSG_RESULT(no)
+])
+LIBS=$SAVELIBS
+
+ AC_SUBST(TK_BUILD_LIB_SPEC)
+ AC_SUBST(TK_LIB_SPEC)
+])
+
+#------------------------------------------------------------------------
+# SC_ENABLE_THREADS --
+#
+# Specify if thread support should be enabled
+#
+# Arguments:
+# none
+#
+# Results:
+#
+# Adds the following arguments to configure:
+# --enable-threads
+#
+# Sets the following vars:
+# THREADS_LIBS Thread library(s)
+#
+# Defines the following vars:
+# TCL_THREADS
+# _REENTRANT
+#
+#------------------------------------------------------------------------
+
+AC_DEFUN(SC_ENABLE_THREADS, [
+ AC_MSG_CHECKING(for building with threads)
+ AC_ARG_ENABLE(threads, [ --enable-threads build with threads (not supported)],
+ [tcl_ok=$enableval], [tcl_ok=no])
+
+ if test "$tcl_ok" = "yes"; then
+ AC_MSG_WARN([Expect is not fully thread-enabled. Although significant work has been done towards that goal, it is not complete. Continue compiling at your own risk.])
+ fi
+# if test "$tcl_ok" = "yes"; then
+# AC_MSG_RESULT(yes)
+# TCL_THREADS=1
+# AC_DEFINE(TCL_THREADS)
+# AC_DEFINE(_REENTRANT)
+#
+# AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no)
+# if test "$tcl_ok" = "yes"; then
+# # The space is needed
+# THREADS_LIBS=" -lpthread"
+# else
+# TCL_THREADS=0
+# AC_MSG_WARN("Don t know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...")
+# fi
+# else
+# TCL_THREADS=0
+# AC_MSG_RESULT(no (default))
+# fi
+
+ AC_MSG_RESULT(no (default))
+
+])
+
+
+#------------------------------------------------------------------------
+## AK ## Macros which encapsulate the expect specific checks.
+## AK ## This allows me to move them around in the configure.in
+## AK ##
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list