$NetBSD: patch-ab,v 1.5 2000/09/08 02:48:05 jwise Exp $ --- configure.orig Wed Jan 12 15:15:36 2000 +++ configure Thu Sep 7 21:55:22 2000 @@ -2694,13 +2694,13 @@ 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}" ;; *) - TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" - TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}" + TCL_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" + TK_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}" ;; esac @@ -3391,9 +3391,10 @@ fi 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 ;; @@ -3542,7 +3543,7 @@ # Propagate prefix argument as installation directory. #-------------------------------------------------------------------- -BLT_LIBRARY="${prefix}/lib/blt${BLT_VERSION}" +BLT_LIBRARY="${prefix}/lib/tcl/blt${BLT_VERSION}" #--------------------------------------------------------------------