diff options
author | hobbs <hobbs> | 2010-08-12 00:11:17 (GMT) |
---|---|---|
committer | hobbs <hobbs> | 2010-08-12 00:11:17 (GMT) |
commit | 4678f5b6436d4675fc5ef46fb270aa89bfaf382c (patch) | |
tree | 91c0361d885a363542d4b598ff57ae47b3b2b368 /unix/configure.in | |
parent | efc2aa388b3e16809efebb72d32b9b9ba17be69b (diff) | |
download | tcl-4678f5b6436d4675fc5ef46fb270aa89bfaf382c.zip tcl-4678f5b6436d4675fc5ef46fb270aa89bfaf382c.tar.gz tcl-4678f5b6436d4675fc5ef46fb270aa89bfaf382c.tar.bz2 |
* unix/ldAix: remove ancient (pre-4.2) AIX support
* unix/configure: regen with ac-2.59
* unix/configure.in, unix/tclConfig.sh.in, unix/Makefile.in:
* unix/tcl.m4 (AIX): remove the need for ldAIX, replace with
-bexpall/-brtl. Remove TCL_EXP_FILE (export file) and other
baggage that went with it. Remove pre-4 AIX build support.
Diffstat (limited to 'unix/configure.in')
-rw-r--r-- | unix/configure.in | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/unix/configure.in b/unix/configure.in index 3c65243..c3d65b8 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 Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.180.2.16 2010/08/04 17:02:40 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.180.2.17 2010/08/12 00:11:22 hobbs Exp $ AC_INIT([tcl],[8.5]) AC_PREREQ(2.59) @@ -793,31 +793,17 @@ if test "$FRAMEWORK_BUILD" = "1" ; then else # libdir must be a fully qualified path and not ${exec_prefix}/lib eval libdir="$libdir" - if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TCL_LIB_FLAG="-ltcl${TCL_VERSION}" - else - TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`" - fi - TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}" - TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + TCL_LIB_FLAG="-ltcl${TCL_VERSION}" else - TCL_BUILD_EXP_FILE="lib.exp" - eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" - - if test "$GCC" = "yes" ; then - TCL_BUILD_LIB_SPEC="-Wl,-bI:`pwd | sed -e 's/ /\\\\ /g'`/${TCL_BUILD_EXP_FILE} -L`pwd | sed -e 's/ /\\\\ /g'`" - TCL_LIB_SPEC="-Wl,-bI:${libdir}/${TCL_EXP_FILE} -L${libdir}" - else - TCL_BUILD_LIB_SPEC="-bI:`pwd | sed -e 's/ /\\\\ /g'`/${TCL_BUILD_EXP_FILE}" - TCL_LIB_SPEC="-bI:${libdir}/${TCL_EXP_FILE}" - fi + TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`" fi + TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}" + TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" fi VERSION='${VERSION}' eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}" eval "CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}" -eval "CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX}" VERSION=${TCL_VERSION} #-------------------------------------------------------------------- @@ -890,15 +876,11 @@ AC_SUBST(TCL_BUILD_STUB_LIB_PATH) AC_SUBST(TCL_SRC_DIR) AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX) AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX) -AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX) AC_SUBST(TCL_SHARED_BUILD) AC_SUBST(LD_LIBRARY_PATH_VAR) AC_SUBST(TCL_BUILD_LIB_SPEC) -AC_SUBST(TCL_NEEDS_EXP_FILE) -AC_SUBST(TCL_BUILD_EXP_FILE) -AC_SUBST(TCL_EXP_FILE) AC_SUBST(TCL_LIB_VERSIONS_OK) AC_SUBST(TCL_SHARED_LIB_SUFFIX) |