Diff

Differences From Artifact [5f3b54111a]:

To Artifact [a823c6235c]:


28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
])
AC_MSG_RESULT([$TARGET])

dnl Find the appropriate libraries to link to
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)!]) ])

if test "x$TARGET" = "tclkit"; then
	dnl Figure out how to statically link to libgcc, if needed
	DC_STATIC_LIBGCC
else
	dnl We have KitDLL

	dnl Determine system information
	DC_CHK_OS_INFO







|







28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
])
AC_MSG_RESULT([$TARGET])

dnl Find the appropriate libraries to link to
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)!]) ])

if test "$TARGET" = "tclkit"; then
	dnl Figure out how to statically link to libgcc, if needed
	DC_STATIC_LIBGCC
else
	dnl We have KitDLL

	dnl Determine system information
	DC_CHK_OS_INFO
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [directory containing zlib]), [
	CPPFLAGS="${CPPFLAGS} -I${with_zlib}/include -I${with_zlib}"
	CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}"
	LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}"
])

dnl Only needed for Tclkit
if test "x$TARGET" = "tclkit"; then
	DC_DO_STATIC_LINK_LIB(zlib, -lz,, [
		DC_DO_STATIC_LINK_LIB(zlib, -lzlib,, [
			AC_SEARCH_LIBS(inflate, z zlib,, [
				AC_MSG_WARN([Couldn't find inflate (normally in zlib)!])
			])
		])
	])







|







96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [directory containing zlib]), [
	CPPFLAGS="${CPPFLAGS} -I${with_zlib}/include -I${with_zlib}"
	CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}"
	LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}"
])

dnl Only needed for Tclkit
if test "$TARGET" = "tclkit"; then
	DC_DO_STATIC_LINK_LIB(zlib, -lz,, [
		DC_DO_STATIC_LINK_LIB(zlib, -lzlib,, [
			AC_SEARCH_LIBS(inflate, z zlib,, [
				AC_MSG_WARN([Couldn't find inflate (normally in zlib)!])
			])
		])
	])
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
			AC_MSG_ERROR([Unknown kit storage type: $enableval])
			;;
	esac
])
AC_MSG_RESULT([$storage_mech])

dnl Verify sanity of storage mechanism
if ! test "x$TARGET" = "tclkit"; then
	case "$storage_mech" in
		auto|cvfs)
			true
			;;
		*)
			AC_MSG_ERROR([Only "cvfs" and "auto" are valid storage mechanisms when building KitDLL])
			;;







|







149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
			AC_MSG_ERROR([Unknown kit storage type: $enableval])
			;;
	esac
])
AC_MSG_RESULT([$storage_mech])

dnl Verify sanity of storage mechanism
if ! test "$TARGET" = "tclkit"; then
	case "$storage_mech" in
		auto|cvfs)
			true
			;;
		*)
			AC_MSG_ERROR([Only "cvfs" and "auto" are valid storage mechanisms when building KitDLL])
			;;