diff options
Diffstat (limited to 'itcl/itcl/configure.in')
| -rw-r--r-- | itcl/itcl/configure.in | 133 |
1 files changed, 33 insertions, 100 deletions
diff --git a/itcl/itcl/configure.in b/itcl/itcl/configure.in index c33a8ffa904..b63ca4105be 100644 --- a/itcl/itcl/configure.in +++ b/itcl/itcl/configure.in @@ -13,9 +13,7 @@ #-------------------------------------------------------------------- AC_INIT(generic/itcl.h) -# CYGNUS LOCAL -AC_CONFIG_AUX_DIR(../..) -# END CYGNUS LOCAL +AC_CONFIG_AUX_DIR(../config) #-------------------------------------------------------------------- # __CHANGE__ @@ -29,7 +27,7 @@ PACKAGE=itcl MAJOR_VERSION=3 MINOR_VERSION=2 -PATCHLEVEL=.0 +PATCHLEVEL=.1 VERSION=${MAJOR_VERSION}.${MINOR_VERSION} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} @@ -64,10 +62,7 @@ fi # was not used. #-------------------------------------------------------------------- -# CYGNUS LOCAL -dnl SC_ENABLE_GCC -AC_PROG_CC -# END CYGNUS LOCAL +SC_ENABLE_GCC AC_PROG_INSTALL #-------------------------------------------------------------------- @@ -112,8 +107,9 @@ AC_EXEEXT # file for you. #-------------------------------------------------------------------- -case "${host}" in - *mingw32* | *windows32*) +case "`uname -s`" in + *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*) + CYGPATH="cygpath -w" AC_CHECK_PROG(CYGPATH, cygpath, cygpath -w, echo) RELPATH=".. .. bin" ;; @@ -130,16 +126,12 @@ AC_SUBST(RELPATH) # Includes for this package #-------------------------------------------------------------------- -# CYGNUS LOCAL -srcdir=`cd ${srcdir} ; pwd` -ITCL_SRC_DIR_NATIVE=`${CYGPATH} ${srcdir}` -# END CYGNUS LOCAL ITCL_GENERIC_DIR_NATIVE=`${CYGPATH} ${srcdir}/generic` ITCL_WIN_DIR_NATIVE=`${CYGPATH} ${srcdir}/win` ITCL_UNIX_DIR_NATIVE=`${CYGPATH} ${srcdir}/unix` -case "${host}" in - *cygwin* | *mingw32* | *windows32*) +case "`uname -s`" in + *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*) ITCL_PLATFORM_DIR_NATIVE=${ITCL_WIN_DIR_NATIVE} ;; *) @@ -192,8 +184,8 @@ SC_PRIVATE_TCL_HEADERS # your system. #-------------------------------------------------------------------- -case "${host}" in - *cygwin*| *mingw32* | *windows32*) +case "`uname -s`" in + *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*) AC_DEFINE(BUILD_itcl) CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch" PLATFORM_SOURCES='$(WIN_SOURCES)' @@ -291,56 +283,28 @@ eval "UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}" # Shared libraries and static libraries have different names. #-------------------------------------------------------------------- -# CYGNUS LOCAL - -if test "${SHARED_BUILD}" = "1" ; then - # FIXME: Need to devise a TCL_TOOL macro to deal with this! - case "${host}" in - *cygwin* | *mingw32* | *windows32*) - SHLIB_LD_LIBS="${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}" - # Need to link to the .a or .lib not the .dll! - TCL_TOOL_SHARED_LIB_LONGNAME(ITCL_SHLIB_FILE, ${PACKAGE}, ${SHARED_LIB_SUFFIX}) - TCL_TOOL_STATIC_LIB_LONGNAME(ITCL_LIB_FILE, ${PACKAGE}, ${UNSHARED_LIB_SUFFIX}) - ITCL_TARGET_FILE=${ITCL_SHLIB_FILE} - ;; +case "`uname -s`" in + *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*) + if test "${SHARED_BUILD}" = "1" ; then + SHLIB_LD_LIBS="\"`cygpath -w ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\" ${TCL_SHLIB_LD_LIBS}" + eval "${PACKAGE}_LIB_FILE=${PACKAGE}${SHARED_LIB_SUFFIX}" + RANLIB=: + else + eval "${PACKAGE}_LIB_FILE=${PACKAGE}${UNSHARED_LIB_SUFFIX}" + fi + eval "${PACKAGE}stub_LIB_FILE=${PACKAGE}stub${UNSHARED_LIB_SUFFIX}" + ;; *) - SHLIB_LD_LIBS="${TCL_BUILD_LIB_SPEC}" - TCL_TOOL_SHARED_LIB_LONGNAME(ITCL_LIB_FILE, ${PACKAGE}, ${SHARED_LIB_SUFFIX}) - ITCL_TARGET_FILE=${ITCL_LIB_FILE} - ;; - esac -else - TCL_TOOL_STATIC_LIB_LONGNAME(ITCL_LIB_FILE, ${PACKAGE}, ${UNSHARED_LIB_SUFFIX}) - ITCL_TARGET_FILE=${ITCL_LIB_FILE} -fi - -TCL_TOOL_STATIC_LIB_LONGNAME(ITCL_STUB_LIB_FILE, ${PACKAGE}stub, ${UNSHARED_LIB_SUFFIX}) - -AC_SUBST(ITCL_LIB_FILE) -AC_SUBST(ITCL_STUB_LIB_FILE) - -TCL_TOOL_LIB_SHORTNAME(ITCL_LIB_FLAG, ${PACKAGE}, ${VERSION}) -TCL_TOOL_LIB_SHORTNAME(ITCL_STUB_LIB_FLAG, ${PACKAGE}stub, ${VERSION}) - -TCL_TOOL_LIB_SPEC(ITCL_BUILD_LIB_SPEC, `pwd`, ${ITCL_LIB_FLAG}) -TCL_TOOL_LIB_SPEC(ITCL_BUILD_STUB_LIB_SPEC, `pwd`, ${ITCL_STUB_LIB_FLAG}) -AC_SUBST(ITCL_BUILD_LIB_SPEC) -AC_SUBST(ITCL_BUILD_STUB_LIB_SPEC) - -TCL_TOOL_LIB_SPEC(ITCL_LIB_SPEC, ${exec_prefix}/lib, ${ITCL_LIB_FLAG}) -TCL_TOOL_LIB_SPEC(ITCL_STUB_LIB_SPEC, ${exec_prefix}/lib, ${ITCL_STUB_LIB_FLAG}) -AC_SUBST(ITCL_LIB_SPEC) -AC_SUBST(ITCL_STUB_LIB_SPEC) - -TCL_TOOL_LIB_PATH(ITCL_LIB_FULL_PATH, `pwd`, ${ITCL_LIB_FILE}) -TCL_TOOL_LIB_PATH(ITCL_STUB_LIB_FULL_PATH, `pwd`, ${ITCL_STUB_LIB_FILE}) -AC_SUBST(ITCL_LIB_FULL_PATH) -AC_SUBST(ITCL_STUB_LIB_FULL_PATH) - -itclstub_LIB_FILE=${ITCL_STUB_LIB_FILE} -itcl_LIB_FILE=${ITCL_TARGET_FILE} - -# END CYGNUS LOCAL + if test "${SHARED_BUILD}" = "1" ; then + SHLIB_LD_LIBS="${TCL_BUILD_STUB_LIB_SPEC}" + eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}" + RANLIB=: + else + eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${UNSHARED_LIB_SUFFIX}" + fi + eval "${PACKAGE}stub_LIB_FILE=lib${PACKAGE}stub${UNSHARED_LIB_SUFFIX}" + ;; +esac #-------------------------------------------------------------------- # __CHANGE__ @@ -368,42 +332,11 @@ AC_CACHE_VAL(ac_cv_itclstub_LIB_FILE, ac_cv_itclstub_LIB_FILE=${itclstub_LIB_FIL # versions have bugs in the pkg_mkIndex routine. #-------------------------------------------------------------------- -# CYGNUS LOCAL -# A Tcl shell is not available when bootstrapping! -dnl SC_PROG_TCLSH -# END CYGNUS LOCAL +SC_PROG_TCLSH #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. #-------------------------------------------------------------------- -# CYGNUS LOCAL - -# Note: The itclConfig.sh file below is not included in the net release. -# We subst these variables to retain compatibility with the previous -# version of itclConfig.sh. - -ITCL_VERSION=${VERSION} -AC_SUBST(ITCL_VERSION) - -ITCL_MAJOR_VERSION=${MAJOR_VERSION} -AC_SUBST(ITCL_MAJOR_VERSION) - -ITCL_MINOR_VERSION=${MINOR_VERSION} -AC_SUBST(ITCL_MINOR_VERSION) - -ITCL_RELEASE_LEVEL=${PATCHLEVEL} -AC_SUBST(ITCL_RELEASE_LEVEL) - -ITCL_SRC_DIR=${ITCL_SRC_DIR_NATIVE} -AC_SUBST(ITCL_SRC_DIR) - -ITCL_SH=NONE -AC_SUBST(ITCL_SH) - - AC_OUTPUT([Makefile \ - itclConfig.sh \ - pkgIndex.tcl]) - -# END CYGNUS LOCAL + pkgIndex.tcl itclConfig.sh]) |