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

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 1dfba52 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

  • expect-5.44.1.15 

    Submitted By: Joe Ciccone <jciccone@gmail.com>
Date: 2010-07-29
Initial Package Version: 5.44.1.15
Origin: Joe Ciccone
Upstream Status: None - CLFS Specific
Description: Disables building of expectk as well as removes the checks for tk.

diff -Naur expect-5.44.1.15.orig/Makefile.in expect-5.44.1.15/Makefile.in
    old new  
    103103PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
    104104
    105105lib_BINARIES    = $(PKG_LIB_FILE)
    106 bin_BINARIES    = expect expectk
     106bin_BINARIES    = expect
    107107BINARIES        = $(lib_BINARIES) $(bin_BINARIES)
    108108
    109109SHELL           = @SHELL@
    … …  
    175175TCLSH           = $(TCLSH_ENV) $(TCLSH_PROG)
    176176SHARED_BUILD    = @SHARED_BUILD@
    177177
    178 INCLUDES        = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@
     178INCLUDES        = @PKG_INCLUDES@ @TCL_INCLUDES@
    179179
    180180PKG_CFLAGS      = @PKG_CFLAGS@
    181181
    … …  
    255255        @mkdir -p $(DESTDIR)$(mandir)/man1
    256256        @mkdir -p $(DESTDIR)$(mandir)/man3
    257257        @echo "Installing documentation in $(DESTDIR)$(mandir)"
    258 # install Expectk man page if present
    259         $(INSTALL_DATA) $(srcdir)/expectk.man $(DESTDIR)$(mandir)/man1/expectk.1 ; \
    260258# install Expect man page
    261259        $(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(mandir)/man1/expect.1
    262260# install man page for Expect and Expectk libraries
    … …  
    416414                @EXP_CC_SEARCH_FLAGS@
    417415        $(SETUID) expect
    418416
    419 expectk: exp_main_tk.o $(PKG_LIB_FILE)
    420         $(CC) \
    421                 @CFLAGS@ \
    422                 @EXP_CFLAGS@ \
    423                 @EXP_SHLIB_CFLAGS@ \
    424                 @TCL_LD_FLAGS@ \
    425                 -o expectk exp_main_tk.o \
    426                 @EXP_BUILD_LIB_SPEC@ \
    427                 @TK_LIB_SPEC@ \
    428                 @TCL_LIB_SPEC@ \
    429                 @TK_LIBS@ \
    430                 @TCL_CC_SEARCH_FLAGS@ \
    431                 @EXP_CC_SEARCH_FLAGS@
    432         $(SETUID) expectk
    433 
    434417#========================================================================
    435418# Produce FAQ and homepage
    436419#========================================================================

  • expect-5.44.1.15 

    diff -Naur expect-5.44.1.15.orig/configure expect-5.44.1.15/configure
    old new  
    310310#endif"
    311311
    312312ac_subdirs_all="$ac_subdirs_all testsuite"
    313 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'
     313ac_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'
    314314ac_subst_files=''
    315315
    316316# Initialize some variables set by options.
    … …  
    862862  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    863863  --with-tcl              directory containing tcl configuration
    864864                          (tclConfig.sh)
    865   --with-tk               directory containing tk configuration (tkConfig.sh)
    866   --with-tkinclude      directory containing the public Tk header files.
    867865  --with-celib=DIR        use Windows/CE support library from DIR
    868866
    869867Some influential environment variables:
    … …  
    17381736
    17391737
    17401738
    1741 
    1742     #
    1743     # Ok, lets find the tk configuration
    1744     # First, look for one uninstalled.
    1745     # the alternative search directory is invoked by --with-tk
    1746     #
    1747 
    1748     if test x"${no_tk}" = x ; then
    1749         # we reset no_tk in case something fails here
    1750         no_tk=true
    1751 
    1752 # Check whether --with-tk or --without-tk was given.
    1753 if test "${with_tk+set}" = set; then
    1754   withval="$with_tk"
    1755   with_tkconfig=${withval}
    1756 fi;
    1757         echo "$as_me:$LINENO: checking for Tk configuration" >&5
    1758 echo $ECHO_N "checking for Tk configuration... $ECHO_C" >&6
    1759         if test "${ac_cv_c_tkconfig+set}" = set; then
    1760   echo $ECHO_N "(cached) $ECHO_C" >&6
    1761 else
    1762 
    1763 
    1764             # First check to see if --with-tkconfig was specified.
    1765             if test x"${with_tkconfig}" != x ; then
    1766                 case ${with_tkconfig} in
    1767                     */tkConfig.sh )
    1768                         if test -f ${with_tkconfig}; then
    1769                             { echo "$as_me:$LINENO: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&5
    1770 echo "$as_me: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&2;}
    1771                             with_tkconfig=`echo ${with_tkconfig} | sed 's!/tkConfig\.sh$!!'`
    1772                         fi ;;
    1773                 esac
    1774                 if test -f "${with_tkconfig}/tkConfig.sh" ; then
    1775                     ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)`
    1776                 else
    1777                     { { echo "$as_me:$LINENO: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&5
    1778 echo "$as_me: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&2;}
    1779    { (exit 1); exit 1; }; }
    1780                 fi
    1781             fi
    1782 
    1783             # then check for a private Tk library
    1784             if test x"${ac_cv_c_tkconfig}" = x ; then
    1785                 for i in \
    1786                         ../tk \
    1787                         `ls -dr ../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
    1788                         `ls -dr ../tk[8-9].[0-9] 2>/dev/null` \
    1789                         `ls -dr ../tk[8-9].[0-9]* 2>/dev/null` \
    1790                         ../../tk \
    1791                         `ls -dr ../../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
    1792                         `ls -dr ../../tk[8-9].[0-9] 2>/dev/null` \
    1793                         `ls -dr ../../tk[8-9].[0-9]* 2>/dev/null` \
    1794                         ../../../tk \
    1795                         `ls -dr ../../../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
    1796                         `ls -dr ../../../tk[8-9].[0-9] 2>/dev/null` \
    1797                         `ls -dr ../../../tk[8-9].[0-9]* 2>/dev/null` ; do
    1798                     if test -f "$i/unix/tkConfig.sh" ; then
    1799                         ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
    1800                         break
    1801                     fi
    1802                 done
    1803             fi
    1804 
    1805             # on Darwin, check in Framework installation locations
    1806             if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then
    1807                 for i in `ls -d ~/Library/Frameworks 2>/dev/null` \
    1808                         `ls -d /Library/Frameworks 2>/dev/null` \
    1809                         `ls -d /Network/Library/Frameworks 2>/dev/null` \
    1810                         `ls -d /System/Library/Frameworks 2>/dev/null` \
    1811                         ; do
    1812                     if test -f "$i/Tk.framework/tkConfig.sh" ; then
    1813                         ac_cv_c_tkconfig=`(cd $i/Tk.framework; pwd)`
    1814                         break
    1815                     fi
    1816                 done
    1817             fi
    1818 
    1819             # check in a few common install locations
    1820             if test x"${ac_cv_c_tkconfig}" = x ; then
    1821                 for i in `ls -d ${libdir} 2>/dev/null` \
    1822                         `ls -d ${exec_prefix}/lib 2>/dev/null` \
    1823                         `ls -d ${prefix}/lib 2>/dev/null` \
    1824                         `ls -d /usr/local/lib 2>/dev/null` \
    1825                         `ls -d /usr/contrib/lib 2>/dev/null` \
    1826                         `ls -d /usr/lib 2>/dev/null` \
    1827                         ; do
    1828                     if test -f "$i/tkConfig.sh" ; then
    1829                         ac_cv_c_tkconfig=`(cd $i; pwd)`
    1830                         break
    1831                     fi
    1832                 done
    1833             fi
    1834 
    1835             # on Windows, check in common installation locations
    1836             if test "${TEA_PLATFORM}" = "windows" \
    1837                 -a x"${ac_cv_c_tclconfig}" = x ; then
    1838                 for i in `ls -d C:/Tcl/lib 2>/dev/null` \
    1839                         `ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \
    1840                         ; do
    1841                     if test -f "$i/tclConfig.sh" ; then
    1842                         ac_cv_c_tclconfig=`(cd $i; pwd)`
    1843                         break
    1844                     fi
    1845                 done
    1846             fi
    1847 
    1848             # check in a few other private locations
    1849             if test x"${ac_cv_c_tkconfig}" = x ; then
    1850                 for i in \
    1851                         ${srcdir}/../tk \
    1852                         `ls -dr ${srcdir}/../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
    1853                         `ls -dr ${srcdir}/../tk[8-9].[0-9] 2>/dev/null` \
    1854                         `ls -dr ${srcdir}/../tk[8-9].[0-9]* 2>/dev/null` ; do
    1855                     if test -f "$i/unix/tkConfig.sh" ; then
    1856                         ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
    1857                         break
    1858                     fi
    1859                 done
    1860             fi
    1861 
    1862 fi
    1863 
    1864 
    1865         if test x"${ac_cv_c_tkconfig}" = x ; then
    1866             TK_BIN_DIR="# no Tk configs found"
    1867             { echo "$as_me:$LINENO: WARNING: Can't find Tk configuration definitions" >&5
    1868 echo "$as_me: WARNING: Can't find Tk configuration definitions" >&2;}
    1869             exit 0
    1870         else
    1871             no_tk=
    1872             TK_BIN_DIR=${ac_cv_c_tkconfig}
    1873             echo "$as_me:$LINENO: result: found ${TK_BIN_DIR}/tkConfig.sh" >&5
    1874 echo "${ECHO_T}found ${TK_BIN_DIR}/tkConfig.sh" >&6
    1875         fi
    1876     fi
    1877 
    1878 
    1879     echo "$as_me:$LINENO: checking for existence of ${TK_BIN_DIR}/tkConfig.sh" >&5
    1880 echo $ECHO_N "checking for existence of ${TK_BIN_DIR}/tkConfig.sh... $ECHO_C" >&6
    1881 
    1882     if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then
    1883         echo "$as_me:$LINENO: result: loading" >&5
    1884 echo "${ECHO_T}loading" >&6
    1885         . ${TK_BIN_DIR}/tkConfig.sh
    1886     else
    1887         echo "$as_me:$LINENO: result: could not find ${TK_BIN_DIR}/tkConfig.sh" >&5
    1888 echo "${ECHO_T}could not find ${TK_BIN_DIR}/tkConfig.sh" >&6
    1889     fi
    1890 
    1891     # eval is required to do the TK_DBGX substitution
    1892     eval "TK_LIB_FILE=\"${TK_LIB_FILE}\""
    1893     eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\""
    1894 
    1895     # If the TK_BIN_DIR is the build directory (not the install directory),
    1896     # then set the common variable name to the value of the build variables.
    1897     # For example, the variable TK_LIB_SPEC will be set to the value
    1898     # of TK_BUILD_LIB_SPEC. An extension should make use of TK_LIB_SPEC
    1899     # instead of TK_BUILD_LIB_SPEC since it will work with both an
    1900     # installed and uninstalled version of Tcl.
    1901     if test -f ${TK_BIN_DIR}/Makefile ; then
    1902         TK_LIB_SPEC=${TK_BUILD_LIB_SPEC}
    1903         TK_STUB_LIB_SPEC=${TK_BUILD_STUB_LIB_SPEC}
    1904         TK_STUB_LIB_PATH=${TK_BUILD_STUB_LIB_PATH}
    1905     elif test "`uname -s`" = "Darwin"; then
    1906         # If Tk was built as a framework, attempt to use the libraries
    1907         # from the framework at the given location so that linking works
    1908         # against Tk.framework installed in an arbitary location.
    1909         case ${TK_DEFS} in
    1910             *TK_FRAMEWORK*)
    1911                 if test -f ${TK_BIN_DIR}/${TK_LIB_FILE}; then
    1912                     for i in "`cd ${TK_BIN_DIR}; pwd`" \
    1913                              "`cd ${TK_BIN_DIR}/../..; pwd`"; do
    1914                         if test "`basename "$i"`" = "${TK_LIB_FILE}.framework"; then
    1915                             TK_LIB_SPEC="-F`dirname "$i"` -framework ${TK_LIB_FILE}"
    1916                             break
    1917                         fi
    1918                     done
    1919                 fi
    1920                 if test -f ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}; then
    1921                     TK_STUB_LIB_SPEC="-L${TK_BIN_DIR} ${TK_STUB_LIB_FLAG}"
    1922                     TK_STUB_LIB_PATH="${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"
    1923                 fi
    1924                 ;;
    1925         esac
    1926     fi
    1927 
    1928     # eval is required to do the TK_DBGX substitution
    1929     eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\""
    1930     eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\""
    1931     eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\""
    1932     eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\""
    1933 
    1934     # Ensure windowingsystem is defined
    1935     if test "${TEA_PLATFORM}" = "unix" ; then
    1936         case ${TK_DEFS} in
    1937             *MAC_OSX_TK*)
    1938 
    1939 cat >>confdefs.h <<\_ACEOF
    1940 #define MAC_OSX_TK 1
    1941 _ACEOF
    1942 
    1943                 TEA_WINDOWINGSYSTEM="aqua"
    1944                 ;;
    1945             *)
    1946                 TEA_WINDOWINGSYSTEM="x11"
    1947                 ;;
    1948         esac
    1949     elif test "${TEA_PLATFORM}" = "windows" ; then
    1950         TEA_WINDOWINGSYSTEM="win32"
    1951     fi
    1952 
    1953 
    1954 
    1955 
    1956 
    1957 
    1958 
    1959 
    1960 
    1961 
    1962 
    1963 
    1964 
    1965 
    1966 
    1967 
    1968 
    19691739#-----------------------------------------------------------------------
    19701740# Handle the --prefix=... option by defaulting to what Tcl gave.
    19711741# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
    … …  
    64586228echo "${ECHO_T}Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}" >&6
    64596229
    64606230
    6461     echo "$as_me:$LINENO: checking for Tk public headers" >&5
    6462 echo $ECHO_N "checking for Tk public headers... $ECHO_C" >&6
    6463 
    6464 
    6465 # Check whether --with-tkinclude or --without-tkinclude was given.
    6466 if test "${with_tkinclude+set}" = set; then
    6467   withval="$with_tkinclude"
    6468   with_tkinclude=${withval}
    6469 fi;
    6470 
    6471     if test "${ac_cv_c_tkh+set}" = set; then
    6472   echo $ECHO_N "(cached) $ECHO_C" >&6
    6473 else
    6474 
    6475         # Use the value from --with-tkinclude, if it was given
    6476 
    6477         if test x"${with_tkinclude}" != x ; then
    6478             if test -f "${with_tkinclude}/tk.h" ; then
    6479                 ac_cv_c_tkh=${with_tkinclude}
    6480             else
    6481                 { { echo "$as_me:$LINENO: error: ${with_tkinclude} directory does not contain tk.h" >&5
    6482 echo "$as_me: error: ${with_tkinclude} directory does not contain tk.h" >&2;}
    6483    { (exit 1); exit 1; }; }
    6484             fi
    6485         else
    6486             if test "`uname -s`" = "Darwin"; then
    6487                 # If Tk was built as a framework, attempt to use
    6488                 # the framework's Headers directory.
    6489                 case ${TK_DEFS} in
    6490                     *TK_FRAMEWORK*)
    6491                         list="`ls -d ${TK_BIN_DIR}/Headers 2>/dev/null`"
    6492                         ;;
    6493                 esac
    6494             fi
    6495 
    6496             # Look in the source dir only if Tk is not installed,
    6497             # and in that situation, look there before installed locations.
    6498             if test -f "${TK_BIN_DIR}/Makefile" ; then
    6499                 list="$list `ls -d ${TK_SRC_DIR}/generic 2>/dev/null`"
    6500             fi
    6501 
    6502             # Check order: pkg --prefix location, Tk's --prefix location,
    6503             # relative to directory of tkConfig.sh, Tcl's --prefix location,
    6504             # relative to directory of tclConfig.sh.
    6505 
    6506             eval "temp_includedir=${includedir}"
    6507             list="$list \
    6508                 `ls -d ${temp_includedir}        2>/dev/null` \
    6509                 `ls -d ${TK_PREFIX}/include      2>/dev/null` \
    6510                 `ls -d ${TK_BIN_DIR}/../include  2>/dev/null` \
    6511                 `ls -d ${TCL_PREFIX}/include     2>/dev/null` \
    6512                 `ls -d ${TCL_BIN_DIR}/../include 2>/dev/null`"
    6513             if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then
    6514                 list="$list /usr/local/include /usr/include"
    6515             fi
    6516             for i in $list ; do
    6517                 if test -f "$i/tk.h" ; then
    6518                     ac_cv_c_tkh=$i
    6519                     break
    6520                 fi
    6521             done
    6522         fi
    6523 
    6524 fi
    6525 
    6526 
    6527     # Print a message based on how we determined the include path
    6528 
    6529     if test x"${ac_cv_c_tkh}" = x ; then
    6530         { { echo "$as_me:$LINENO: error: tk.h not found.  Please specify its location with --with-tkinclude" >&5
    6531 echo "$as_me: error: tk.h not found.  Please specify its location with --with-tkinclude" >&2;}
    6532    { (exit 1); exit 1; }; }
    6533     else
    6534         echo "$as_me:$LINENO: result: ${ac_cv_c_tkh}" >&5
    6535 echo "${ECHO_T}${ac_cv_c_tkh}" >&6
    6536     fi
    6537 
    6538     # Convert to a native path and substitute into the output files.
    6539 
    6540     INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}`
    6541 
    6542     TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\"
    6543 
    6544 
    6545 
    6546     if test "${TEA_WINDOWINGSYSTEM}" = "win32" \
    6547         -o "${TEA_WINDOWINGSYSTEM}" = "aqua"; then
    6548         # On Windows and Aqua, we need the X compat headers
    6549         echo "$as_me:$LINENO: checking for X11 header files" >&5
    6550 echo $ECHO_N "checking for X11 header files... $ECHO_C" >&6
    6551         if test ! -r "${INCLUDE_DIR_NATIVE}/X11/Xlib.h"; then
    6552             INCLUDE_DIR_NATIVE="`${CYGPATH} ${TK_SRC_DIR}/xlib`"
    6553             TK_XINCLUDES=-I\"${INCLUDE_DIR_NATIVE}\"
    6554 
    6555         fi
    6556         echo "$as_me:$LINENO: result: ${INCLUDE_DIR_NATIVE}" >&5
    6557 echo "${ECHO_T}${INCLUDE_DIR_NATIVE}" >&6
    6558     fi
    6559 
    6560 
    65616231#--------------------------------------------------------------------
    65626232# A few miscellaneous platform-specific items:
    65636233#
    … …  
    1728016950s,@TCL_EXTRA_CFLAGS@,$TCL_EXTRA_CFLAGS,;t t
    1728116951s,@TCL_LD_FLAGS@,$TCL_LD_FLAGS,;t t
    1728216952s,@TCL_SHLIB_LD_LIBS@,$TCL_SHLIB_LD_LIBS,;t t
    17283 s,@TK_VERSION@,$TK_VERSION,;t t
    17284 s,@TK_BIN_DIR@,$TK_BIN_DIR,;t t
    17285 s,@TK_SRC_DIR@,$TK_SRC_DIR,;t t
    17286 s,@TK_LIB_FILE@,$TK_LIB_FILE,;t t
    17287 s,@TK_LIB_FLAG@,$TK_LIB_FLAG,;t t
    17288 s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
    17289 s,@TK_STUB_LIB_FILE@,$TK_STUB_LIB_FILE,;t t
    17290 s,@TK_STUB_LIB_FLAG@,$TK_STUB_LIB_FLAG,;t t
    17291 s,@TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t
    17292 s,@TK_LIBS@,$TK_LIBS,;t t
    17293 s,@TK_XINCLUDES@,$TK_XINCLUDES,;t t
    1729416953s,@CC@,$CC,;t t
    1729516954s,@CFLAGS@,$CFLAGS,;t t
    1729616955s,@LDFLAGS@,$LDFLAGS,;t t
    … …  
    1731416973s,@TCL_TOOL_DIR_NATIVE@,$TCL_TOOL_DIR_NATIVE,;t t
    1731516974s,@TCL_PLATFORM_DIR_NATIVE@,$TCL_PLATFORM_DIR_NATIVE,;t t
    1731616975s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t
    17317 s,@TK_INCLUDES@,$TK_INCLUDES,;t t
    1731816976s,@CLEANFILES@,$CLEANFILES,;t t
    1731916977s,@TCL_THREADS@,$TCL_THREADS,;t t
    1732016978s,@SHARED_BUILD@,$SHARED_BUILD,;t t

  • expect-5.44.1.15 

    diff -Naur expect-5.44.1.15.orig/configure.in expect-5.44.1.15/configure.in
    old new  
    4949TEA_PATH_TCLCONFIG
    5050TEA_LOAD_TCLCONFIG
    5151
    52 TEA_PATH_TKCONFIG
    53 TEA_LOAD_TKCONFIG
    54 
    5552#-----------------------------------------------------------------------
    5653# Handle the --prefix=... option by defaulting to what Tcl gave.
    5754# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
    … …  
    7976
    8077#TEA_PUBLIC_TCL_HEADERS
    8178TEA_PRIVATE_TCL_HEADERS
    82 TEA_PUBLIC_TK_HEADERS
    8379
    8480#--------------------------------------------------------------------
    8581# A few miscellaneous platform-specific items:
Note: See TracBrowser for help on using the repository browser.