summaryrefslogtreecommitdiff
path: root/x11/blt/patches/patch-aa
blob: 6696321b5a85c5f9c071c28f18d82b08c001f3f3 (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
$NetBSD: patch-aa,v 1.6 2001/12/16 07:39:11 jmc Exp $

--- configure.in.orig	Wed Jan 12 20:15:36 2000
+++ configure.in	Sun Dec 16 07:16:49 2001
@@ -580,7 +580,7 @@
 TK_LIB_DIR=${TK_EXEC_PREFIX}/lib
 
 case $target in
-  *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
+  *-sunos4*|*-*-netbsd|FreeBSD-*|OpenBSD-*)
     TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
     TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
     ;;
@@ -933,9 +933,10 @@
     # Not available on all versions:  check for include file.
     AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)
     if test "$test_ok" = yes; then
+      LDFLAGS="-L${prefix}/lib -L${X11BASE}/lib -Wl,-R${prefix}/lib -Wl,-R${X11BASE}/lib"
       SHLIB_CFLAGS="-fpic"
       SHLIB_LD="ld"
-      SHLIB_LD_FLAGS="-Bshareable -x"
+      SHLIB_LD_FLAGS="-Bshareable -x -R${prefix}/lib -R${X11BASE}/lib"
     fi
     ;;
 
@@ -1084,7 +1085,7 @@
 #	Propagate prefix argument as installation directory.
 #--------------------------------------------------------------------
 
-BLT_LIBRARY="${prefix}/lib/blt${BLT_VERSION}"
+BLT_LIBRARY="${prefix}/lib/tcl/blt${BLT_VERSION}"
 AC_SUBST(BLT_LIBRARY)
 
 #--------------------------------------------------------------------