diff options
| author | mdejong <mdejong> | 2001-12-19 08:01:56 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-12-19 08:01:56 (GMT) |
| commit | 6a51736291c6f10e90b7ed6f74ecc498e8609875 (patch) | |
| tree | f0fb6ce0137842bb0697c2b407f1fe93e900b717 | |
| parent | bf9781627759db7fecf23b4fa5726d25722c62be (diff) | |
| download | tk-6a51736291c6f10e90b7ed6f74ecc498e8609875.zip tk-6a51736291c6f10e90b7ed6f74ecc498e8609875.tar.gz tk-6a51736291c6f10e90b7ed6f74ecc498e8609875.tar.bz2 | |
* unix/configure: Regen.
* unix/configure.in: Move EXP file changes over from
Tcl configure script to fix AIX build with gcc. [Bug 220955]
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | unix/configure | 11 | ||||
| -rw-r--r-- | unix/configure.in | 13 |
3 files changed, 23 insertions, 7 deletions
@@ -1,5 +1,11 @@ 2001-12-18 Mo DeJong <mdejong@users.sourceforge.net> + * unix/configure: Regen. + * unix/configure.in: Move EXP file changes over from + Tcl configure script to fix AIX build with gcc. [Bug 220955] + +2001-12-18 Mo DeJong <mdejong@users.sourceforge.net> + * unix/Makefile.in: * win/Makefile.in: Use $(MAKE) instead of make in the tcltest rule. diff --git a/unix/configure b/unix/configure index 1a93941..accf223 100755 --- a/unix/configure +++ b/unix/configure @@ -4426,9 +4426,14 @@ if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then else TK_BUILD_EXP_FILE="lib.exp" eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}" - - TK_BUILD_LIB_SPEC="-bI:`pwd`/${TK_BUILD_EXP_FILE}" - TK_LIB_SPEC="-bI:${exec_prefix}/lib/${TK_EXP_FILE}" + + if test "$GCC" = "yes" ; then + TK_BUILD_LIB_SPEC="-Wl,-bI:`pwd`/${TK_BUILD_EXP_FILE} -L`pwd`" + TK_LIB_SPEC="-Wl,-bI:${exec_prefix}/lib/${TK_EXP_FILE} -L`pwd`" + else + TK_BUILD_LIB_SPEC="-bI:`pwd`/${TK_BUILD_EXP_FILE}" + TK_LIB_SPEC="-bI:${exec_prefix}/lib/${TK_EXP_FILE}" + fi fi TK_SHARED_BUILD=${SHARED_BUILD} diff --git a/unix/configure.in b/unix/configure.in index 9ea75cb..2be2273 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.64 2001/10/15 21:19:16 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.65 2001/12/19 08:01:56 mdejong Exp $ AC_INIT(../generic/tk.h) @@ -382,9 +382,14 @@ if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then else TK_BUILD_EXP_FILE="lib.exp" eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}" - - TK_BUILD_LIB_SPEC="-bI:`pwd`/${TK_BUILD_EXP_FILE}" - TK_LIB_SPEC="-bI:${exec_prefix}/lib/${TK_EXP_FILE}" + + if test "$GCC" = "yes" ; then + TK_BUILD_LIB_SPEC="-Wl,-bI:`pwd`/${TK_BUILD_EXP_FILE} -L`pwd`" + TK_LIB_SPEC="-Wl,-bI:${exec_prefix}/lib/${TK_EXP_FILE} -L`pwd`" + else + TK_BUILD_LIB_SPEC="-bI:`pwd`/${TK_BUILD_EXP_FILE}" + TK_LIB_SPEC="-bI:${exec_prefix}/lib/${TK_EXP_FILE}" + fi fi TK_SHARED_BUILD=${SHARED_BUILD} |