Check-in [5a492edc2b]
Overview
Comment:Added support for using Tcl's required libs
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:5a492edc2bef2bb6a73af15d1c409f041bc908e8
User & Date: rkeene on 2010-09-26 04:37:55
Other Links: manifest | tags
Context
2010-09-26
04:37
KitCreator 0.0.2.x

Removed generated files from repository

Minor cleanup of configure activities in kitsh check-in: 727034b4dd user: rkeene tags: trunk, 0.0.2

04:37
Added support for using Tcl's required libs check-in: 5a492edc2b user: rkeene tags: trunk
04:37
Added support for creating proper kitsh environment check-in: 5996f7a35f user: rkeene tags: trunk
Changes

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [fe1b839d01] to [08b06ec183].

     1         -AC_DEFUN(DC_DO_NETWORK, [
     2         -	AC_SEARCH_LIBS(inet_aton, xnet ws2_32 wsock32, [
     3         -		AC_DEFINE(HAVE_INET_ATON, [], [Have inet_aton()])
     4         -	], [
     5         -		AC_SEARCH_LIBS(inet_addr, nsl ws2_32 wsock32, [
     6         -			AC_DEFINE(HAVE_INET_ADDR, [], [Have inet_addr()])
     7         -		], [
     8         -			AC_MSG_WARN([could not find inet_addr or inet_aton!])
     9         -		])
    10         -	])
    11         -
    12         -	AC_SEARCH_LIBS(inet_ntoa, socket nsl ws2_32 wsock32,, [ AC_MSG_WARN([Couldn't find inet_ntoa!]) ])
    13         -	AC_SEARCH_LIBS(connect, socket nsl ws2_32 wsock32,, [ AC_MSG_WARN([Couldn't find connect!]) ])
    14         -	AC_SEARCH_LIBS(socket, socket nsl ws2_32 wsock32,, [ AC_MSG_WARN([Couldn't find socket!]) ])
    15         -])
    16         -
    17      1   AC_DEFUN(DC_DO_TCL, [
    18      2   	AC_MSG_CHECKING([path to tcl])
    19      3   	AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl], [directory containing tcl configuration (tclConfig.sh)]), [], [
    20      4   		with_tcl="auto"
    21      5   	])
    22      6   
    23      7   	if test "${with_tcl}" = "auto"; then
................................................................................
    41     25   
    42     26   
    43     27   	source "${tclconfigsh}"
    44     28   
    45     29   	CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
    46     30   	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
    47     31   	LDFLAGS="${LDFLAGS}"
           32  +	LIBS="${LIBS} ${TCL_LIBS}"
    48     33   
    49     34   	AC_SUBST(CFLAGS)
    50     35   	AC_SUBST(CPPFLAGS)
    51     36   	AC_SUBST(LDFLAGS)
           37  +	AC_SUBST(LIBS)
    52     38   
    53     39   	AC_MSG_RESULT([$tclconfigsh])
    54     40   ])
    55     41   
    56     42   AC_DEFUN(DC_DO_STATIC_LINK_LIBCXX, [
    57     43   	AC_MSG_CHECKING([for how to statically link to libstdc++])
    58     44   

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [6a3c97057b] to [d1ba583817].

     5      5   dnl Checks for programs.
     6      6   AC_PROG_CC
     7      7   AC_PROG_MAKE_SET
     8      8   AC_PROG_INSTALL
     9      9   AC_AIX
    10     10   AC_GNU_SOURCE
    11     11   
    12         -dnl Check for network libraries
    13         -DC_DO_NETWORK
    14         -
    15     12   dnl Find the appropriate Tcl headers and libraries
    16     13   DC_DO_TCL
    17     14   
    18     15   dnl Find out how to statically link to libstdc++ (for Metakit)
    19     16   DC_DO_STATIC_LINK_LIBCXX
    20     17   
    21     18   dnl Find the appropriate libraries to link to
    22     19   AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ])
    23     20   AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
    24     21   AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])
    25     22   
    26     23   dnl Produce output
    27     24   AC_OUTPUT(Makefile)