Diff

Differences From Artifact [42d57f3f66]:

To Artifact [dc51bae560]:


    13     13   EXTRA_KIT_DEPS=""
    14     14   AC_MSG_CHECKING([what target to build])
    15     15   AC_ARG_ENABLE(kitdll, AC_HELP_STRING([--enable-kitdll], [Enable building KitDLL instead of Tclkit (default: no)]), [
    16     16   	AS_CASE([$enableval],
    17     17   		[yes|kitdll], [
    18     18   			TARGET="kitdll"
    19     19   		],
           20  +		static, [
           21  +			TARGET="kitdll-static"
           22  +		]
    20     23   		no, [
    21     24   			true
    22     25   		], [
    23     26   			AC_MSG_RESULT([unknown])
    24     27   
    25     28   			AC_MSG_ERROR([Invalid option: $enableval])
    26     29   		]
    27     30   	)
    28     31   ])
    29     32   AC_MSG_RESULT([$TARGET])
           33  +AC_SUBST(TARGET)
    30     34   
    31     35   dnl Find the appropriate libraries to link to
    32     36   AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
    33     37   AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])
    34     38   
    35     39   AS_IF([test "$TARGET" = "tclkit"], [
    36     40   	dnl We have Tclkit
................................................................................
    47     51   	DC_GET_SHOBJFLAGS
    48     52   
    49     53   	dnl Determine if we have "objcopy" available to weaken non-Tcl/Tk symbols
    50     54   	AC_CHECK_TOOL(OBJCOPY, objcopy, [:])
    51     55   
    52     56   	dnl Define KitDLL usage
    53     57   	AC_DEFINE([TCLKIT_DLL], [1], [Define if you are using a KitDLL rather than a Tclkit])
           58  +
           59  +	dnl Define a static KitDLL
           60  +	AS_IF([test "$TARGET" = "kitdll-static"], [
           61  +		AC_DEFINE([TCLKIT_DLL_STATIC], [1], [Define if you are building a static KitDLL])
           62  +		SHOBJE
           63  +	])
    54     64   ])
    55     65   
    56     66   dnl Figure out how to statically link to libgcc, if needed
    57     67   DC_STATIC_LIBGCC
    58     68   
    59     69   dnl Set linker rpath for tclsh/wish
    60     70   DC_SETLDRUNPATH([.])