source: patches/expect-5.44.1.15-notk-1.patch @ 1341743

clfs-1.2clfs-2.1clfs-3.0.0-systemdclfs-3.0.0-sysvinitsystemdsysvinit
Last change on this file since 1341743 was 1341743, checked in by Joe Ciccone <jciccone@…>, 14 years ago

Updated Expect to 5.44.1.15.
  • Property mode set to 100644
File size: 18.4 KB
RevLine 
[1341743]1Submitted By: Joe Ciccone <jciccone@gmail.com>
2Date: 2010-07-29
3Initial Package Version: 5.44.1.15
4Origin: Joe Ciccone
5Upstream Status: None - CLFS Specific
6Description: Disables building of expectk as well as removes the checks for tk.
7
8diff -Naur expect-5.44.1.15.orig/Makefile.in expect-5.44.1.15/Makefile.in
9--- expect-5.44.1.15.orig/Makefile.in   2010-03-11 19:06:30.000000000 +0000
10+++ expect-5.44.1.15/Makefile.in        2010-07-29 23:22:25.997577048 +0000
11@@ -103,7 +103,7 @@
12 PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
13 
14 lib_BINARIES   = $(PKG_LIB_FILE)
15-bin_BINARIES   = expect expectk
16+bin_BINARIES   = expect
17 BINARIES       = $(lib_BINARIES) $(bin_BINARIES)
18 
19 SHELL          = @SHELL@
20@@ -175,7 +175,7 @@
21 TCLSH          = $(TCLSH_ENV) $(TCLSH_PROG)
22 SHARED_BUILD   = @SHARED_BUILD@
23 
24-INCLUDES       = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@
25+INCLUDES       = @PKG_INCLUDES@ @TCL_INCLUDES@
26 
27 PKG_CFLAGS     = @PKG_CFLAGS@
28 
29@@ -255,8 +255,6 @@
30        @mkdir -p $(DESTDIR)$(mandir)/man1
31        @mkdir -p $(DESTDIR)$(mandir)/man3
32        @echo "Installing documentation in $(DESTDIR)$(mandir)"
33-# install Expectk man page if present
34-       $(INSTALL_DATA) $(srcdir)/expectk.man $(DESTDIR)$(mandir)/man1/expectk.1 ; \
35 # install Expect man page
36        $(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(mandir)/man1/expect.1
37 # install man page for Expect and Expectk libraries
38@@ -416,21 +414,6 @@
39                @EXP_CC_SEARCH_FLAGS@
40        $(SETUID) expect
41 
42-expectk: exp_main_tk.o $(PKG_LIB_FILE)
43-       $(CC) \
44-               @CFLAGS@ \
45-               @EXP_CFLAGS@ \
46-               @EXP_SHLIB_CFLAGS@ \
47-               @TCL_LD_FLAGS@ \
48-               -o expectk exp_main_tk.o \
49-               @EXP_BUILD_LIB_SPEC@ \
50-               @TK_LIB_SPEC@ \
51-               @TCL_LIB_SPEC@ \
52-               @TK_LIBS@ \
53-               @TCL_CC_SEARCH_FLAGS@ \
54-               @EXP_CC_SEARCH_FLAGS@
55-       $(SETUID) expectk
56-
57 #========================================================================
58 # Produce FAQ and homepage
59 #========================================================================
60diff -Naur expect-5.44.1.15.orig/configure expect-5.44.1.15/configure
61--- expect-5.44.1.15.orig/configure     2010-03-11 19:06:30.000000000 +0000
62+++ expect-5.44.1.15/configure  2010-07-29 23:23:04.193826351 +0000
63@@ -310,7 +310,7 @@
64 #endif"
65 
66 ac_subdirs_all="$ac_subdirs_all testsuite"
67-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS found TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_LIBS TK_XINCLUDES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS TCL_TOP_DIR_NATIVE TCL_GENERIC_DIR_NATIVE TCL_UNIX_DIR_NATIVE TCL_WIN_DIR_NATIVE TCL_BMAP_DIR_NATIVE TCL_TOOL_DIR_NATIVE TCL_PLATFORM_DIR_NATIVE TCL_INCLUDES TK_INCLUDES CLEANFILES TCL_THREADS SHARED_BUILD AR CELIB_DIR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os subdirs EXP_CONFIG_SHELL EXP_SHARED_LIB_FILE EXP_UNSHARED_LIB_FILE EXP_SHLIB_CFLAGS EXP_LIB_FILE EXP_LIB_FILES EXP_BUILD_LIB_SPEC EXP_LIB_SPEC EXP_CFLAGS EXP_LDFLAGS EXP_LD_SEARCH_FLAGS TCL_LD_SEARCH_FLAGS EXP_CC_SEARCH_FLAGS TCL_CC_SEARCH_FLAGS EXP_SHLIB_LD_LIBS SETUID SETPGRP_VOID DEFAULT_STTY_ARGS PKG_SOURCES PKG_OBJECTS MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG LTLIBOBJS'
68+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS found TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS TCL_TOP_DIR_NATIVE TCL_GENERIC_DIR_NATIVE TCL_UNIX_DIR_NATIVE TCL_WIN_DIR_NATIVE TCL_BMAP_DIR_NATIVE TCL_TOOL_DIR_NATIVE TCL_PLATFORM_DIR_NATIVE TCL_INCLUDES CLEANFILES TCL_THREADS SHARED_BUILD AR CELIB_DIR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os subdirs EXP_CONFIG_SHELL EXP_SHARED_LIB_FILE EXP_UNSHARED_LIB_FILE EXP_SHLIB_CFLAGS EXP_LIB_FILE EXP_LIB_FILES EXP_BUILD_LIB_SPEC EXP_LIB_SPEC EXP_CFLAGS EXP_LDFLAGS EXP_LD_SEARCH_FLAGS TCL_LD_SEARCH_FLAGS EXP_CC_SEARCH_FLAGS TCL_CC_SEARCH_FLAGS EXP_SHLIB_LD_LIBS SETUID SETPGRP_VOID DEFAULT_STTY_ARGS PKG_SOURCES PKG_OBJECTS MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG LTLIBOBJS'
69 ac_subst_files=''
70 
71 # Initialize some variables set by options.
72@@ -862,8 +862,6 @@
73   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
74   --with-tcl              directory containing tcl configuration
75                           (tclConfig.sh)
76-  --with-tk               directory containing tk configuration (tkConfig.sh)
77-  --with-tkinclude      directory containing the public Tk header files.
78   --with-celib=DIR        use Windows/CE support library from DIR
79 
80 Some influential environment variables:
81@@ -1738,234 +1736,6 @@
82 
83 
84 
85-
86-    #
87-    # Ok, lets find the tk configuration
88-    # First, look for one uninstalled.
89-    # the alternative search directory is invoked by --with-tk
90-    #
91-
92-    if test x"${no_tk}" = x ; then
93-       # we reset no_tk in case something fails here
94-       no_tk=true
95-
96-# Check whether --with-tk or --without-tk was given.
97-if test "${with_tk+set}" = set; then
98-  withval="$with_tk"
99-  with_tkconfig=${withval}
100-fi;
101-       echo "$as_me:$LINENO: checking for Tk configuration" >&5
102-echo $ECHO_N "checking for Tk configuration... $ECHO_C" >&6
103-       if test "${ac_cv_c_tkconfig+set}" = set; then
104-  echo $ECHO_N "(cached) $ECHO_C" >&6
105-else
106-
107-
108-           # First check to see if --with-tkconfig was specified.
109-           if test x"${with_tkconfig}" != x ; then
110-               case ${with_tkconfig} in
111-                   */tkConfig.sh )
112-                       if test -f ${with_tkconfig}; then
113-                           { echo "$as_me:$LINENO: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&5
114-echo "$as_me: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&2;}
115-                           with_tkconfig=`echo ${with_tkconfig} | sed 's!/tkConfig\.sh$!!'`
116-                       fi ;;
117-               esac
118-               if test -f "${with_tkconfig}/tkConfig.sh" ; then
119-                   ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)`
120-               else
121-                   { { echo "$as_me:$LINENO: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&5
122-echo "$as_me: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&2;}
123-   { (exit 1); exit 1; }; }
124-               fi
125-           fi
126-
127-           # then check for a private Tk library
128-           if test x"${ac_cv_c_tkconfig}" = x ; then
129-               for i in \
130-                       ../tk \
131-                       `ls -dr ../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
132-                       `ls -dr ../tk[8-9].[0-9] 2>/dev/null` \
133-                       `ls -dr ../tk[8-9].[0-9]* 2>/dev/null` \
134-                       ../../tk \
135-                       `ls -dr ../../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
136-                       `ls -dr ../../tk[8-9].[0-9] 2>/dev/null` \
137-                       `ls -dr ../../tk[8-9].[0-9]* 2>/dev/null` \
138-                       ../../../tk \
139-                       `ls -dr ../../../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
140-                       `ls -dr ../../../tk[8-9].[0-9] 2>/dev/null` \
141-                       `ls -dr ../../../tk[8-9].[0-9]* 2>/dev/null` ; do
142-                   if test -f "$i/unix/tkConfig.sh" ; then
143-                       ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
144-                       break
145-                   fi
146-               done
147-           fi
148-
149-           # on Darwin, check in Framework installation locations
150-           if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then
151-               for i in `ls -d ~/Library/Frameworks 2>/dev/null` \
152-                       `ls -d /Library/Frameworks 2>/dev/null` \
153-                       `ls -d /Network/Library/Frameworks 2>/dev/null` \
154-                       `ls -d /System/Library/Frameworks 2>/dev/null` \
155-                       ; do
156-                   if test -f "$i/Tk.framework/tkConfig.sh" ; then
157-                       ac_cv_c_tkconfig=`(cd $i/Tk.framework; pwd)`
158-                       break
159-                   fi
160-               done
161-           fi
162-
163-           # check in a few common install locations
164-           if test x"${ac_cv_c_tkconfig}" = x ; then
165-               for i in `ls -d ${libdir} 2>/dev/null` \
166-                       `ls -d ${exec_prefix}/lib 2>/dev/null` \
167-                       `ls -d ${prefix}/lib 2>/dev/null` \
168-                       `ls -d /usr/local/lib 2>/dev/null` \
169-                       `ls -d /usr/contrib/lib 2>/dev/null` \
170-                       `ls -d /usr/lib 2>/dev/null` \
171-                       ; do
172-                   if test -f "$i/tkConfig.sh" ; then
173-                       ac_cv_c_tkconfig=`(cd $i; pwd)`
174-                       break
175-                   fi
176-               done
177-           fi
178-
179-           # on Windows, check in common installation locations
180-           if test "${TEA_PLATFORM}" = "windows" \
181-               -a x"${ac_cv_c_tclconfig}" = x ; then
182-               for i in `ls -d C:/Tcl/lib 2>/dev/null` \
183-                       `ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \
184-                       ; do
185-                   if test -f "$i/tclConfig.sh" ; then
186-                       ac_cv_c_tclconfig=`(cd $i; pwd)`
187-                       break
188-                   fi
189-               done
190-           fi
191-
192-           # check in a few other private locations
193-           if test x"${ac_cv_c_tkconfig}" = x ; then
194-               for i in \
195-                       ${srcdir}/../tk \
196-                       `ls -dr ${srcdir}/../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
197-                       `ls -dr ${srcdir}/../tk[8-9].[0-9] 2>/dev/null` \
198-                       `ls -dr ${srcdir}/../tk[8-9].[0-9]* 2>/dev/null` ; do
199-                   if test -f "$i/unix/tkConfig.sh" ; then
200-                       ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
201-                       break
202-                   fi
203-               done
204-           fi
205-
206-fi
207-
208-
209-       if test x"${ac_cv_c_tkconfig}" = x ; then
210-           TK_BIN_DIR="# no Tk configs found"
211-           { echo "$as_me:$LINENO: WARNING: Can't find Tk configuration definitions" >&5
212-echo "$as_me: WARNING: Can't find Tk configuration definitions" >&2;}
213-           exit 0
214-       else
215-           no_tk=
216-           TK_BIN_DIR=${ac_cv_c_tkconfig}
217-           echo "$as_me:$LINENO: result: found ${TK_BIN_DIR}/tkConfig.sh" >&5
218-echo "${ECHO_T}found ${TK_BIN_DIR}/tkConfig.sh" >&6
219-       fi
220-    fi
221-
222-
223-    echo "$as_me:$LINENO: checking for existence of ${TK_BIN_DIR}/tkConfig.sh" >&5
224-echo $ECHO_N "checking for existence of ${TK_BIN_DIR}/tkConfig.sh... $ECHO_C" >&6
225-
226-    if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then
227-        echo "$as_me:$LINENO: result: loading" >&5
228-echo "${ECHO_T}loading" >&6
229-       . ${TK_BIN_DIR}/tkConfig.sh
230-    else
231-        echo "$as_me:$LINENO: result: could not find ${TK_BIN_DIR}/tkConfig.sh" >&5
232-echo "${ECHO_T}could not find ${TK_BIN_DIR}/tkConfig.sh" >&6
233-    fi
234-
235-    # eval is required to do the TK_DBGX substitution
236-    eval "TK_LIB_FILE=\"${TK_LIB_FILE}\""
237-    eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\""
238-
239-    # If the TK_BIN_DIR is the build directory (not the install directory),
240-    # then set the common variable name to the value of the build variables.
241-    # For example, the variable TK_LIB_SPEC will be set to the value
242-    # of TK_BUILD_LIB_SPEC. An extension should make use of TK_LIB_SPEC
243-    # instead of TK_BUILD_LIB_SPEC since it will work with both an
244-    # installed and uninstalled version of Tcl.
245-    if test -f ${TK_BIN_DIR}/Makefile ; then
246-        TK_LIB_SPEC=${TK_BUILD_LIB_SPEC}
247-        TK_STUB_LIB_SPEC=${TK_BUILD_STUB_LIB_SPEC}
248-        TK_STUB_LIB_PATH=${TK_BUILD_STUB_LIB_PATH}
249-    elif test "`uname -s`" = "Darwin"; then
250-       # If Tk was built as a framework, attempt to use the libraries
251-       # from the framework at the given location so that linking works
252-       # against Tk.framework installed in an arbitary location.
253-       case ${TK_DEFS} in
254-           *TK_FRAMEWORK*)
255-               if test -f ${TK_BIN_DIR}/${TK_LIB_FILE}; then
256-                   for i in "`cd ${TK_BIN_DIR}; pwd`" \
257-                            "`cd ${TK_BIN_DIR}/../..; pwd`"; do
258-                       if test "`basename "$i"`" = "${TK_LIB_FILE}.framework"; then
259-                           TK_LIB_SPEC="-F`dirname "$i"` -framework ${TK_LIB_FILE}"
260-                           break
261-                       fi
262-                   done
263-               fi
264-               if test -f ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}; then
265-                   TK_STUB_LIB_SPEC="-L${TK_BIN_DIR} ${TK_STUB_LIB_FLAG}"
266-                   TK_STUB_LIB_PATH="${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"
267-               fi
268-               ;;
269-       esac
270-    fi
271-
272-    # eval is required to do the TK_DBGX substitution
273-    eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\""
274-    eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\""
275-    eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\""
276-    eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\""
277-
278-    # Ensure windowingsystem is defined
279-    if test "${TEA_PLATFORM}" = "unix" ; then
280-       case ${TK_DEFS} in
281-           *MAC_OSX_TK*)
282-
283-cat >>confdefs.h <<\_ACEOF
284-#define MAC_OSX_TK 1
285-_ACEOF
286-
287-               TEA_WINDOWINGSYSTEM="aqua"
288-               ;;
289-           *)
290-               TEA_WINDOWINGSYSTEM="x11"
291-               ;;
292-       esac
293-    elif test "${TEA_PLATFORM}" = "windows" ; then
294-       TEA_WINDOWINGSYSTEM="win32"
295-    fi
296-
297-
298-
299-
300-
301-
302-
303-
304-
305-
306-
307-
308-
309-
310-
311-
312-
313 #-----------------------------------------------------------------------
314 # Handle the --prefix=... option by defaulting to what Tcl gave.
315 # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
316@@ -6458,106 +6228,6 @@
317 echo "${ECHO_T}Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}" >&6
318 
319 
320-    echo "$as_me:$LINENO: checking for Tk public headers" >&5
321-echo $ECHO_N "checking for Tk public headers... $ECHO_C" >&6
322-
323-
324-# Check whether --with-tkinclude or --without-tkinclude was given.
325-if test "${with_tkinclude+set}" = set; then
326-  withval="$with_tkinclude"
327-  with_tkinclude=${withval}
328-fi;
329-
330-    if test "${ac_cv_c_tkh+set}" = set; then
331-  echo $ECHO_N "(cached) $ECHO_C" >&6
332-else
333-
334-       # Use the value from --with-tkinclude, if it was given
335-
336-       if test x"${with_tkinclude}" != x ; then
337-           if test -f "${with_tkinclude}/tk.h" ; then
338-               ac_cv_c_tkh=${with_tkinclude}
339-           else
340-               { { echo "$as_me:$LINENO: error: ${with_tkinclude} directory does not contain tk.h" >&5
341-echo "$as_me: error: ${with_tkinclude} directory does not contain tk.h" >&2;}
342-   { (exit 1); exit 1; }; }
343-           fi
344-       else
345-           if test "`uname -s`" = "Darwin"; then
346-               # If Tk was built as a framework, attempt to use
347-               # the framework's Headers directory.
348-               case ${TK_DEFS} in
349-                   *TK_FRAMEWORK*)
350-                       list="`ls -d ${TK_BIN_DIR}/Headers 2>/dev/null`"
351-                       ;;
352-               esac
353-           fi
354-
355-           # Look in the source dir only if Tk is not installed,
356-           # and in that situation, look there before installed locations.
357-           if test -f "${TK_BIN_DIR}/Makefile" ; then
358-               list="$list `ls -d ${TK_SRC_DIR}/generic 2>/dev/null`"
359-           fi
360-
361-           # Check order: pkg --prefix location, Tk's --prefix location,
362-           # relative to directory of tkConfig.sh, Tcl's --prefix location,
363-           # relative to directory of tclConfig.sh.
364-
365-           eval "temp_includedir=${includedir}"
366-           list="$list \
367-               `ls -d ${temp_includedir}        2>/dev/null` \
368-               `ls -d ${TK_PREFIX}/include      2>/dev/null` \
369-               `ls -d ${TK_BIN_DIR}/../include  2>/dev/null` \
370-               `ls -d ${TCL_PREFIX}/include     2>/dev/null` \
371-               `ls -d ${TCL_BIN_DIR}/../include 2>/dev/null`"
372-           if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then
373-               list="$list /usr/local/include /usr/include"
374-           fi
375-           for i in $list ; do
376-               if test -f "$i/tk.h" ; then
377-                   ac_cv_c_tkh=$i
378-                   break
379-               fi
380-           done
381-       fi
382-
383-fi
384-
385-
386-    # Print a message based on how we determined the include path
387-
388-    if test x"${ac_cv_c_tkh}" = x ; then
389-       { { echo "$as_me:$LINENO: error: tk.h not found.  Please specify its location with --with-tkinclude" >&5
390-echo "$as_me: error: tk.h not found.  Please specify its location with --with-tkinclude" >&2;}
391-   { (exit 1); exit 1; }; }
392-    else
393-       echo "$as_me:$LINENO: result: ${ac_cv_c_tkh}" >&5
394-echo "${ECHO_T}${ac_cv_c_tkh}" >&6
395-    fi
396-
397-    # Convert to a native path and substitute into the output files.
398-
399-    INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}`
400-
401-    TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\"
402-
403-
404-
405-    if test "${TEA_WINDOWINGSYSTEM}" = "win32" \
406-       -o "${TEA_WINDOWINGSYSTEM}" = "aqua"; then
407-       # On Windows and Aqua, we need the X compat headers
408-       echo "$as_me:$LINENO: checking for X11 header files" >&5
409-echo $ECHO_N "checking for X11 header files... $ECHO_C" >&6
410-       if test ! -r "${INCLUDE_DIR_NATIVE}/X11/Xlib.h"; then
411-           INCLUDE_DIR_NATIVE="`${CYGPATH} ${TK_SRC_DIR}/xlib`"
412-           TK_XINCLUDES=-I\"${INCLUDE_DIR_NATIVE}\"
413-
414-       fi
415-       echo "$as_me:$LINENO: result: ${INCLUDE_DIR_NATIVE}" >&5
416-echo "${ECHO_T}${INCLUDE_DIR_NATIVE}" >&6
417-    fi
418-
419-
420 #--------------------------------------------------------------------
421 # A few miscellaneous platform-specific items:
422 #
423@@ -17280,17 +16950,6 @@
424 s,@TCL_EXTRA_CFLAGS@,$TCL_EXTRA_CFLAGS,;t t
425 s,@TCL_LD_FLAGS@,$TCL_LD_FLAGS,;t t
426 s,@TCL_SHLIB_LD_LIBS@,$TCL_SHLIB_LD_LIBS,;t t
427-s,@TK_VERSION@,$TK_VERSION,;t t
428-s,@TK_BIN_DIR@,$TK_BIN_DIR,;t t
429-s,@TK_SRC_DIR@,$TK_SRC_DIR,;t t
430-s,@TK_LIB_FILE@,$TK_LIB_FILE,;t t
431-s,@TK_LIB_FLAG@,$TK_LIB_FLAG,;t t
432-s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
433-s,@TK_STUB_LIB_FILE@,$TK_STUB_LIB_FILE,;t t
434-s,@TK_STUB_LIB_FLAG@,$TK_STUB_LIB_FLAG,;t t
435-s,@TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t
436-s,@TK_LIBS@,$TK_LIBS,;t t
437-s,@TK_XINCLUDES@,$TK_XINCLUDES,;t t
438 s,@CC@,$CC,;t t
439 s,@CFLAGS@,$CFLAGS,;t t
440 s,@LDFLAGS@,$LDFLAGS,;t t
441@@ -17314,7 +16973,6 @@
442 s,@TCL_TOOL_DIR_NATIVE@,$TCL_TOOL_DIR_NATIVE,;t t
443 s,@TCL_PLATFORM_DIR_NATIVE@,$TCL_PLATFORM_DIR_NATIVE,;t t
444 s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t
445-s,@TK_INCLUDES@,$TK_INCLUDES,;t t
446 s,@CLEANFILES@,$CLEANFILES,;t t
447 s,@TCL_THREADS@,$TCL_THREADS,;t t
448 s,@SHARED_BUILD@,$SHARED_BUILD,;t t
449diff -Naur expect-5.44.1.15.orig/configure.in expect-5.44.1.15/configure.in
450--- expect-5.44.1.15.orig/configure.in  2010-03-11 19:06:30.000000000 +0000
451+++ expect-5.44.1.15/configure.in       2010-07-29 23:22:25.997577048 +0000
452@@ -49,9 +49,6 @@
453 TEA_PATH_TCLCONFIG
454 TEA_LOAD_TCLCONFIG
455 
456-TEA_PATH_TKCONFIG
457-TEA_LOAD_TKCONFIG
458-
459 #-----------------------------------------------------------------------
460 # Handle the --prefix=... option by defaulting to what Tcl gave.
461 # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
462@@ -79,7 +76,6 @@
463 
464 #TEA_PUBLIC_TCL_HEADERS
465 TEA_PRIVATE_TCL_HEADERS
466-TEA_PUBLIC_TK_HEADERS
467 
468 #--------------------------------------------------------------------
469 # A few miscellaneous platform-specific items:
Note: See TracBrowser for help on using the repository browser.