Overview
| Comment: | Added support for selecting which kit storage mechanism to use using
"--enable-kit-storage={zip|mk4}"
Updated CPPFLAGS to include -I options for zlib, for consistency |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
2fded231c28775e1de7a99aa10e9b00c |
| User & Date: | rkeene on 2010-09-26 04:44:04 |
| Other Links: | manifest | tags |
Context
|
2010-09-26
| ||
| 04:44 |
KitCreator 0.3.1.x
Updated documentation regarding to new storage options check-in: ad81f6cde8 user: rkeene tags: trunk, 0.3.1 | |
| 04:44 |
Added support for selecting which kit storage mechanism to use using
"--enable-kit-storage={zip|mk4}"
Updated CPPFLAGS to include -I options for zlib, for consistency check-in: 2fded231c2 user: rkeene tags: trunk | |
| 04:44 | Reverted cleanup of tclExecutableName check-in: 0368915b0d user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [0932e98879] to [2cfb05cb9b].
| ︙ | ︙ | |||
36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
SAVE_LIBS="${LIBS}"
LIBS="${ARCHS} ${LIBS}"
AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath)
LIBS="${SAVE_LIBS}"
dnl Find zlib
AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [directory containing zlib]), [
CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}"
LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}"
])
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)!])
])
])
])
dnl Produce output
AC_OUTPUT(Makefile)
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 |
SAVE_LIBS="${LIBS}"
LIBS="${ARCHS} ${LIBS}"
AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath)
LIBS="${SAVE_LIBS}"
dnl Find zlib
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}"
])
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)!])
])
])
])
dnl Determine which storage mechanism to use
AC_MSG_CHECKING([which Tclkit Storage mechanism to use])
AC_ARG_ENABLE(kit-storage, AC_HELP_STRING([--enable-kit-storage={zip|mk4}], [Use mk4 for storage (default: auto)]), [
case "$enableval" in
mk4)
AC_MSG_RESULT([mk4])
AC_DEFINE([KIT_STORAGE_MK4], [1], [Define if you are going to use Metakit4 for kit storage])
;;
zip)
AC_MSG_RESULT([zip])
AC_DEFINE([KIT_STORAGE_ZIP], [1], [Define if you are going to use ZIP for kit storage])
;;
yes)
# If they just want to enable kit storage, but nothing specifically, do nothing
AC_MSG_RESULT([auto])
;;
auto)
# Auto is how it works by default
AC_MSG_RESULT([auto])
;;
no)
# You can't disable kit storage
AC_MSG_RESULT([fail])
AC_MSG_ERROR([Kit Storage cannot be disabled])
;;
*)
AC_MSG_RESULT([fail])
AC_MSG_ERROR([Unknown kit storage type: $enableval])
;;
esac
])
dnl Produce output
AC_OUTPUT(Makefile)
|