Check-in [2fded231c2]
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:2fded231c28775e1de7a99aa10e9b00cee182611
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     36   SAVE_LIBS="${LIBS}"
    37     37   LIBS="${ARCHS} ${LIBS}"
    38     38   AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath)
    39     39   LIBS="${SAVE_LIBS}"
    40     40   
    41     41   dnl Find zlib
    42     42   AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [directory containing zlib]), [
           43  +	CPPFLAGS="${CPPFLAGS} -I${with_zlib}/include -I${with_zlib}"
    43     44   	CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}"
    44     45   	LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}"
    45     46   ])
    46     47   DC_DO_STATIC_LINK_LIB(zlib, -lz,, [
    47     48   	DC_DO_STATIC_LINK_LIB(zlib, -lzlib,, [
    48     49   		AC_SEARCH_LIBS(inflate, z zlib,, [
    49     50   			AC_MSG_WARN([Couldn't find inflate (normally in zlib)!])
    50     51   		])
    51     52   	])
    52     53   ])
           54  +
           55  +dnl Determine which storage mechanism to use
           56  +AC_MSG_CHECKING([which Tclkit Storage mechanism to use])
           57  +AC_ARG_ENABLE(kit-storage, AC_HELP_STRING([--enable-kit-storage={zip|mk4}], [Use mk4 for storage (default: auto)]), [
           58  +	case "$enableval" in
           59  +		mk4)
           60  +			AC_MSG_RESULT([mk4])
           61  +			AC_DEFINE([KIT_STORAGE_MK4], [1], [Define if you are going to use Metakit4 for kit storage])
           62  +			;;
           63  +		zip)
           64  +			AC_MSG_RESULT([zip])
           65  +			AC_DEFINE([KIT_STORAGE_ZIP], [1], [Define if you are going to use ZIP for kit storage])
           66  +			;;
           67  +		yes)
           68  +			# If they just want to enable kit storage, but nothing specifically, do nothing
           69  +			AC_MSG_RESULT([auto])
           70  +			;;
           71  +		auto)
           72  +			# Auto is how it works by default
           73  +			AC_MSG_RESULT([auto])
           74  +			;;
           75  +		no)
           76  +			# You can't disable kit storage
           77  +			AC_MSG_RESULT([fail])
           78  +			AC_MSG_ERROR([Kit Storage cannot be disabled])
           79  +			;;
           80  +		*)
           81  +			AC_MSG_RESULT([fail])
           82  +			AC_MSG_ERROR([Unknown kit storage type: $enableval])
           83  +			;;
           84  +	esac
           85  +])
    53     86   
    54     87   dnl Produce output
    55     88   AC_OUTPUT(Makefile)