summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorsebres <sebres@users.sourceforge.net>2024-03-08 13:37:44 (GMT)
committersebres <sebres@users.sourceforge.net>2024-03-08 13:37:44 (GMT)
commit29728cdc237c11625666946e1d482a253f43e056 (patch)
treec0bcb5784901981dd86f2c1835d3ad2967702d17 /unix
parent342d80d29273e738f99f9beb76d97cb0ca5b35ae (diff)
parent682dcdd45dbd708527a6a7b0e671a881efa195ba (diff)
downloadtcl-29728cdc237c11625666946e1d482a253f43e056.zip
tcl-29728cdc237c11625666946e1d482a253f43e056.tar.gz
tcl-29728cdc237c11625666946e1d482a253f43e056.tar.bz2
TclGetNamespaceForQualName: TCL_FIND_IF_NOT_SIMPLE considers alternate search path too
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure14
-rw-r--r--unix/tcl.m411
2 files changed, 10 insertions, 15 deletions
diff --git a/unix/configure b/unix/configure
index fe3be30..c8e5bdc 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6402,16 +6402,12 @@ fi
case $system in
DragonFly-*|FreeBSD-*)
- if test "${TCL_THREADS}" = "1"
-then :
-
- # The -pthread needs to go in the LDFLAGS, not LIBS
- LIBS=`echo $LIBS | sed s/-pthread//`
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
-fi
+ # The -pthread needs to go in the LDFLAGS, not LIBS
+ LIBS=`echo $LIBS | sed s/-pthread//`
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
;;
- esac
+ esac
if test $doRpath = yes
then :
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 4a9fe40..7b84923 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1276,13 +1276,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
case $system in
DragonFly-*|FreeBSD-*)
- AS_IF([test "${TCL_THREADS}" = "1"], [
- # The -pthread needs to go in the LDFLAGS, not LIBS
- LIBS=`echo $LIBS | sed s/-pthread//`
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
+ # The -pthread needs to go in the LDFLAGS, not LIBS
+ LIBS=`echo $LIBS | sed s/-pthread//`
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
;;
- esac
+ esac
AS_IF([test $doRpath = yes], [
CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])