7a0351bb5a
OK stu@, jasper@
42 lines
1.9 KiB
Plaintext
42 lines
1.9 KiB
Plaintext
$OpenBSD: patch-configure,v 1.4 2011/10/30 07:36:05 sebastia Exp $
|
|
--- configure.orig Fri Jul 15 20:30:52 2011
|
|
+++ configure Sun Oct 9 19:12:57 2011
|
|
@@ -6434,7 +6434,7 @@ echo "${ECHO_T}${ac_cv_c_tclh}" >&6
|
|
|
|
echo "$as_me:$LINENO: checking for Tcl private include files" >&5
|
|
echo $ECHO_N "checking for Tcl private include files... $ECHO_C" >&6
|
|
-
|
|
+ TCL_SRC_DIR=${LOCALBASE}/include/tcl8.5
|
|
TCL_SRC_DIR_NATIVE=`${CYGPATH} ${TCL_SRC_DIR}`
|
|
TCL_TOP_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}\"
|
|
|
|
@@ -6474,7 +6474,7 @@ echo $ECHO_N "checking for Tcl private include files..
|
|
esac
|
|
result="Using ${TCL_INCLUDES}"
|
|
else
|
|
- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
|
|
+ if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then
|
|
{ { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5
|
|
echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;}
|
|
{ (exit 1); exit 1; }; }
|
|
@@ -9841,6 +9841,7 @@ echo "${ECHO_T}${TCLSH_PROG}" >&6
|
|
|
|
# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
|
|
eval pkglibdir="${libdir}/itcl${PACKAGE_VERSION}"
|
|
+ eval pkglibdir="${libdir}/itcl"
|
|
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
|
|
eval itcl_LIB_FLAG="-litcl${PACKAGE_VERSION}${DBGX}"
|
|
eval itcl_STUB_LIB_FLAG="-litclstub${PACKAGE_VERSION}${DBGX}"
|
|
@@ -9851,9 +9852,9 @@ echo "${ECHO_T}${TCLSH_PROG}" >&6
|
|
itcl_BUILD_LIB_SPEC="-L`pwd` ${itcl_LIB_FLAG}"
|
|
itcl_LIB_SPEC="-L${pkglibdir} ${itcl_LIB_FLAG}"
|
|
itcl_BUILD_STUB_LIB_SPEC="-L`pwd` ${itcl_STUB_LIB_FLAG}"
|
|
- itcl_STUB_LIB_SPEC="-L${pkglibdir} ${itcl_STUB_LIB_FLAG}"
|
|
+ itcl_STUB_LIB_SPEC="-L${pkglibdir}/../../ ${itcl_STUB_LIB_FLAG}"
|
|
itcl_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
|
|
- itcl_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
|
|
+ itcl_STUB_LIB_PATH="${pkglibdir}/../../${PKG_STUB_LIB_FILE}"
|
|
|
|
|
|
|