diff options
| author | das <das@noemail.net> | 2006-03-22 00:22:05 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2006-03-22 00:22:05 (GMT) |
| commit | c39cf80224c3b166ff6925178b6c66e9e937a00a (patch) | |
| tree | 1df5f2360c507dae06487b6d8c965f8a85227d87 /unix | |
| parent | 799c5b90346732ebdbd14ab41eb8f1881463604e (diff) | |
| download | tk-c39cf80224c3b166ff6925178b6c66e9e937a00a.zip tk-c39cf80224c3b166ff6925178b6c66e9e937a00a.tar.gz tk-c39cf80224c3b166ff6925178b6c66e9e937a00a.tar.bz2 | |
* unix/configure.in: fix detection of symbols build when enabling
TkAqua debug code; filter nm output of libtclstub better to avoid
error on intel macs [Bug 1415789].
* unix/configure: autoconf-2.13
FossilOrigin-Name: 24bb0579fd386a701e3c366990653f539b497ba3
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 6 | ||||
| -rw-r--r-- | unix/configure.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure index 3207b18..54a1378 100755 --- a/unix/configure +++ b/unix/configure @@ -559,7 +559,7 @@ TK_MAJOR_VERSION=8 TK_MINOR_VERSION=4 TK_PATCH_LEVEL=".13" VERSION=${TK_VERSION} -LOCALES="cs de el en en_gb eo es es_es fr it nl pl ru" +LOCALES="cs de el en en_gb eo es es_ES fr it nl pl pt ru" #-------------------------------------------------------------------- # Find and load the tclConfig.sh file @@ -5079,7 +5079,7 @@ EOF LIBS="$LIBS -framework Carbon" CFLAGS="$CFLAGS -fpascal-strings" TK_WINDOWINGSYSTEM=AQUA - if test "${enable_symbols+set}" = set; then + if test "${enable_symbols}" = yes; then cat >> confdefs.h <<\EOF #define TK_MAC_DEBUG 1 EOF @@ -5970,7 +5970,7 @@ fi fi TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version ${TK_VERSION}`echo ${TK_PATCH_LEVEL} | awk '{match($0, "\\\.[0-9]+"); print substr($0,RSTART,RLENGTH)}'`" - TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name ${DYLIB_INSTALL_DIR}/${TK_LIB_FILE} -seg1addr 0xb000000 -unexported_symbols_list $$(f=$(TCL_STUB_LIB_FILE).E && nm -gjp $(TCL_BIN_DIR)/$(TCL_STUB_LIB_FILE) | grep ^_ > $$f && echo $$f)' + TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name ${DYLIB_INSTALL_DIR}/${TK_LIB_FILE} -seg1addr 0xb000000 -unexported_symbols_list $$(f=$(TCL_STUB_LIB_FILE).E && nm -gjp $(TCL_BIN_DIR)/$(TCL_STUB_LIB_FILE) | grep ^_[^_] > $$f && echo $$f)' fi if test "$FRAMEWORK_BUILD" = "1" ; then diff --git a/unix/configure.in b/unix/configure.in index 9dd367d..83161a9 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.30 2006/03/16 14:01:28 dkf Exp $ +# RCS: @(#) $Id: configure.in,v 1.83.2.31 2006/03/22 00:22:09 das Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) @@ -260,7 +260,7 @@ if test $tk_aqua = yes; then LIBS="$LIBS -framework Carbon" CFLAGS="$CFLAGS -fpascal-strings" TK_WINDOWINGSYSTEM=AQUA - if test "${enable_symbols+set}" = set; then + if test "${enable_symbols}" = yes; then AC_DEFINE(TK_MAC_DEBUG, 1, [Are TkAqua debug messages enabled?]) fi else @@ -412,7 +412,7 @@ WISH_RSRC_FILE='wish$(VERSION).rsrc' if test "`uname -s`" = "Darwin" ; then SC_ENABLE_FRAMEWORK TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version ${TK_VERSION}`echo ${TK_PATCH_LEVEL} | awk ['{match($0, "\\\.[0-9]+"); print substr($0,RSTART,RLENGTH)}']`" - TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name ${DYLIB_INSTALL_DIR}/${TK_LIB_FILE} -seg1addr 0xb000000 -unexported_symbols_list $$(f=$(TCL_STUB_LIB_FILE).E && nm -gjp $(TCL_BIN_DIR)/$(TCL_STUB_LIB_FILE) | grep ^_ > $$f && echo $$f)' + TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name ${DYLIB_INSTALL_DIR}/${TK_LIB_FILE} -seg1addr 0xb000000 -unexported_symbols_list $$(f=$(TCL_STUB_LIB_FILE).E && nm -gjp $(TCL_BIN_DIR)/$(TCL_STUB_LIB_FILE) | grep ^_[[^_]] > $$f && echo $$f)' fi if test "$FRAMEWORK_BUILD" = "1" ; then |