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
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
..
41
42
43
44
45
46
47

48
49
50
51

52
53
54
55
56
57
58
AC_DEFUN(DC_DO_NETWORK, [
	AC_SEARCH_LIBS(inet_aton, xnet ws2_32 wsock32, [
		AC_DEFINE(HAVE_INET_ATON, [], [Have inet_aton()])
	], [
		AC_SEARCH_LIBS(inet_addr, nsl ws2_32 wsock32, [
			AC_DEFINE(HAVE_INET_ADDR, [], [Have inet_addr()])
		], [
			AC_MSG_WARN([could not find inet_addr or inet_aton!])
		])
	])

	AC_SEARCH_LIBS(inet_ntoa, socket nsl ws2_32 wsock32,, [ AC_MSG_WARN([Couldn't find inet_ntoa!]) ])
	AC_SEARCH_LIBS(connect, socket nsl ws2_32 wsock32,, [ AC_MSG_WARN([Couldn't find connect!]) ])
	AC_SEARCH_LIBS(socket, socket nsl ws2_32 wsock32,, [ AC_MSG_WARN([Couldn't find socket!]) ])
])

AC_DEFUN(DC_DO_TCL, [
	AC_MSG_CHECKING([path to tcl])
	AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl], [directory containing tcl configuration (tclConfig.sh)]), [], [
		with_tcl="auto"
	])

	if test "${with_tcl}" = "auto"; then
................................................................................


	source "${tclconfigsh}"

	CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
	LDFLAGS="${LDFLAGS}"


	AC_SUBST(CFLAGS)
	AC_SUBST(CPPFLAGS)
	AC_SUBST(LDFLAGS)


	AC_MSG_RESULT([$tclconfigsh])
])

AC_DEFUN(DC_DO_STATIC_LINK_LIBCXX, [
	AC_MSG_CHECKING([for how to statically link to libstdc++])

<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<







 







>




>























1
2
3
4
5
6
7
..
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
















AC_DEFUN(DC_DO_TCL, [
	AC_MSG_CHECKING([path to tcl])
	AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl], [directory containing tcl configuration (tclConfig.sh)]), [], [
		with_tcl="auto"
	])

	if test "${with_tcl}" = "auto"; then
................................................................................


	source "${tclconfigsh}"

	CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
	LDFLAGS="${LDFLAGS}"
	LIBS="${LIBS} ${TCL_LIBS}"

	AC_SUBST(CFLAGS)
	AC_SUBST(CPPFLAGS)
	AC_SUBST(LDFLAGS)
	AC_SUBST(LIBS)

	AC_MSG_RESULT([$tclconfigsh])
])

AC_DEFUN(DC_DO_STATIC_LINK_LIBCXX, [
	AC_MSG_CHECKING([for how to statically link to libstdc++])

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

5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
dnl Checks for programs.
AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_AIX
AC_GNU_SOURCE

dnl Check for network libraries
DC_DO_NETWORK

dnl Find the appropriate Tcl headers and libraries
DC_DO_TCL

dnl Find out how to statically link to libstdc++ (for Metakit)
DC_DO_STATIC_LINK_LIBCXX

dnl Find the appropriate libraries to link to
AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ])
AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])

dnl Produce output
AC_OUTPUT(Makefile)







<
<
<













5
6
7
8
9
10
11



12
13
14
15
16
17
18
19
20
21
22
23
24
dnl Checks for programs.
AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_AIX
AC_GNU_SOURCE




dnl Find the appropriate Tcl headers and libraries
DC_DO_TCL

dnl Find out how to statically link to libstdc++ (for Metakit)
DC_DO_STATIC_LINK_LIBCXX

dnl Find the appropriate libraries to link to
AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ])
AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])

dnl Produce output
AC_OUTPUT(Makefile)