diff options
| author | das <das> | 2008-02-02 23:59:10 (GMT) |
|---|---|---|
| committer | das <das> | 2008-02-02 23:59:10 (GMT) |
| commit | 870a7bc8e458efe58ba40887c06509beea64cc0d (patch) | |
| tree | 8fc9a4a3693faffc8c860136c25fa402d7eaa979 /unix/configure.in | |
| parent | 03def044c94d5a92a5120296510cd2bfa8c9e3fe (diff) | |
| download | tk-870a7bc8e458efe58ba40887c06509beea64cc0d.zip tk-870a7bc8e458efe58ba40887c06509beea64cc0d.tar.gz tk-870a7bc8e458efe58ba40887c06509beea64cc0d.tar.bz2 | |
* macosx/Wish-Info.plist.in: add CFBundleLocalizations key, listing
* unix/configure.in (Darwin): all library/msgs locales.
* unix/configure.in (Darwin): correct Info.plist year substitution in
non-framework builds.
* unix/configure: autoconf-2.13
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/unix/configure.in b/unix/configure.in index 1d2a927..08b27c2 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.83.2.45 2007/12/31 17:20:41 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.83.2.46 2008/02/02 23:59:12 das Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) @@ -440,8 +440,10 @@ if test "`uname -s`" = "Darwin" ; then echo "$LDFLAGS " | grep -q -- '-prebind ' && TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -seg1addr 0xb000000' TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist' EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist' - tk_config_files="${tk_config_files} [Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in]" EXTRA_APP_CC_SWITCHES='-mdynamic-no-pic' + tk_config_files="${tk_config_files} [Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in]" + for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done + TK_YEAR="`date +%Y`" fi if test "$FRAMEWORK_BUILD" = "1" ; then @@ -487,7 +489,6 @@ if test "$FRAMEWORK_BUILD" = "1" ; then EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing ${WISH_RSRC_FILE} to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "${WISH_RSRC_FILE}" "$(BIN_INSTALL_DIR)/../Resources"' fi EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tk.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tkConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."' - TK_YEAR="`date +%Y`" # Don't use AC_DEFINE for the following as the framework version define # needs to go into the Makefile even when using autoheader, so that we # can pick up a potential make override of VERSION. Also, don't put this @@ -607,6 +608,7 @@ AC_SUBST(EXTRA_INSTALL) AC_SUBST(EXTRA_INSTALL_BINARIES) AC_SUBST(EXTRA_BUILD_HTML) AC_SUBST(EXTRA_WISH_LIBS) +AC_SUBST(CFBUNDLELOCALIZATIONS) AC_SUBST(TK_RSRC_FILE) AC_SUBST(WISH_RSRC_FILE) |