$NetBSD: patch-aa,v 1.7 2012/02/28 16:14:45 hans Exp $ --- scripts/configure.in.orig 2009-12-30 13:45:48.000000000 +0000 +++ scripts/configure.in @@ -641,9 +641,10 @@ if test $usingTcl ; then fi fi +# FIXME -- why are we not using TCL_LIB_FILE FROM tclConfig.sh? if test $usingTcl ; then case $target in - *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*) + *-sunos4*|*-*-solaris2*|*-*-netbsd*|*-*-dragonfly|NetBSD-*|FreeBSD-*|OpenBSD-*) TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" ;; @@ -653,7 +654,7 @@ if test $usingTcl ; then ;; esac - loclib=`echo ${TCL_LIB_SPEC} | cut -d ' ' -f 1 | sed -e 's/-L//'` + loclib=`echo ${TCL_LIB_SPEC} | sed -e 's/.*-L//' -e 's/ .*//'` TCL_LIB_SPEC="-l${TCL_LIB_NAME}" TK_LIB_SPEC="-l${TK_LIB_NAME}" @@ -910,7 +911,7 @@ AC_ARG_ENABLE(readline, use_system_readline=no) AC_CHECK_LIB(readline, rl_attempted_completion_over,, use_system_readline=no) - if test $use_system_readline == yes ; then + if test $use_system_readline = yes ; then AC_DEFINE(HAVE_READLINE) rl_libs="-lreadline" else @@ -1389,8 +1390,8 @@ if test $usingTcl ; then # 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 - SHLIB_CFLAGS="-fpic" - LDDL_FLAGS="-Bshareable -x ${LIB_SPEC}" + SHLIB_CFLAGS="-fPIC" + LDDL_FLAGS="-shared ${LIB_SPEC}" fi ;; @@ -1614,7 +1615,7 @@ if test $usingTcl ; then EOF usingBLT=`cat temp.out` rm -f temp.out - if test "x${usingBLT}" == "xyes" ; then + if test "x${usingBLT}" = "xyes" ; then echo "yes" else echo "no"