74 lines
2.1 KiB
Text
74 lines
2.1 KiB
Text
$NetBSD: patch-ac,v 1.4 2005/10/26 04:22:38 minskim Exp $
|
|
|
|
--- itk/configure.orig 2001-05-28 02:18:56.000000000 -0500
|
|
+++ itk/configure
|
|
@@ -1130,7 +1130,7 @@ case "`uname -s`" in
|
|
;;
|
|
*)
|
|
CYGPATH=echo
|
|
- RELPATH=..
|
|
+ RELPATH=../..
|
|
;;
|
|
esac
|
|
|
|
@@ -1575,7 +1575,7 @@ echo "configure:1565: checking for Tcl p
|
|
TCL_PLATFORM_DIR_NATIVE=${TCL_WIN_DIR_NATIVE}
|
|
;;
|
|
*)
|
|
- TCL_TOP_DIR_NATIVE='$(TCL_SRC_DIR)'
|
|
+ TCL_TOP_DIR_NATIVE='$(TCL_HEADER_DIR)'
|
|
TCL_GENERIC_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/generic'
|
|
TCL_UNIX_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/unix'
|
|
TCL_WIN_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/win'
|
|
@@ -1882,20 +1882,20 @@ fi
|
|
# link against the non-stubbed Tcl library.
|
|
#--------------------------------------------------------------------
|
|
|
|
-if test "${SHARED_BUILD}" = "1" ; then
|
|
- cat >> confdefs.h <<\EOF
|
|
-#define USE_TCL_STUBS 1
|
|
-EOF
|
|
-
|
|
- cat >> confdefs.h <<\EOF
|
|
-#define USE_TK_STUBS 1
|
|
-EOF
|
|
+# if test "${SHARED_BUILD}" = "1" ; then
|
|
+# cat >> confdefs.h <<\EOF
|
|
+# #define USE_TCL_STUBS 1
|
|
+# EOF
|
|
+
|
|
+# cat >> confdefs.h <<\EOF
|
|
+# #define USE_TK_STUBS 1
|
|
+# EOF
|
|
+
|
|
+# cat >> confdefs.h <<\EOF
|
|
+# #define USE_ITCL_STUBS 1
|
|
+# EOF
|
|
|
|
- cat >> confdefs.h <<\EOF
|
|
-#define USE_ITCL_STUBS 1
|
|
-EOF
|
|
-
|
|
-fi
|
|
+# fi
|
|
|
|
#--------------------------------------------------------------------
|
|
# This macro generates a line to use when building a library. It
|
|
@@ -1902,7 +1902,7 @@ fi
|
|
;;
|
|
*)
|
|
MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(\$@_OBJECTS)"
|
|
- MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(\$@_OBJECTS) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}"
|
|
+ MAKE_SHARED_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${\$@_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0"
|
|
;;
|
|
esac
|
|
|
|
@@ -1941,7 +1941,7 @@ case "`uname -s`" in
|
|
;;
|
|
*)
|
|
if test "${SHARED_BUILD}" = "1" ; then
|
|
- SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_BUILD_STUB_LIB_SPEC} ../itcl/${itclstub_LIB_FILE}"
|
|
+ SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_BUILD_STUB_LIB_SPEC} ../itcl/itclStubLib.lo"
|
|
eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}"
|
|
RANLIB=:
|
|
else
|