summaryrefslogtreecommitdiff
path: root/x11/tk80/patches/patch-aa
blob: 660b458e0dddd13c4baccca3fca3a8b46a5574f8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
$NetBSD: patch-aa,v 1.5 1999/04/01 13:38:46 agc Exp $

--- configure.orig	Tue Mar  9 06:53:50 1999
+++ configure	Thu Apr  1 13:19:46 1999
@@ -874,15 +874,12 @@
   withval="$with_tcl"
   TCL_BIN_DIR=$withval
 else
-  TCL_BIN_DIR=`cd ../../tcl8.0$TK_PATCH_LEVEL/unix; pwd`
+  TCL_BIN_DIR=${prefix}/lib/tcl8.0
 fi
 
 if test ! -d $TCL_BIN_DIR; then
     { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
 fi
-if test ! -f $TCL_BIN_DIR/Makefile; then
-    { echo "configure: error: There's no Makefile in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
-fi
 
 #--------------------------------------------------------------------
 #	Read in configuration information generated by Tcl for shared
@@ -922,6 +919,8 @@
 CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
 EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
 
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
+
 LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
 
 # If Tcl and Tk are installed in different places, adjust the library
@@ -2400,6 +2399,9 @@
 DBGX='${TK_DBGX}'
 eval "TK_LIB_FILE=${TK_LIB_FILE}"
 
+# Force the issue
+TK_SHARED_BUILD=1
+
 # Note:  in the following variable, it's important to use the absolute
 # path name of the Tcl directory rather than "..":  this is because
 # AIX remembers this path and will attempt to use it at run-time to look
@@ -2598,6 +2600,7 @@
 s%@SHLIB_VERSION@%$SHLIB_VERSION%g
 s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
 s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
 s%@TCL_DBGX@%$TCL_DBGX%g
 s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
 s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g