mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-01 22:05:08 +00:00
108 lines
3.8 KiB
Plaintext
108 lines
3.8 KiB
Plaintext
--- configure.orig Tue Sep 23 16:57:21 1997
|
|
+++ configure Sat Apr 24 14:13:14 1999
|
|
@@ -1060,6 +1060,7 @@
|
|
|
|
if test "$val" != ""; then
|
|
TCL_SRC_DIR=$val
|
|
+ tclsrcdir=$val
|
|
if test ! -d $TCL_SRC_DIR; then
|
|
{ echo "configure: error: Directory $TCL_SRC_DIR doesn't exist" 1>&2; exit 1; }
|
|
{ echo "configure: error: Please install the source code of Tcl 8.0" 1>&2; exit 1; }
|
|
@@ -1082,7 +1083,7 @@
|
|
fi
|
|
echo "$ac_t""$TCL_SRC_DIR" 1>&6
|
|
|
|
-TCL_BIN_DIR=$TCL_SRC_DIR/unix
|
|
+TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.0
|
|
|
|
#--------------------------------------------------------------------
|
|
# See if there was a command-line option for where Tk is; if
|
|
@@ -1102,6 +1103,7 @@
|
|
|
|
if test "$val" != ""; then
|
|
TK_SRC_DIR=$val
|
|
+ tksrcdir=$val
|
|
if test ! -d $TK_SRC_DIR; then
|
|
{ echo "configure: error: Directory $TK_SRC_DIR doesn't exist" 1>&2; exit 1; }
|
|
{ echo "configure: error: Please install the source code of Tk 8.0" 1>&2; exit 1; }
|
|
@@ -1124,7 +1126,7 @@
|
|
fi
|
|
echo "$ac_t""$TK_SRC_DIR" 1>&6
|
|
|
|
-TK_BIN_DIR=$TK_SRC_DIR/unix
|
|
+TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.0
|
|
|
|
#--------------------------------------------------------------------
|
|
# Find out the top level source directory of the Tix package.
|
|
@@ -1195,17 +1197,19 @@
|
|
# up the Tcl library.
|
|
|
|
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
|
|
- TIX_BUILD_LIB_SPEC="-L`pwd` -ltix${VERSION}"
|
|
+ TIX_BUILD_LIB_SPEC="`pwd`/libtix${VERSION}.so.1"
|
|
TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam${VERSION}"
|
|
TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam${TCL_VERSION}"
|
|
TK_BUILD_SAM_SPEC="-L`pwd` -ltksam${TK_VERSION}"
|
|
TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix${VERSION}"
|
|
+ LIB_VERSION="${VERSION}"
|
|
else
|
|
- TIX_BUILD_LIB_SPEC="-L`pwd` -ltix`echo ${VERSION} | tr -d .`"
|
|
+ TIX_BUILD_LIB_SPEC="`pwd`/libtix`echo ${VERSION} | tr -d .`.so.1"
|
|
TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam`echo ${VERSION} | tr -d .`"
|
|
TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam`echo ${TCL_VERSION} | tr -d .`"
|
|
TK_BUILD_SAM_SPEC="-L`pwd` -ltksam`echo ${TK_VERSION} | tr -d .`"
|
|
TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix`echo ${VERSION} | tr -d .`"
|
|
+ LIB_VERSION="`echo ${VERSION} | tr -d .`"
|
|
fi
|
|
|
|
#--------------------------------------------------------------------
|
|
@@ -1227,7 +1231,7 @@
|
|
|
|
# The main Tix library
|
|
#
|
|
- eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}"
|
|
+ eval "TIX_LIB_FILE=libtix${LIB_VERSION}.so.1"
|
|
TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
|
|
|
|
# The Tcl SAM library
|
|
@@ -1245,7 +1249,7 @@
|
|
# The Tix SAM library
|
|
#
|
|
VERSION=${BIN_VERSION}
|
|
- eval "TIX_SAM_FILE=libtixsam${TCL_SHARED_LIB_SUFFIX}"
|
|
+ eval "TIX_SAM_FILE=libtixsam${LIB_VERSION}.so.1"
|
|
TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}"
|
|
|
|
else
|
|
@@ -1707,15 +1711,15 @@
|
|
s%@SHLIB_VERSION@%$SHLIB_VERSION%g
|
|
s%@DL_LIBS@%$DL_LIBS%g
|
|
s%@LD_FLAGS@%$LD_FLAGS%g
|
|
-s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
|
|
+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
|
|
s%@TCL_LIBS@%$TCL_LIBS%g
|
|
s%@TCL_VERSION@%$TCL_VERSION%g
|
|
-s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
|
|
+s%@TCL_SRC_DIR@%$tclsrcdir%g
|
|
s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
|
|
-s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
|
|
+s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
|
|
s%@TK_LIBS@%$TK_LIBS%g
|
|
s%@TK_VERSION@%$TK_VERSION%g
|
|
-s%@TK_SRC_DIR@%$TK_SRC_DIR%g
|
|
+s%@TK_SRC_DIR@%$tksrcdir%g
|
|
s%@TK_BIN_DIR@%$TK_BIN_DIR%g
|
|
s%@TK_XINCLUDES@%$TK_XINCLUDES%g
|
|
s%@TIX_LD_SEARCH_FLAGS@%$TIX_LD_SEARCH_FLAGS%g
|
|
@@ -1738,8 +1742,8 @@
|
|
s%@TIX_SAM_FILE@%$TIX_SAM_FILE%g
|
|
s%@TIX_MAKE_SAM@%$TIX_MAKE_SAM%g
|
|
s%@TIX_DEFS@%$TIX_DEFS%g
|
|
-s%@ITCL_BUILD_LIB_SPEC@%$ITCL_BUILD_LIB_SPEC%g
|
|
-s%@ITK_BUILD_LIB_SPEC@%$ITK_BUILD_LIB_SPEC%g
|
|
+s%@ITCL_LIB_SPEC@%$ITCL_LIB_SPEC%g
|
|
+s%@ITK_LIB_SPEC@%$ITK_LIB_SPEC%g
|
|
s%@TCL_SAMEXE_FILE@%$TCL_SAMEXE_FILE%g
|
|
s%@TK_SAMEXE_FILE@%$TK_SAMEXE_FILE%g
|
|
s%@TIX_SAMEXE_FILE@%$TIX_SAMEXE_FILE%g
|