Index: configure.in =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- configure.in (.../configure.in) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ configure.in (.../configure.in) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -11,15 +11,15 @@ # for this package, and can be a relative path, such as: # #-------------------------------------------------------------------- -define(XOTclVersion, 1.5.6) +define(XOTclVersion, 1.6.0) AC_INIT([xotcl], [XOTclVersion]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. # This will define a ${TEA_PLATFORM} variable == "unix" or "windows". #-------------------------------------------------------------------- -TEA_INIT([3.6]) +TEA_INIT([3.5]) AC_CONFIG_AUX_DIR(config) #-------------------------------------------------------------------- @@ -103,8 +103,8 @@ # do not modify the following lines manually, they are generated with changeXOTclVersion XOTCL_MAJOR_VERSION=1 -XOTCL_MINOR_VERSION=5 -XOTCL_RELEASE_LEVEL=.6 +XOTCL_MINOR_VERSION=6 +XOTCL_RELEASE_LEVEL=.0 XOTCL_VERSION=${XOTCL_MAJOR_VERSION}.${XOTCL_MINOR_VERSION} NODOT_VERSION=${XOTCL_MAJOR_VERSION}${XOTCL_MINOR_VERSION} @@ -363,6 +363,8 @@ if test "${TEA_PLATFORM}" != "windows" ; then +if test "${TEA_PLATFORM}" != "windows" ; then + XOTCL_BUILD_LIB_SPEC="-L`pwd` -lxotcl${PACKAGE_VERSION}" XOTCL_LIB_SPEC="-L${pkglibdir} -lxotcl${PACKAGE_VERSION}" @@ -391,6 +393,17 @@ fi +else + +XOTCL_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}" +XOTCL_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}" +XOTCL_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" +XOTCL_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" +XOTCL_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}" +XOTCL_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}" + +fi + AC_SUBST(SHARED_LIB_SUFFIX) AC_SUBST(UNSHARED_LIB_SUFFIX) AC_SUBST(XOTCL_BUILD_LIB_SPEC)