diff options
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 47 |
1 files changed, 8 insertions, 39 deletions
diff --git a/unix/configure.in b/unix/configure.in index 86d841f..c7206c6 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.76 2002/07/19 20:32:00 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.77 2002/07/28 03:23:08 mdejong Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) @@ -47,7 +47,6 @@ if test "${CFLAGS+set}" != "set" ; then fi AC_PROG_CC -AC_PROG_RANLIB #------------------------------------------------------------------------ # I'm not sure why these need to come before all of the other tests @@ -244,17 +243,17 @@ fi # string in TCL_LD_SEARCH_FLAGS, which causes a substitution of the # variable LIB_RUNTIME_DIR. -eval "TK_CC_SEARCH_FLAGS=\"$TCL_LD_SEARCH_FLAGS\"" +eval "CC_SEARCH_FLAGS=\"$TCL_LD_SEARCH_FLAGS\"" # The following case handles the differences between linking with "ld" # and the compiler case $SHLIB_LD in *ld*) - TK_LD_SEARCH_FLAGS=`echo ${TK_CC_SEARCH_FLAGS} |sed -e "s|-Wl,||g" -e "s|,| |g"` + LD_SEARCH_FLAGS=`echo ${CC_SEARCH_FLAGS} |sed -e "s|-Wl,||g" -e "s|,| |g"` ;; *) - TK_LD_SEARCH_FLAGS="${TK_CC_SEARCH_FLAGS}" + LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}" ;; esac @@ -360,20 +359,12 @@ eval eval "TK_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}" eval eval "TK_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}" if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then - TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" - TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX} - MAKE_LIB="\${SHLIB_LD} -o \[$]@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) \${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}" - RANLIB=":" - + SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_STUB_LIB_SPEC}" TCL_STUB_FLAGS="-DUSE_TCL_STUBS" else - TK_SHLIB_CFLAGS="" - TK_LIB_FILE=libtk${TK_UNSHARED_LIB_SUFFIX} - MAKE_LIB="\${STLIB_LD} \[$]@ \${OBJS}" - TCL_STUB_FLAGS="" fi - +TK_LIB_FILE=libtk${LIB_SUFFIX} eval "TK_LIB_FILE=${TK_LIB_FILE}" # Note: in the following variable, it's important to use the absolute @@ -417,9 +408,6 @@ TK_SHARED_BUILD=${SHARED_BUILD} # Replace ${VERSION} with contents of ${TK_VERSION} eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" -# FIXME: Should we add MAKE_STUB_LIB to tclConfig.sh ? -MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \${STUB_LIB_OBJS}" - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}" else @@ -445,7 +433,6 @@ AC_SUBST(TK_BUILD_STUB_LIB_SPEC) AC_SUBST(TK_STUB_LIB_SPEC) AC_SUBST(TK_BUILD_STUB_LIB_PATH) AC_SUBST(TK_STUB_LIB_PATH) -AC_SUBST(MAKE_STUB_LIB) AC_SUBST(TK_STUB_FLAGS) AC_SUBST(TK_BUILD_EXP_FILE) AC_SUBST(TK_EXP_FILE) @@ -454,28 +441,10 @@ AC_SUBST(TCL_STUB_FLAGS) AC_SUBST(TK_BUILD_EXP_FILE) AC_SUBST(TK_EXP_FILE) -AC_SUBST(CFLAGS_DEFAULT) -AC_SUBST(CFLAGS_DEBUG) -AC_SUBST(CFLAGS_OPTIMIZE) -AC_SUBST(LDFLAGS_DEFAULT) -AC_SUBST(LDFLAGS_DEBUG) -AC_SUBST(LDFLAGS_OPTIMIZE) -AC_SUBST(DL_LIBS) -AC_SUBST(EXTRA_CFLAGS) AC_SUBST(MATH_LIBS) -AC_SUBST(AR) -AC_SUBST(RANLIB) -AC_SUBST(MAKE_LIB) -AC_SUBST(SHLIB_CFLAGS) -AC_SUBST(TK_SHLIB_CFLAGS) -AC_SUBST(STLIB_LD) -AC_SUBST(SHLIB_LD) -AC_SUBST(SHLIB_LD_LIBS) -AC_SUBST(SHLIB_SUFFIX) -AC_SUBST(SHLIB_VERSION) +AC_SUBST(CC_SEARCH_FLAGS) +AC_SUBST(LD_SEARCH_FLAGS) AC_SUBST(TK_BUILD_LIB_SPEC) -AC_SUBST(TK_CC_SEARCH_FLAGS) -AC_SUBST(TK_LD_SEARCH_FLAGS) AC_SUBST(TK_LIB_FILE) AC_SUBST(TK_LIB_FLAG) AC_SUBST(TK_LIB_SPEC) |